Further refactoring in QtModeling (step 2)

Change-Id: I336f9f24af1c763883e9cc3c716c02ef557bebd1
Reviewed-by: Sandro S. Andrade <sandroandrade@kde.org>

898 files changed, 41911 insertions, 39927 deletions

diff --git a/examples/uml/duse-mt/mainwindow.cpp b/examples/uml/duse-mt/mainwindow.cpp
index 16c2582c..2c19ef45 100644
--- a/examples/uml/duse-mt/mainwindow.cpp
+++ b/examples/uml/duse-mt/mainwindow.cpp
@@ -60,6 +60,7 @@
 #include <QtModeling/QXmiWriter>
 #include <QtModeling/QXmiReader>
 #include <QtModeling/QModelingObject>
+#include <QtModeling/QModelingElement>
 #include <QtModeling/QMetaModelPlugin>
 //#include <QtWrappedObjects/QMetaWrappedObject>
 #include <QtModelingWidgets/QModelingObjectModel>
@@ -228,7 +229,7 @@ void MainWindow::saveXmi(QModelingElement *rootElement)
         return;
     }
 
-    QXmiWriter writer(rootElement);
+    QXmiWriter writer(rootElement->asQModelingObject());
     setCursor(Qt::WaitCursor);
     if (!writer.writeFile(&file))
         QMessageBox::critical(this, tr("Save As"), tr("Error when writing XMI file !"));
@@ -261,11 +262,11 @@ QList<QModelingElement *> MainWindow::loadXmi(QString fileName)
 void MainWindow::setModelInspector(QList<QModelingElement *> modelingObjectList)
 {
     if (!modelingObjectList.isEmpty()) {
-        _engine.globalObject().setProperty(modelingObjectList.at(0)->asQObject()->objectName(), _engine.newQObject(modelingObjectList.at(0)->asQObject()));
+        _engine.globalObject().setProperty(modelingObjectList.at(0)->asQModelingObject()->objectName(), _engine.newQObject(modelingObjectList.at(0)->asQModelingObject()));
 
         QScriptValue array = _engine.newArray();
         foreach (QModelingElement *modelingObject, modelingObjectList)
-            array.property(QString::fromLatin1("push")).call(array, QScriptValueList() << _engine.newQObject(modelingObject->asQObject()));
+            array.property(QString::fromLatin1("push")).call(array, QScriptValueList() << _engine.newQObject(modelingObject->asQModelingObject()));
         _engine.globalObject().setProperty("input", array);
 
         ui->txeJavaScript->setText("self");
@@ -273,7 +274,7 @@ void MainWindow::setModelInspector(QList<QModelingElement *> modelingObjectList)
     }
     _modelingObjectModel->clear();
     foreach (QModelingElement *object, modelingObjectList)
-        _modelingObjectModel->addModelingObject(object->asQObject());
+        _modelingObjectModel->addModelingObject(object->asQModelingObject());
 }
 
 void MainWindow::on_actionFileOpenModel_triggered()
@@ -310,7 +311,7 @@ void MainWindow::on_actionFileNewDuseDesign_triggered()
                 }
                 QXmiReader reader(&_engine, true);
                 QList<QModelingElement *> modelingObjectList = reader.readFile(&file);
-                if (QString::fromLatin1(modelingObjectList.first()->asQObject()->metaObject()->className()) != QString::fromLatin1("QDuseDesignSpace")) {
+                if (QString::fromLatin1(modelingObjectList.first()->asQModelingObject()->metaObject()->className()) != QString::fromLatin1("QDuseDesignSpace")) {
                     QMessageBox::critical(this, tr("Create new DuSE design"), QString::fromLatin1("%1 is not a valid DuSE instance !").arg(QFileInfo(file).fileName()));
                     setCursor(Qt::ArrowCursor);
                     return;
@@ -329,20 +330,20 @@ void MainWindow::on_actionFileNewDuseDesign_triggered()
                                                        { \
                                                            var length = input[0].profileApplications.length; \
                                                            for (var i = 0; i < length; ++i) \
-                                                               if (input[0].profileApplications[0].appliedProfile.name == '" + modelingObjectList.first()->asQObject()->objectName() + "Profile') \
+                                                               if (input[0].profileApplications[0].appliedProfile.name == '" + modelingObjectList.first()->asQModelingObject()->objectName() + "Profile') \
                                                                    return true; \
                                                            return false; \
                                                        } \
                                                        checkProfile();");
                 if (!value.toBool()) {
-                    QMessageBox::critical(this, tr("Create new DuSE design"), QString::fromLatin1("Input model does not contain the required %1Profile profile application !").arg(modelingObjectList.first()->asQObject()->objectName()));
+                    QMessageBox::critical(this, tr("Create new DuSE design"), QString::fromLatin1("Input model does not contain the required %1Profile profile application !").arg(modelingObjectList.first()->asQModelingObject()->objectName()));
                     setCursor(Qt::ArrowCursor);
                     return;
                 }
 
                 //modelingObjectList.first()->setQmlContextProperties(_metricsQuickView->engine()->rootContext());
 
-                _engine.globalObject().setProperty("designspace", _engine.newQObject(modelingObjectList.at(0)->asQObject()));
+                _engine.globalObject().setProperty("designspace", _engine.newQObject(modelingObjectList.at(0)->asQModelingObject()));
                 _engine.evaluate("var dimensionsLength = designspace.designDimensions.length; \
                                  for (var dimensionCounter = 0; dimensionCounter < dimensionsLength; ++dimensionCounter) { \
                                      if (designspace.designDimensions[dimensionCounter].instanceSelectionRule) { \
@@ -406,7 +407,7 @@ void MainWindow::on_actionFileSaveAs_triggered()
     QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"), QDir::currentPath(), "XMI files (*.xmi)");
     if (!fileName.isEmpty()) {
         _currentFileName = fileName;
-        saveXmi(qModelingObject(_modelingObjectModel->modelingObjects().at(0)));
+        saveXmi(qModelingElement(_modelingObjectModel->modelingObjects().at(0)));
     }
 }
 
@@ -415,7 +416,7 @@ void MainWindow::on_actionFileSave_triggered()
     if (_currentFileName.isEmpty())
         on_actionFileSaveAs_triggered();
     else
-        saveXmi(qModelingObject(_modelingObjectModel->modelingObjects().at(0)));
+        saveXmi(qModelingElement(_modelingObjectModel->modelingObjects().at(0)));
 }
 
 void MainWindow::on_actionHelpAboutPlugins_triggered()
@@ -510,7 +511,7 @@ void MainWindow::metaModelChanged(QString newMetaModel)
 
 void MainWindow::modelingObjectChanged(QModelingElement *modelingObject)
 {
-    _engine.globalObject().setProperty("self", _engine.newQObject(modelingObject->asQObject()));
+    _engine.globalObject().setProperty("self", _engine.newQObject(modelingObject->asQModelingObject()));
 }
 
 void MainWindow::addToView(QModelingElement *modelingObject, QQuickItem *parent)
@@ -520,7 +521,7 @@ void MainWindow::addToView(QModelingElement *modelingObject, QQuickItem *parent)
     _qmlComponent = new QQmlComponent(_modelQuickView->engine());
     int x = qrand() % 400;
     int y = qrand() % 400;
-    _qmlComponent->setData(QString("import QtQuick 2.0\nimport QtModeling.Uml 1.0\n\n%1 { x: %2; y: %3}").arg(QString(modelingObject->asQObject()->metaObject()->className()).remove(QRegularExpression("^Q"))).arg(x).arg(y).toLatin1(), QUrl());
+    _qmlComponent->setData(QString("import QtQuick 2.0\nimport QtModeling.Uml 1.0\n\n%1 { x: %2; y: %3}").arg(QString(modelingObject->asQModelingObject()->metaObject()->className()).remove(QRegularExpression("^Q"))).arg(x).arg(y).toLatin1(), QUrl());
 
     QQuickItem *item = 0;
     if (_qmlComponent->isError()) {
@@ -532,8 +533,8 @@ void MainWindow::addToView(QModelingElement *modelingObject, QQuickItem *parent)
         }
     }
 
-    foreach (QObject *child, modelingObject->asQObject()->children())
-        addToView(dynamic_cast<QModelingElement *>(qModelingObject(child)));
+    foreach (QObject *child, modelingObject->asQModelingObject()->children())
+        addToView(dynamic_cast<QModelingElement *>(qModelingElement(child)));
 
     _qmlComponent->deleteLater();
 }
@@ -545,7 +546,7 @@ void MainWindow::addToDesignSpaceView(QModelingElement *modelingObject, QQuickIt
     _qmlComponent = new QQmlComponent(_designSpaceQuickView->engine());
     int x = qrand() % 400;
     int y = qrand() % 400;
-    _qmlComponent->setData(QString("import QtQuick 2.0\nimport QtModeling.Uml 1.0\n\n%1 { x: %2; y: %3}").arg(QString(modelingObject->asQObject()->metaObject()->className()).remove(QRegularExpression("^Q"))).arg(x).arg(y).toLatin1(), QUrl());
+    _qmlComponent->setData(QString("import QtQuick 2.0\nimport QtModeling.Uml 1.0\n\n%1 { x: %2; y: %3}").arg(QString(modelingObject->asQModelingObject()->metaObject()->className()).remove(QRegularExpression("^Q"))).arg(x).arg(y).toLatin1(), QUrl());
 
     QQuickItem *item = 0;
     if (_qmlComponent->isError()) {
@@ -557,8 +558,8 @@ void MainWindow::addToDesignSpaceView(QModelingElement *modelingObject, QQuickIt
         }
     }
 
-    foreach (QObject *child, modelingObject->asQObject()->children())
-        addToDesignSpaceView(dynamic_cast<QModelingElement *>(qModelingObject(child)));
+    foreach (QObject *child, modelingObject->asQModelingObject()->children())
+        addToDesignSpaceView(dynamic_cast<QModelingElement *>(qModelingElement(child)));
 
     _qmlComponent->deleteLater();
 }
@@ -570,7 +571,7 @@ void MainWindow::addToPareto(QModelingElement *modelingObject, int pos)
     _qmlComponent = new QQmlComponent(_paretoFrontQuickView->engine());
     int x = qrand() % 400;
     int y = qrand() % 400;
-    _qmlComponent->setData(QString("import QtQuick 2.0\nimport QtModeling.Uml 1.0\n\n%1 { x: %2; y: %3}").arg(QString(modelingObject->asQObject()->metaObject()->className()).remove(QRegularExpression("^Q"))).arg(x).arg(y).toLatin1(), QUrl());
+    _qmlComponent->setData(QString("import QtQuick 2.0\nimport QtModeling.Uml 1.0\n\n%1 { x: %2; y: %3}").arg(QString(modelingObject->asQModelingObject()->metaObject()->className()).remove(QRegularExpression("^Q"))).arg(x).arg(y).toLatin1(), QUrl());
 
     QQuickItem *item = 0;
     if (_qmlComponent->isError()) {
@@ -582,8 +583,8 @@ void MainWindow::addToPareto(QModelingElement *modelingObject, int pos)
         }
     }
 
-    foreach (QObject *child, modelingObject->asQObject()->children())
-        addToPareto(dynamic_cast<QModelingElement *>(qModelingObject(child)), pos);
+    foreach (QObject *child, modelingObject->asQModelingObject()->children())
+        addToPareto(dynamic_cast<QModelingElement *>(qModelingElement(child)), pos);
 
     _qmlComponent->deleteLater();
 }
diff --git a/examples/uml/nested-packages/main.cpp b/examples/uml/nested-packages/main.cpp
index ce605a7d..307e3295 100644
--- a/examples/uml/nested-packages/main.cpp
+++ b/examples/uml/nested-packages/main.cpp
@@ -44,19 +44,19 @@
 int main ()
 {
     QUmlComment *c1 = new QUmlComment;
-    c1->asQObject()->setObjectName("c1");
+    c1->asQModelingObject()->setObjectName("c1");
     QUmlComment *c2 = new QUmlComment;
-    c2->asQObject()->setObjectName("c2");
+    c2->asQModelingObject()->setObjectName("c2");
     QUmlComment *c3 = new QUmlComment;
-    c3->asQObject()->setObjectName("c3");
+    c3->asQModelingObject()->setObjectName("c3");
     c3->setBody("c3 body");
 
     c1->setBody("c1 body");
     c2->setBody("c2 body");
     c1->addOwnedComment(c2);
     c1->addOwnedComment(c3);
-    qDebug() << "c2's parent:" << c2->asQObject()->parent()->objectName();
-    qDebug() << "c3's parent:" << c3->asQObject()->parent()->objectName();
+    qDebug() << "c2's parent:" << c2->asQModelingObject()->parent()->objectName();
+    qDebug() << "c3's parent:" << c3->asQModelingObject()->parent()->objectName();
 
     QUmlComment *c4 = dynamic_cast<QUmlComment *>(c1->clone());
     qDebug() << "c1 body:" << c4->body();
@@ -67,16 +67,16 @@ int main ()
         qDebug() << "c4 owned comment body:" << comment->body();
 
     //c1->removeOwnedComment(c3);
-    qDebug() << "c3's parent:" << c3->asQObject()->parent();
+    qDebug() << "c3's parent:" << c3->asQModelingObject()->parent();
 
     qDebug() << "Comment size:" << c1->ownedComments().size();
     delete c2;
     //c1->removeOwnedComment(c2);
     qDebug() << "Comment size:" << c1->ownedComments().size();
-    foreach(QObject *c, c1->asQObject()->property("ownedComment").value< QSet<QObject *> >())
+    foreach (QObject *c, c1->asQModelingObject()->property("ownedComment").value< QSet<QObject *> >())
         qDebug() << c->objectName();
 
-    foreach(QObject *c, c1->asQObject()->property("ownedElement").value< QSet<QObject *> >())
+    foreach (QObject *c, c1->asQModelingObject()->property("ownedElement").value< QSet<QObject *> >())
         qDebug() << c->objectName();
 
     delete c1;
diff --git a/examples/uml/profiles/main.cpp b/examples/uml/profiles/main.cpp
index 3ef20ca6..5bf07989 100644
--- a/examples/uml/profiles/main.cpp
+++ b/examples/uml/profiles/main.cpp
@@ -124,5 +124,7 @@ int main ()
     delete profile; // That will delete all owned elements
     delete umlModel; // That will delete all owned elements
     delete extension; // That will delete all owned elements
+    delete stereotype; // That will delete all owned elements
+    delete elementImport; // That will delete all owned elements
 }
 
diff --git a/examples/uml/xmi-read/main.cpp b/examples/uml/xmi-read/main.cpp
index ce523d37..fe71a97d 100644
--- a/examples/uml/xmi-read/main.cpp
+++ b/examples/uml/xmi-read/main.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 #include <QtModeling/QXmiReader>
 #include <QtModeling/QXmiWriter>
-#include <QtModeling/QModelingObject>
+#include <QtModeling/QModelingElement>
 
 #include <QtCore/QFile>
 #include <QtCore/QDebug>
@@ -55,9 +55,9 @@ int main ()
     }
 
     QXmiReader reader(0, true);
-    QList<QModelingObject *> rootElements = reader.readFile(&file);
+    QList<QModelingElement *> rootElements = reader.readFile(&file);
     if (!rootElements.isEmpty())
-        qDebug() << "Successfully read object with name" << rootElements.first()->asQObject()->objectName();
+        qDebug() << "Successfully read object with name" << rootElements.first()->asQModelingObject()->objectName();
     if (reader.errorStrings().size() > 0) {
         qDebug() << "Errors:";
         foreach (QString error, reader.errorStrings())
@@ -70,7 +70,7 @@ int main ()
         qDebug() << "Cannot write file !";
         return 1;
     }
-    QXmiWriter writer(rootElements.first());
+    QXmiWriter writer(rootElements.first()->asQModelingObject());
     writer.writeFile(&file2);
 }
 
diff --git a/examples/uml/xmi-write/main.cpp b/examples/uml/xmi-write/main.cpp
index 9ee9f898..ee1194fa 100644
--- a/examples/uml/xmi-write/main.cpp
+++ b/examples/uml/xmi-write/main.cpp
@@ -74,7 +74,7 @@ int main ()
     class2_->setName("InterStudent");
 
     QUmlGeneralization *generalization = new QUmlGeneralization;
-    generalization->asQObject()->setObjectName("generalization");
+    generalization->asQModelingObject()->setObjectName("generalization");
     generalization->setGeneral(class_);
     class2_->addGeneralization(generalization);
 
@@ -92,7 +92,7 @@ int main ()
         return 1;
     }
 
-    QXmiWriter writer(model);
+    QXmiWriter writer(model->asQModelingObject());
     if (writer.writeFile(&file))
         qDebug() << "XMI file saved !";
     else
diff --git a/scripts/templates/common.tmpl b/scripts/templates/common.tmpl
index a9d5089c..544558ce 100644
--- a/scripts/templates/common.tmpl
+++ b/scripts/templates/common.tmpl
@@ -243,16 +243,16 @@ ${parameter.findvalue("@name")}
 {
     [%- IF qtType.match("QList|QSet") && !qtType.match("QString") %]
     ${qtType}[% IF qtType.match("QList") %]list[% ELSE %]set[% END %];
-    foreach (Q${originalQtType.remove("QList<").remove("QSet<").remove(">").trim.remove("^Q")}element, qmodelingobjectproperty_cast<Q${namespace}${originalClassName} *>(this)->${PLURALFORM(qtAttribute, attribute)}())
-        [% IF qtType.match("QList") %]list[% ELSE %]set[% END %].[% IF qtType.match("QList") %]append[% ELSE %]insert[% END %](element->asQObject());
+    foreach (Q${originalQtType.remove("QList<").remove("QSet<").remove(">").trim.remove("^Q")}element, qmodelingelementproperty_cast<Q${namespace}${originalClassName} *>(this)->${PLURALFORM(qtAttribute, attribute)}())
+        [% IF qtType.match("QList") %]list[% ELSE %]set[% END %].[% IF qtType.match("QList") %]append[% ELSE %]insert[% END %](element->asQModelingObject());
     return [% IF qtType.match("QList") %]list[% ELSE %]set[% END %];
     [%- ELSIF qtType.match('\*$') %]
-    if (!qmodelingobjectproperty_cast<Q${namespace}${originalClassName} *>(this)->${PLURALFORM(qtAttribute, attribute)}())
+    if (!qmodelingelementproperty_cast<Q${namespace}${originalClassName} *>(this)->${PLURALFORM(qtAttribute, attribute)}())
         return 0;
     else
-        return qmodelingobjectproperty_cast<Q${namespace}${originalClassName} *>(this)->${PLURALFORM(qtAttribute, attribute)}()->asQObject();
+        return qmodelingelementproperty_cast<Q${namespace}${originalClassName} *>(this)->${PLURALFORM(qtAttribute, attribute)}()->asQModelingObject();
     [%- ELSE %]
-    return qmodelingobjectproperty_cast<Q${namespace}${originalClassName} *>(this)->${PLURALFORM(qtAttribute, attribute)}();
+    return qmodelingelementproperty_cast<Q${namespace}${originalClassName} *>(this)->${PLURALFORM(qtAttribute, attribute)}();
     [%- END %]
 }
 
@@ -291,31 +291,31 @@ ${parameter.findvalue("@name")}
         [%- IF QT_TYPE(namespace, parameter, "true").match("QList|QSet") %]
     ${QT_TYPE(namespace, parameter, "true")}${parameter.findvalue("@name")}Converted;
     foreach (QObject *object, ${parameter.findvalue("@name")})
-        ${parameter.findvalue("@name")}Converted.[% IF QT_TYPE(namespace, parameter, "true").match("QList") %]append[% ELSE %]insert[% END %](qmodelingobjectproperty_cast<${QT_TYPE(namespace, parameter, "true").remove("QList<").remove("QSet<").remove(">").trim}>(object));
+        ${parameter.findvalue("@name")}Converted.[% IF QT_TYPE(namespace, parameter, "true").match("QList") %]append[% ELSE %]insert[% END %](qmodelingelementproperty_cast<${QT_TYPE(namespace, parameter, "true").remove("QList<").remove("QSet<").remove(">").trim}>(object));
         [%- END -%]
     [%- END -%]
     [%- IF return.match("QList|QSet") && return.match('\*') %]
     ${return}[% IF qtType.match("QList") %]list[% ELSE %]set[% END %];
-    foreach (${originalReturn.remove("QList<").remove("QSet<").remove(">").trim}element, qmodelingobjectproperty_cast<Q${namespace}${originalClassName} *>(this)->${operationName}(
+    foreach (${originalReturn.remove("QList<").remove("QSet<").remove(">").trim}element, qmodelingelementproperty_cast<Q${namespace}${originalClassName} *>(this)->${operationName}(
         [%- FOREACH parameter = operation.findnodes("ownedParameter[@direction!='return']") -%]
             [%- qtType = QT_TYPE(namespace, parameter, "true") -%]
         [%- IF qtType.match('QList|QSet') -%]
 ${parameter.findvalue("@name")}Converted
         [%- ELSIF qtType.match('\*$') -%]
-qmodelingobjectproperty_cast<${qtType.remove("QList<").remove("QSet<").remove(">")}>(${parameter.findvalue("@name")})
+qmodelingelementproperty_cast<${qtType.remove("QList<").remove("QSet<").remove(">")}>(${parameter.findvalue("@name")})
         [%- ELSE -%]
 ${parameter.findvalue("@name")}
         [%- END -%]
             [%- IF !loop.last %], [% END -%]
         [%- END -%]))
-        [% IF qtType.match("QList") %]list[% ELSE %]set[% END %].[% IF return.match("QList") %]append[% ELSE %]insert[% END %](element->asQObject());
+        [% IF qtType.match("QList") %]list[% ELSE %]set[% END %].[% IF return.match("QList") %]append[% ELSE %]insert[% END %](element->asQModelingObject());
     return [% IF qtType.match("QList") %]list[% ELSE %]set[% END %];
     [%- ELSIF !return.match("QList|QSet") && return.match('\*$') %]
-    if (!qmodelingobjectproperty_cast<Q${namespace}${originalClassName} *>(this)->${operationName}(
+    if (!qmodelingelementproperty_cast<Q${namespace}${originalClassName} *>(this)->${operationName}(
         [%- FOREACH parameter = operation.findnodes("ownedParameter[@direction!='return']") -%]
         [%- qtType = QT_TYPE(namespace, parameter, "true") -%]
         [%- IF qtType.match('\*$') -%]
-qmodelingobjectproperty_cast<${qtType.remove("QList<").remove("QSet<").remove(">")}>(${parameter.findvalue("@name")})
+qmodelingelementproperty_cast<${qtType.remove("QList<").remove("QSet<").remove(">")}>(${parameter.findvalue("@name")})
         [%- ELSE -%]
 ${parameter.findvalue("@name")}
         [%- END -%]
@@ -323,22 +323,22 @@ ${parameter.findvalue("@name")}
         [%- END -%]))
         return 0;
     else
-        return qmodelingobjectproperty_cast<Q${namespace}${originalClassName} *>(this)->${operationName}(
+        return qmodelingelementproperty_cast<Q${namespace}${originalClassName} *>(this)->${operationName}(
         [%- FOREACH parameter = operation.findnodes("ownedParameter[@direction!='return']") -%]
         [%- qtType = QT_TYPE(namespace, parameter, "true") -%]
         [%- IF qtType.match('\*$') -%]
-qmodelingobjectproperty_cast<${qtType.remove("QList<").remove("QSet<").remove(">")}>(${parameter.findvalue("@name")})
+qmodelingelementproperty_cast<${qtType.remove("QList<").remove("QSet<").remove(">")}>(${parameter.findvalue("@name")})
         [%- ELSE -%]
 ${parameter.findvalue("@name")}
         [%- END -%]
             [%- IF !loop.last %], [% END -%]
-        [%- END -%])->asQObject();
+        [%- END -%])->asQModelingObject();
     [%- ELSE %]
-    return qmodelingobjectproperty_cast<Q${namespace}${originalClassName} *>(this)->${operationName}(
+    return qmodelingelementproperty_cast<Q${namespace}${originalClassName} *>(this)->${operationName}(
         [%- FOREACH parameter = operation.findnodes("ownedParameter[@direction!='return']") -%]
             [%- qtType = QT_TYPE(namespace, parameter, "true") -%]
         [%- IF qtType.match('\*$') -%]
-qmodelingobjectproperty_cast<${qtType.remove("QList<").remove("QSet<").remove(">")}>(${parameter.findvalue("@name")})
+qmodelingelementproperty_cast<${qtType.remove("QList<").remove("QSet<").remove(">")}>(${parameter.findvalue("@name")})
         [%- ELSE -%]
 ${parameter.findvalue("@name")}
         [%- END -%]
@@ -380,9 +380,9 @@ void Q${namespace}${originalClassName}Object::add${attributeName}(${originalQtTy
         [%- END %]
 {
         [%- IF qtType.remove("QSet<").remove("QList<").match('\*') %]
-    qmodelingobjectproperty_cast<Q${namespace}${originalClassName} *>(this)->add${attributeName}(qmodelingobjectproperty_cast<${originalQtType.remove("QSet<").remove("QList<").replace(">", "").replace('\* $', '*')}>(${qtAttribute}));
+    qmodelingelementproperty_cast<Q${namespace}${originalClassName} *>(this)->add${attributeName}(qmodelingelementproperty_cast<${originalQtType.remove("QSet<").remove("QList<").replace(">", "").replace('\* $', '*')}>(${qtAttribute}));
         [%- ELSE %]
-    qmodelingobjectproperty_cast<Q${namespace}${originalClassName} *>(this)->add${attributeName}(${qtAttribute});
+    qmodelingelementproperty_cast<Q${namespace}${originalClassName} *>(this)->add${attributeName}(${qtAttribute});
         [%- END %]
 }
 
@@ -393,29 +393,30 @@ void Q${namespace}${originalClassName}Object::remove${attributeName}(${originalQ
         [%- END %]
 {
         [%- IF qtType.remove("QSet<").remove("QList<").match('\*') %]
-    qmodelingobjectproperty_cast<Q${namespace}${originalClassName} *>(this)->remove${attributeName}(qmodelingobjectproperty_cast<${originalQtType.remove("QSet<").remove("QList<").replace(">", "").replace('\* $', '*')}>(${qtAttribute}));
+    qmodelingelementproperty_cast<Q${namespace}${originalClassName} *>(this)->remove${attributeName}(qmodelingelementproperty_cast<${originalQtType.remove("QSet<").remove("QList<").replace(">", "").replace('\* $', '*')}>(${qtAttribute}));
         [%- ELSE %]
-    qmodelingobjectproperty_cast<Q${namespace}${originalClassName} *>(this)->remove${attributeName}(${qtAttribute});
+    qmodelingelementproperty_cast<Q${namespace}${originalClassName} *>(this)->remove${attributeName}(${qtAttribute});
         [%- END %]
 }
 
     [%- ELSIF qtType.match('\*$') %]
 void Q${namespace}${originalClassName}Object::set${attributeName}(${qtType}${qtAttribute})
 {
-    qmodelingobjectproperty_cast<Q${namespace}${originalClassName} *>(this)->set${attributeName}(qmodelingobjectproperty_cast<${originalQtType}>(${qtAttribute}));
+    qmodelingelementproperty_cast<Q${namespace}${originalClassName} *>(this)->set${attributeName}(qmodelingelementproperty_cast<${originalQtType}>(${qtAttribute}));
 }
 
     [%- ELSE %]
 void Q${namespace}${originalClassName}Object::set${attributeName.remove("^Is")}(${qtType}${qtAttribute})
 {
-    qmodelingobjectproperty_cast<Q${namespace}${originalClassName} *>(this)->set${attributeName.remove("^Is")}(${qtAttribute});
+    qmodelingelementproperty_cast<Q${namespace}${originalClassName} *>(this)->set${attributeName.remove("^Is")}(${qtAttribute});
 }
 
     [%- END -%]
     [%- IF attribute.findvalue("defaultValue/@xmi:type") != "" %]
 void Q${namespace}${originalClassName}Object::unset${qtAttribute.remove("^is").ucfirst}()
 {
-    qmodelingobjectproperty_cast<Q${namespace}${originalClassName} *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("${attributeName.remove("^Is").lcfirst}"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("${attributeName.remove("^Is").lcfirst}"));
 }
 
     [%- END -%]
@@ -479,12 +480,12 @@ void Q${namespace}${originalClassName}Object::unset${qtAttribute.remove("^is").u
 [%- END -%]
 [%- SET className = class.findvalue("@name") %]
 
-    _propertyGroups << QStringLiteral("Q${namespace}${className}");
+    d->propertyGroups << QStringLiteral("Q${namespace}${className}");
 [%- FOREACH attribute = class.findnodes("ownedAttribute") -%]
     [%- SET qtType = QT_TYPE(namespace, attribute) -%]
     [%- SET attributeName = attribute.findvalue("@name") -%]
     [%- SET qtAttribute = QT_ATTRIBUTE(attribute) -%]
     [%- NEXT IF redefinedProperties.grep("^${className}-${qtAttribute}$").size > 0 %]
-    _groupProperties.insert(QStringLiteral("Q${namespace}${className}"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("${PLURALFORM(qtAttribute, attribute)}"))));
+    d->groupProperties.insert(QStringLiteral("Q${namespace}${className}"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("${PLURALFORM(qtAttribute, attribute)}"))));
 [%- END %]
 [%- END -%]
\ No newline at end of file
diff --git a/scripts/templates/module.pro b/scripts/templates/module.pro
index eae886f1..01f3ee9e 100644
--- a/scripts/templates/module.pro
+++ b/scripts/templates/module.pro
@@ -1,7 +1,7 @@
 load(qt_build_config)
 
 TARGET = Qt${namespace}
-QT = core modeling
+QT = core-private modeling-private
 
 QMAKE_DOCS = [%- GET '$$PWD' -%]/doc/qt${namespace.lower}.qdocconf
 
diff --git a/scripts/templates/qclass.cpp b/scripts/templates/qclass.cpp
index c04d163a..3b9d5429 100644
--- a/scripts/templates/qclass.cpp
+++ b/scripts/templates/qclass.cpp
@@ -67,7 +67,7 @@
 
     \brief ${class.findvalue("ownedComment/body/text()")}
  */
-Q${namespace}${className}::Q${namespace}${className}([%- IF class.findvalue("@isAbstract") != "true" %]bool createQObject[% END %])
+Q${namespace}${className}::Q${namespace}${className}([%- IF class.findvalue("@isAbstract") != "true" %]bool createQModelingObject[% END %])
 [%- SET found = "false" -%]
 [%- FOREACH superclass IN generalization -%]
 [%- SET superclassName = superclass.findvalue('@general') -%]
@@ -118,25 +118,23 @@ Q${namespace}${className}::Q${namespace}${className}([%- IF class.findvalue("@is
 [%- END %]
 {
 [%- IF class.findvalue("@isAbstract") != "true" %]
-    if (createQObject)
-        _qObject = new Q${namespace}${className}Object(this);
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new Q${namespace}${className}Object(this));
 [%- END %]
-    setGroupProperties();
-    setPropertyData();
 }
 
 Q${namespace}${className}::~Q${namespace}${className}()
 {
 [%- IF class.findvalue("@isAbstract") != "true" %]
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 [%- END %]
 }
 
-QModelingObject *Q${namespace}${className}::clone() const
+QModelingElement *Q${namespace}${className}::clone() const
 {
     Q${namespace}${className} *c = new Q${namespace}${className};
 [%- visitedClasses = [] -%]
@@ -197,10 +195,10 @@ void Q${namespace}${className}::add${attributeName}(${qtType.remove("QSet<").rem
     if (!_${PLURALFORM(qtAttribute, attribute)}.contains(${qtAttribute})) {
         _${PLURALFORM(qtAttribute, attribute)}.[% IF qtType.match("QList") %]append[% ELSE %]insert[% END %](${qtAttribute});
         [%- IF qtType.match('\*') %]
-        if (${qtAttribute} && ${qtAttribute}->asQObject() && this->asQObject())
-            QObject::connect(${qtAttribute}->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(remove${attributeName}(QObject *)));
+        if (${qtAttribute} && ${qtAttribute}->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(${qtAttribute}->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(remove${attributeName}(QObject *)));
             [%- IF attribute.findvalue("@aggregation") == "composite" %]
-        ${qtAttribute}->asQObject()->setParent(this->asQObject());
+        ${qtAttribute}->asQModelingObject()->setParent(this->asQModelingObject());
             [%- END -%]
         [%- END %]
     [%- END %]
@@ -258,8 +256,8 @@ void Q${namespace}${className}::remove${attributeName}(${qtType.remove("QSet<").
     if (_${PLURALFORM(qtAttribute, attribute)}.contains(${qtAttribute})) {
         _${PLURALFORM(qtAttribute, attribute)}.[% IF qtType.match("QList") %]removeAll[% ELSE %]remove[% END %](${qtAttribute});
         [%- IF attribute.findvalue("@aggregation") == "composite" %]
-        if (${qtAttribute}->asQObject())
-            ${qtAttribute}->asQObject()->setParent(0);
+        if (${qtAttribute}->asQModelingObject())
+            ${qtAttribute}->asQModelingObject()->setParent(0);
         [%- END -%]
     [%- END %]
         [%- found = "false" -%]
@@ -335,13 +333,13 @@ void Q${namespace}${className}::set${attributeName.remove("^Is")}([% IF !qtType.
         [%- ELSE %]
         _${PLURALFORM(qtAttribute, attribute)} = ${qtAttribute};
 [%- IF attribute.findvalue("defaultValue/@xmi:type") != "" %]
-        _modifiedResettableProperties << QStringLiteral("${attributeName.lcfirst}");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("${attributeName.lcfirst}");
 [%- END %]
             [%- IF qtType.match('\*') %]
-        if (${qtAttribute} && ${qtAttribute}->asQObject() && this->asQObject())
-            QObject::connect(${qtAttribute}->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(set${attributeName}()));
+        if (${qtAttribute} && ${qtAttribute}->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(${qtAttribute}->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(set${attributeName}()));
                 [%- IF attribute.findvalue("@aggregation") == "composite" %]
-        ${qtAttribute}->asQObject()->setParent(this->asQObject());
+        ${qtAttribute}->asQModelingObject()->setParent(this->asQModelingObject());
                 [%- END -%]
             [%- END %]
         [%- END %]
@@ -404,42 +402,3 @@ ${parameter.findvalue("@name")}
 }
 [%- END %]
 
-void Q${namespace}${className}::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _propertyGroups << QStringLiteral("QObject");
-    _groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
-[%- visitedClasses = [] -%]
-[%- SET_GROUP_PROPERTIES(class, visitedClasses, redefinedProperties) %]
-}
-
-void Q${namespace}${className}::setPropertyData()
-{
-[%- FOREACH attribute = class.findnodes("ownedAttribute") -%]
-[%- SET qtAttribute = QT_ATTRIBUTE(attribute) -%]
-[%- SET association = attribute.findvalue("@association") -%]
-[%- IF attribute.findvalue("@aggregation") == "composite" %]
-    QModelingObject::propertyDataHash[QStringLiteral("Q${namespace}${className}")][QStringLiteral("${PLURALFORM(qtAttribute, attribute)}")][QtModeling::AggregationRole] = QStringLiteral("composite");
-[%- ELSE %]
-    QModelingObject::propertyDataHash[QStringLiteral("Q${namespace}${className}")][QStringLiteral("${PLURALFORM(qtAttribute, attribute)}")][QtModeling::AggregationRole] = QStringLiteral("none");
-[%- END %]
-    QModelingObject::propertyDataHash[QStringLiteral("Q${namespace}${className}")][QStringLiteral("${PLURALFORM(qtAttribute, attribute)}")][QtModeling::PropertyClassRole] = QStringLiteral("Q${namespace}${className}");
-    QModelingObject::propertyDataHash[QStringLiteral("Q${namespace}${className}")][QStringLiteral("${PLURALFORM(qtAttribute, attribute)}")][QtModeling::IsDerivedRole] = [% IF attribute.findvalue("@isDerived") == "true" %]true[% ELSE %]false[% END %];
-    QModelingObject::propertyDataHash[QStringLiteral("Q${namespace}${className}")][QStringLiteral("${PLURALFORM(qtAttribute, attribute)}")][QtModeling::IsDerivedUnionRole] = [% IF attribute.findvalue("@isDerivedUnion") == "true" %]true[% ELSE %]false[% END %];
-    QModelingObject::propertyDataHash[QStringLiteral("Q${namespace}${className}")][QStringLiteral("${PLURALFORM(qtAttribute, attribute)}")][QtModeling::DocumentationRole] = QStringLiteral("${attribute.findvalue("ownedComment/body/text()")}");
-    QModelingObject::propertyDataHash[QStringLiteral("Q${namespace}${className}")][QStringLiteral("${PLURALFORM(qtAttribute, attribute)}")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("${attribute.findvalue("@redefinedProperty")}");
-    QModelingObject::propertyDataHash[QStringLiteral("Q${namespace}${className}")][QStringLiteral("${PLURALFORM(qtAttribute, attribute)}")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("${attribute.findvalue("@subsettedProperty")}");
-    QModelingObject::propertyDataHash[QStringLiteral("Q${namespace}${className}")][QStringLiteral("${PLURALFORM(qtAttribute, attribute)}")][QtModeling::OppositeEndRole] = QStringLiteral("
-[%- IF association != "" -%]
-[%- FOREACH memberEnd = xmi.findvalue("//packagedElement[@xmi:type=\"uml:Association\" and @name=\"${association}\"]/@memberEnd").split(' ') -%]
-[%- NEXT IF memberEnd == className.replace('$', "-${attribute.findvalue(\"@name\")}") -%]
-[%- SET oppositeProperty = xmi.findnodes("//packagedElement[@xmi:type=\"uml:Class\" and @name=\"${memberEnd.split('-').0}\"]/ownedAttribute[@name=\"${memberEnd.split('-').1}\"]") -%]
-[%- IF oppositeProperty.findvalue("@name") != "" -%]${oppositeProperty.findvalue("@xmi:id")}[%- END -%]
-[%- END -%]
-[%- END -%]
-");
-
-[%- END %]
-}
-
diff --git a/scripts/templates/qclass.h b/scripts/templates/qclass.h
index 58953164..f725a0ed 100644
--- a/scripts/templates/qclass.h
+++ b/scripts/templates/qclass.h
@@ -54,7 +54,7 @@
 [% END -%]
 [%- END -%]
 [%- IF superclasses.size == 0 -%]
-#include <QtModeling/QModelingObject>
+#include <QtModeling/QModelingElement>
 
 [% END -%]
 [%- SET useNamespace = 'false' -%]
@@ -70,7 +70,6 @@
 [%- IF useNamespace == 'true' %]
 #include <Qt${namespace}/Qt${namespace}Namespace>
 [% END -%]
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -89,16 +88,16 @@ public Q${namespace}${superclass.findvalue("@general")}
 [%- IF !loop.last %], [% END -%]
 [%- END -%]
 [%- IF superclasses.size == 0 -%]
-public QModelingObject
+public QModelingElement
 [%- END %]
 {
 public:
 [%- IF class.findvalue("@isAbstract") != "true" %]
-    explicit Q${namespace}${className}(bool createQObject = true);
+    explicit Q${namespace}${className}(bool createQModelingObject = true);
 [%- END %]
     virtual ~Q${namespace}${className}();
 
-    [% IF class.findvalue("@isAbstract") == "true" %]Q_DECL_HIDDEN [% END %]QModelingObject *clone() const;
+    [% IF class.findvalue("@isAbstract") == "true" %]Q_DECL_HIDDEN [% END %]virtual QModelingElement *clone() const;
 [% FOREACH attribute = class.findnodes("ownedAttribute") -%]
     [%- IF loop.first %]
     // Owned attributes
@@ -140,9 +139,6 @@ protected:
 [%- FOREACH attribute = class.findnodes("ownedAttribute[(@isDerived=\"false\" or not(@isDerived)) or (@isDerivedUnion and @isDerivedUnion=\"true\")]") %]
     [% QT_TYPE(namespace, attribute) -%]_[%- PLURALFORM(QT_ATTRIBUTE(attribute), attribute) %];
 [%- END %]
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/scripts/templates/qobjectclass.cpp b/scripts/templates/qobjectclass.cpp
index 2142a4de..2fb157f8 100644
--- a/scripts/templates/qobjectclass.cpp
+++ b/scripts/templates/qobjectclass.cpp
@@ -40,6 +40,7 @@
 **
 ****************************************************************************/
 #include "q${namespace.lower}${className.lower}object_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <Qt${namespace}/Q${namespace}${className}>
 [% SET useNamespace = 'false' -%]
@@ -53,17 +54,19 @@
 [%- END -%]
 QT_BEGIN_NAMESPACE
 
-Q${namespace}${className}Object::Q${namespace}${className}Object(Q${namespace}${className} *qModelingObject)
+Q${namespace}${className}Object::Q${namespace}${className}Object(Q${namespace}${className} *modelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(modelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 [%- IF class.findvalue("@isAbstract") != "true" %]
 Q${namespace}${className}Object::~Q${namespace}${className}Object()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<Q${namespace}${className} *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<Q${namespace}${className} *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -81,5 +84,46 @@ Q${namespace}${className}Object::~Q${namespace}${className}Object()
 [%- GENERATE_CPP_OPERATIONS(originalClassName, class, visitedClasses, redefinedOperations) -%]
 [%- visitedClasses = [] %]
 [%- GENERATE_CPP_SLOTS(originalClassName, class, visitedClasses, redefinedProperties) -%]
+
+void Q${namespace}${className}Object::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+[%- visitedClasses = [] -%]
+[%- SET_GROUP_PROPERTIES(class, visitedClasses, redefinedProperties) %]
+}
+
+void Q${namespace}${className}Object::setPropertyData()
+{
+[%- FOREACH attribute = class.findnodes("ownedAttribute") -%]
+[%- SET qtAttribute = QT_ATTRIBUTE(attribute) -%]
+[%- SET association = attribute.findvalue("@association") -%]
+[%- IF attribute.findvalue("@aggregation") == "composite" %]
+    Q_DECLARE_METAPROPERTY_INFO(Q${namespace}${className}, ${PLURALFORM(qtAttribute, attribute)}, AggregationRole, QStringLiteral("composite"));
+[%- ELSE %]
+    Q_DECLARE_METAPROPERTY_INFO(Q${namespace}${className}, ${PLURALFORM(qtAttribute, attribute)}, AggregationRole, QStringLiteral("none"));
+[%- END %]
+    Q_DECLARE_METAPROPERTY_INFO(Q${namespace}${className}, ${PLURALFORM(qtAttribute, attribute)}, PropertyClassRole, QStringLiteral("Q${namespace}${className}"));
+    Q_DECLARE_METAPROPERTY_INFO(Q${namespace}${className}, ${PLURALFORM(qtAttribute, attribute)}, IsDerivedRole, [% IF attribute.findvalue("@isDerived") == "true" %]true[% ELSE %]false[% END %]);
+    Q_DECLARE_METAPROPERTY_INFO(Q${namespace}${className}, ${PLURALFORM(qtAttribute, attribute)}, IsDerivedUnionRole, [% IF attribute.findvalue("@isDerivedUnion") == "true" %]true[% ELSE %]false[% END %]);
+    Q_DECLARE_METAPROPERTY_INFO(Q${namespace}${className}, ${PLURALFORM(qtAttribute, attribute)}, DocumentationRole, QStringLiteral("${attribute.findvalue("ownedComment/body/text()")}"));
+    Q_DECLARE_METAPROPERTY_INFO(Q${namespace}${className}, ${PLURALFORM(qtAttribute, attribute)}, RedefinedPropertiesRole, QStringLiteral("${attribute.findvalue("@redefinedProperty")}"));
+    Q_DECLARE_METAPROPERTY_INFO(Q${namespace}${className}, ${PLURALFORM(qtAttribute, attribute)}, SubsettedPropertiesRole, QStringLiteral("${attribute.findvalue("@subsettedProperty")}"));
+    Q_DECLARE_METAPROPERTY_INFO(Q${namespace}${className}, ${PLURALFORM(qtAttribute, attribute)}, OppositeEndRole, QStringLiteral("
+[%- IF association != "" -%]
+[%- FOREACH memberEnd = xmi.findvalue("//packagedElement[@xmi:type=\"uml:Association\" and @name=\"${association}\"]/@memberEnd").split(' ') -%]
+[%- NEXT IF memberEnd == className.replace('$', "-${attribute.findvalue(\"@name\")}") -%]
+[%- SET oppositeProperty = xmi.findnodes("//packagedElement[@xmi:type=\"uml:Class\" and @name=\"${memberEnd.split('-').0}\"]/ownedAttribute[@name=\"${memberEnd.split('-').1}\"]") -%]
+[%- IF oppositeProperty.findvalue("@name") != "" -%]${oppositeProperty.findvalue("@xmi:id")}[%- END -%]
+[%- END -%]
+[%- END -%]
+"));
+
+[%- END %]
+}
+
 QT_END_NAMESPACE
 
diff --git a/scripts/templates/qobjectclass_p.h b/scripts/templates/qobjectclass_p.h
index e41ac90f..e2956b0f 100644
--- a/scripts/templates/qobjectclass_p.h
+++ b/scripts/templates/qobjectclass_p.h
@@ -44,7 +44,7 @@
 
 #include <Qt${namespace}/Qt${namespace}Global>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 [% useNamespace = [] -%]
 [%- forwards = [] -%]
 [%- visitedClasses = [] -%]
@@ -60,9 +60,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Qt${namespace})
 
 class Q${namespace}${className};
-class Q_${namespace.upper}_EXPORT Q${namespace}${className}Object : public QObject
+class QModelingObjectPrivate;
+class Q_${namespace.upper}_EXPORT Q${namespace}${className}Object : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(Q${namespace}${className}Object)
+    Q_DECLARE_PRIVATE(QModelingObject)
     [%- visitedClasses = [] -%]
     [%- redefinedProperties = [] -%]
     [%- POPULATE_REDEFINED_PROPERTIES(class, visitedClasses, redefinedProperties) -%]
@@ -70,7 +73,7 @@ class Q_${namespace.upper}_EXPORT Q${namespace}${className}Object : public QObje
     [%- GENERATE_QPROPERTIES(class, visitedClasses, redefinedProperties) %]
 
 public:
-    [% IF class.findvalue("@isAbstract") == "true" %]Q_DECL_HIDDEN [% ELSE %]Q_INVOKABLE [% END %]explicit Q${namespace}${className}Object(Q${namespace}${className} *qModelingObject);
+    [% IF class.findvalue("@isAbstract") == "true" %]Q_DECL_HIDDEN [% ELSE %]Q_INVOKABLE [% END %]explicit Q${namespace}${className}Object(Q${namespace}${className} *modelingElement);
     [%- IF class.findvalue("@isAbstract") != "true" %]
     virtual ~Q${namespace}${className}Object();
     [%- END %]
@@ -84,6 +87,10 @@ public:
 [%- visitedClasses = [] %]
 
 public Q_SLOTS:[%- GENERATE_SLOTS(class, visitedClasses, redefinedProperties) %]
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/modeling/modeling.pro b/src/modeling/modeling.pro
index 7e7c5ea4..2f9fb3f0 100644
--- a/src/modeling/modeling.pro
+++ b/src/modeling/modeling.pro
@@ -23,7 +23,6 @@ PRIVATE_HEADERS += \
 
 SOURCES += \
     qtmodelingnamespace.cpp \
-    qmodelingelement.cpp \
     qmodelingobject.cpp \
     qmetamodelplugin.cpp \
     qxmiwriter.cpp \
diff --git a/src/modeling/qmetamodelplugin.h b/src/modeling/qmetamodelplugin.h
index d36761b5..dbda2db6 100644
--- a/src/modeling/qmetamodelplugin.h
+++ b/src/modeling/qmetamodelplugin.h
@@ -43,8 +43,6 @@
 
 #include <QtModeling/QtModelingGlobal>
 
-#include <QtCore/QObject>
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -62,7 +60,7 @@ public:
     explicit QMetaModelPlugin(QObject *parent = 0);
 
     virtual void initMetaModel(QScriptEngine *scriptEngine = 0) = 0;
-    virtual QModelingElement *createModelingObject(QString type) = 0;
+    virtual QModelingElement *createModelingElement(QString type) = 0;
 };
 
 QT_END_NAMESPACE
diff --git a/src/modeling/qmodelingelement.cpp b/src/modeling/qmodelingelement.cpp
deleted file mode 100644
index 285e5b5b..00000000
--- a/src/modeling/qmodelingelement.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org>
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtModeling module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include "qmodelingelement.h"
-
-QT_BEGIN_NAMESPACE
-
-QT_END_NAMESPACE
-
diff --git a/src/modeling/qmodelingelement.h b/src/modeling/qmodelingelement.h
index a4f30cb9..b0a7f4b6 100644
--- a/src/modeling/qmodelingelement.h
+++ b/src/modeling/qmodelingelement.h
@@ -42,15 +42,10 @@
 #define QTMODELING_QMODELINGELEMENT_H
 
 #include <QtModeling/QtModelingGlobal>
-#include <QtModeling/QtModelingNamespace>
 
-#include <QtCore/QSet>
-#include <QtCore/QList>
-#include <QtCore/QString>
+#include <QtModeling/QModelingObject>
+
 #include <QtCore/QPointer>
-#include <QtCore/QMetaType>
-#include <QtCore/QStringList>
-#include <QtCore/QMetaProperty>
 
 QT_BEGIN_HEADER
 
@@ -58,32 +53,30 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtModeling)
 
-class QObject;
-
 class Q_MODELING_EXPORT QModelingElement
 {
 public:
     virtual ~QModelingElement() {}
-    inline QObject *asQObject() { return _qObject; }
+    inline QModelingObject *asQModelingObject() { return _qModelingObject; }
 
-    bool deletingFromQObject;
+    bool deletingFromQModelingObject;
 
     virtual QModelingElement *clone() const = 0;
 
 protected:
-    QModelingElement() : deletingFromQObject(false), _qObject(0) {}
-    QPointer<QObject> _qObject;
+    QModelingElement() : deletingFromQModelingObject(false), _qModelingObject(0) {}
+    QPointer<QModelingObject> _qModelingObject;
 };
 
-inline QModelingElement *qModelingElement(const QObject *object)
+inline QModelingElement *qModelingElement(const QObject * const object)
 {
     return object ? object->property("modelingElement").value<QModelingElement *>():0;
 }
 
 template<class T>
-inline T qmodelingelementproperty_cast(const QObject *object)
+inline T qmodelingelementproperty_cast(const QObject * const modelingObject)
 {
-    return object ? dynamic_cast<T>(qModelingElement(object)):T();
+    return modelingObject ? dynamic_cast<T>(qModelingElement(modelingObject)):T();
 }
 
 QT_END_NAMESPACE
diff --git a/src/modeling/qmodelingobject.cpp b/src/modeling/qmodelingobject.cpp
index a6516b51..8a04c906 100644
--- a/src/modeling/qmodelingobject.cpp
+++ b/src/modeling/qmodelingobject.cpp
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-QHash< QString, QHash< QString, QHash<QtModeling::MetaPropertyDataRole, QVariant> > > QModelingObjectPrivate::propertyDataHash;
+QHash< QString, QHash< QString, QHash<QtModeling::MetaPropertyDataRole, QVariant> > > QModelingObject::propertyDataHash;
 
 QModelingObjectPrivate::QModelingObjectPrivate()
 {
@@ -66,7 +66,7 @@ bool QModelingObject::isPropertyModified(QMetaProperty metaProperty) const
 
 QVariant QModelingObject::propertyData(QString className, QMetaProperty metaProperty, QtModeling::MetaPropertyDataRole role)
 {
-    return QModelingObjectPrivate::propertyDataHash[className][QString::fromLatin1(metaProperty.name())][role];
+    return QModelingObject::propertyDataHash[className][QString::fromLatin1(metaProperty.name())][role];
 }
 
 int QModelingObject::propertyGroupIndex(QMetaProperty metaProperty) const
@@ -88,12 +88,14 @@ const QStringList &QModelingObject::propertyGroups() const
     return d->propertyGroups;
 }
 
-const QStringList &QModelingObject::modifiedResettableProperties() const
+QStringList &QModelingObject::modifiedResettableProperties()
 {
-    Q_D(const QModelingObject);
+    Q_D(QModelingObject);
     return d->modifiedResettableProperties;
 }
 
 QModelingObject::QModelingObject()
+    : QObject(*new QModelingObjectPrivate)
 {
 }
+
diff --git a/src/modeling/qmodelingobject.h b/src/modeling/qmodelingobject.h
index e5d302cd..ca7758ba 100644
--- a/src/modeling/qmodelingobject.h
+++ b/src/modeling/qmodelingobject.h
@@ -42,11 +42,9 @@
 #define QTMODELING_QMODELINGOBJECT_H
 
 #include <QtModeling/QtModelingGlobal>
-#include <QtModeling/QtModelingNamespace>
 
-#include <QtCore/QObject>
+#include <QtModeling/QtModelingNamespace>
 
-#include <QtCore/QStringList>
 #include <QtCore/QMetaProperty>
 
 QT_BEGIN_HEADER
@@ -70,7 +68,9 @@ public:
     static QVariant propertyData(QString className, QMetaProperty metaProperty, QtModeling::MetaPropertyDataRole role);
     int propertyGroupIndex(QMetaProperty metaProperty) const;
     const QStringList &propertyGroups() const;
-    const QStringList &modifiedResettableProperties() const;
+    QStringList &modifiedResettableProperties();
+
+    static QHash< QString, QHash< QString, QHash<QtModeling::MetaPropertyDataRole, QVariant> > > propertyDataHash;
 
 protected:
     QModelingObject();
@@ -84,3 +84,4 @@ QT_END_NAMESPACE
 QT_END_HEADER
 
 #endif // QTMODELING_QMODELINGOBJECT_H
+
diff --git a/src/modeling/qmodelingobject_p.h b/src/modeling/qmodelingobject_p.h
index f5c8f2ea..6157e265 100644
--- a/src/modeling/qmodelingobject_p.h
+++ b/src/modeling/qmodelingobject_p.h
@@ -44,6 +44,10 @@
 #include "qtmodelingglobal.h"
 #include "private/qobject_p.h"
 
+#include "QtModeling/QModelingObject"
+
+#define Q_DECLARE_METAPROPERTY_INFO(clazz, property, role, value) QModelingObject::propertyDataHash[QStringLiteral(#clazz)][QStringLiteral(#property)][QtModeling::role] = value;
+
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -63,7 +67,6 @@ public:
     QStringList modifiedResettableProperties;
     QStringList propertyGroups;
     QMultiHash<QString, QMetaProperty *> groupProperties;
-    static QHash< QString, QHash< QString, QHash<QtModeling::MetaPropertyDataRole, QVariant> > > propertyDataHash;
 };
 
 QT_END_NAMESPACE
diff --git a/src/modeling/qtmodelingglobal.h b/src/modeling/qtmodelingglobal.h
index c1cebfaf..6c0db72a 100644
--- a/src/modeling/qtmodelingglobal.h
+++ b/src/modeling/qtmodelingglobal.h
@@ -42,7 +42,6 @@
 #define QTMODELINGGLOBAL_H
 
 #include <QtCore/QtGlobal>
-#include <QtCore/QVariant>
 
 #include <QtScript/QScriptValue>
 #include <QtScript/QScriptEngine>
diff --git a/src/modeling/qtmodelingnamespace.h b/src/modeling/qtmodelingnamespace.h
index 5e558b7e..8851ce5b 100644
--- a/src/modeling/qtmodelingnamespace.h
+++ b/src/modeling/qtmodelingnamespace.h
@@ -43,8 +43,6 @@
 
 #include <QtModeling/QtModelingGlobal>
 
-#include <QtCore/QObject>
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
diff --git a/src/modeling/qxmireader.cpp b/src/modeling/qxmireader.cpp
index 9969295b..9146ce0d 100644
--- a/src/modeling/qxmireader.cpp
+++ b/src/modeling/qxmireader.cpp
@@ -134,11 +134,11 @@ QList<QModelingElement *> QXmiReader::readFile(QIODevice *device, QString import
                 QList<QModelingElement *> importList = readFile(&importFile, reader.attributes().value(QString::fromLatin1("href")).toString().split(QString::fromLatin1("#")).last());
                 if (importList.count() > 0) {
                     if (elementName == QString::fromLatin1("importedPackage"))
-                        importList.first()->asQObject()->setProperty("role", QtModeling::ImportedPackageRole);
+                        importList.first()->asQModelingObject()->setProperty("role", QtModeling::ImportedPackageRole);
                     else if (elementName == QString::fromLatin1("importedElement"))
-                        importList.first()->asQObject()->setProperty("role", QtModeling::ImportedElementRole);
+                        importList.first()->asQModelingObject()->setProperty("role", QtModeling::ImportedElementRole);
                     else if (elementName == QString::fromLatin1("appliedProfile"))
-                        importList.first()->asQObject()->setProperty("role", QtModeling::AppliedProfileRole);
+                        importList.first()->asQModelingObject()->setProperty("role", QtModeling::AppliedProfileRole);
                 }
                 foreach (QModelingElement *importedObject, importList) {
                     modelingObjectList.append(importedObject);
@@ -215,13 +215,13 @@ QList<QModelingElement *> QXmiReader::readFile(QIODevice *device, QString import
             QModelingElement *modelingObject = d->idMap.value(id);
 
             if (modelingObject) {
-                const QMetaObject *metaObject = modelingObject->asQObject()->metaObject();
+                const QMetaObject *metaObject = modelingObject->asQModelingObject()->metaObject();
                 foreach (QXmlStreamAttribute attribute, reader.attributes()) {
                     int propertyIndex;
                     if ((propertyIndex = metaObject->indexOfProperty(attribute.name().toString().toLatin1())) != -1) {
                         QMetaProperty metaProperty = metaObject->property(propertyIndex);
                         if (metaProperty.type() == QVariant::Bool) {
-                            if (!modelingObject->asQObject()->setProperty(attribute.name().toString().toLatin1(), attribute.value().toString() == QString::fromLatin1("true") ? true:false))
+                            if (!modelingObject->asQModelingObject()->setProperty(attribute.name().toString().toLatin1(), attribute.value().toString() == QString::fromLatin1("true") ? true:false))
                                 d->errors << QString::fromLatin1("Error when setting property '%1' of object with id '%2'.").arg(attribute.name().toString()).arg(id);
                         }
                         else if (metaProperty.isEnumType()) {
@@ -229,11 +229,11 @@ QList<QModelingElement *> QXmiReader::readFile(QIODevice *device, QString import
                             enumName = enumName.left(1).toUpper() + enumName.mid(1);
                             QString propertyName = QString::fromLatin1(metaProperty.name());
                             enumName.prepend(propertyName.left(1).toUpper() + propertyName.mid(1));
-                            if (!modelingObject->asQObject()->setProperty(attribute.name().toString().toLatin1(), enumName))
+                            if (!modelingObject->asQModelingObject()->setProperty(attribute.name().toString().toLatin1(), enumName))
                                 d->errors << QString::fromLatin1("Error when setting property '%1' of object with id '%2'.").arg(attribute.name().toString()).arg(id);
                         }
                         else if (metaProperty.type() == QVariant::String) {
-                            if (!modelingObject->asQObject()->setProperty(attribute.name().toString().toLatin1(), attribute.value().toString()))
+                            if (!modelingObject->asQModelingObject()->setProperty(attribute.name().toString().toLatin1(), attribute.value().toString()))
                                 d->errors << QString::fromLatin1("Error when setting property '%1' of object with id '%2'.").arg(attribute.name().toString()).arg(id);
                         }
                         else if (metaProperty.type() == QVariant::UserType) {
@@ -241,42 +241,42 @@ QList<QModelingElement *> QXmiReader::readFile(QIODevice *device, QString import
                             if (propertyObject) {
                                 QString elementName = attribute.name().toString();
                                 elementName = elementName.left(1).toUpper() + elementName.mid(1);
-                                int methodCount = modelingObject->asQObject()->metaObject()->methodCount();
+                                int methodCount = modelingObject->asQModelingObject()->metaObject()->methodCount();
                                 int i;
                                 for (i = 0; i < methodCount; ++i) {
-                                    QMetaMethod metaMethod = modelingObject->asQObject()->metaObject()->method(i);
+                                    QMetaMethod metaMethod = modelingObject->asQModelingObject()->metaObject()->method(i);
                                     if (QString::fromLatin1(metaMethod.name()) == QString::fromLatin1("set%1").arg(elementName)) {
-                                        if (!metaMethod.invoke(modelingObject->asQObject(), ::Q_ARG(QObject *, propertyObject->asQObject())))
-                                            d->errors << QString::fromLatin1("Error when invoking metamethod '%1' on object '%2'.").arg(QString::fromLatin1(metaMethod.name())).arg(propertyObject->asQObject()->objectName());
+                                        if (!metaMethod.invoke(modelingObject->asQModelingObject(), ::Q_ARG(QObject *, propertyObject->asQModelingObject())))
+                                            d->errors << QString::fromLatin1("Error when invoking metamethod '%1' on object '%2'.").arg(QString::fromLatin1(metaMethod.name())).arg(propertyObject->asQModelingObject()->objectName());
                                         break;
                                     }
                                 }
                                 if (i == methodCount)
-                                    d->errors << QString::fromLatin1("Metamethod add/set'%1' not found on object '%2'.").arg(elementName).arg(propertyObject->asQObject()->objectName());
+                                    d->errors << QString::fromLatin1("Metamethod add/set'%1' not found on object '%2'.").arg(elementName).arg(propertyObject->asQModelingObject()->objectName());
 
                             }
                         }
                     }
                     else
-                        d->errors << QString::fromLatin1("Property '%1' not found in object of type '%2'. Corresponding metamodel loaded ?").arg(attribute.name().toString()).arg(QString::fromLatin1(modelingObject->asQObject()->metaObject()->className()));
+                        d->errors << QString::fromLatin1("Property '%1' not found in object of type '%2'. Corresponding metamodel loaded ?").arg(attribute.name().toString()).arg(QString::fromLatin1(modelingObject->asQModelingObject()->metaObject()->className()));
                 }
                 if (!stack.isEmpty()) {
                     QModelingElement *containerObject = stack.top().second;
                     QString elementName = reader.name().toString();
                     elementName = elementName.left(1).toUpper() + elementName.mid(1);
-                    int methodCount = containerObject->asQObject()->metaObject()->methodCount();
+                    int methodCount = containerObject->asQModelingObject()->metaObject()->methodCount();
                     int i;
                     for (i = 0; i < methodCount; ++i) {
-                        QMetaMethod metaMethod = containerObject->asQObject()->metaObject()->method(i);
+                        QMetaMethod metaMethod = containerObject->asQModelingObject()->metaObject()->method(i);
                         if (QString::fromLatin1(metaMethod.name()) == QString::fromLatin1("add%1").arg(elementName) ||
                             QString::fromLatin1(metaMethod.name()) == QString::fromLatin1("set%1").arg(elementName)) {
-                            if (!metaMethod.invoke(containerObject->asQObject(), ::Q_ARG(QObject *, modelingObject->asQObject())))
-                                d->errors << QString::fromLatin1("Error when invoking metamethod '%1' on object '%2'.").arg(QString::fromLatin1(metaMethod.name())).arg(containerObject->asQObject()->objectName());
+                            if (!metaMethod.invoke(containerObject->asQModelingObject(), ::Q_ARG(QObject *, modelingObject->asQModelingObject())))
+                                d->errors << QString::fromLatin1("Error when invoking metamethod '%1' on object '%2'.").arg(QString::fromLatin1(metaMethod.name())).arg(containerObject->asQModelingObject()->objectName());
                             break;
                         }
                     }
                     if (i == methodCount)
-                        d->errors << QString::fromLatin1("Metamethod add/set'%1' not found on object '%2'.").arg(elementName).arg(containerObject->asQObject()->objectName());
+                        d->errors << QString::fromLatin1("Metamethod add/set'%1' not found on object '%2'.").arg(elementName).arg(containerObject->asQModelingObject()->objectName());
                 }
                 stack.push(QPair<QString, QModelingElement *>(reader.name().toString(), modelingObject));
             }
@@ -297,9 +297,9 @@ QModelingElement *QXmiReader::createInstance(QString namespaceUri, QString insta
 {
     Q_D(QXmiReader);
     QMetaModelPlugin *metamodelPlugin = d->metaModelPlugins[namespaceUri].first;
-    QModelingElement *modelingObject = metamodelPlugin->createModelingObject(instanceClass);
+    QModelingElement *modelingObject = metamodelPlugin->createModelingElement(instanceClass);
     if (modelingObject) {
-        modelingObject->asQObject()->setObjectName(instanceName);
+        modelingObject->asQModelingObject()->setObjectName(instanceName);
         return modelingObject;
     }
     return 0;
diff --git a/src/modelingwidgets/qmodelingobjectpropertymodel.cpp b/src/modelingwidgets/qmodelingobjectpropertymodel.cpp
index 5c5511f4..ff1daef9 100644
--- a/src/modelingwidgets/qmodelingobjectpropertymodel.cpp
+++ b/src/modelingwidgets/qmodelingobjectpropertymodel.cpp
@@ -42,6 +42,7 @@
 #include "qmodelingobjectpropertymodel_p.h"
 
 #include <QtModeling/QModelingObject>
+#include <QtModeling/QModelingElement>
 
 #include <QtGui/QFontMetrics>
 
@@ -66,19 +67,19 @@ void QModelingObjectPropertyModel::setModelingObject(QModelingElement *modelingO
 {
     Q_D(QModelingObjectPropertyModel);
 
-    QObject *qObject = modelingObject->asQObject();
+    QModelingObject *qObject = modelingObject->asQModelingObject();
     if (qObject && d->modelingMetaObject != qObject->metaObject()) {
         beginResetModel();
         d->qObject = qObject;
         d->modelingMetaObject = d->qObject->metaObject();
         d->modelingObjectIndex = index;
         int propertyCount = d->modelingMetaObject->propertyCount();
-        QModelingElement *modelingObject = qModelingObject(qObject);
+        QModelingElement *modelingObject = qModelingElement(qObject);
         qDeleteAll(d->propertiesForGroup);
         d->propertyGroups.clear();
         QString currentGroup;
         for (int i = 0; i < propertyCount; ++i) {
-            QString group = modelingObject->propertyGroups().at(modelingObject->propertyGroupIndex(d->modelingMetaObject->property(i)));
+            QString group = qObject->propertyGroups().at(qObject->propertyGroupIndex(d->modelingMetaObject->property(i)));
             if (group != currentGroup) {
                 d->propertyGroups << group;
                 currentGroup = group;
@@ -130,7 +131,7 @@ QModelIndex QModelingObjectPropertyModel::parent(const QModelIndex &child) const
     QMetaProperty metaProperty = d->modelingMetaObject->property(d->modelingMetaObject->indexOfProperty(
                                                                      d->propertiesForGroup.values(d->propertyGroups.at(groupIndex)).at(child.row())->toLatin1())
                                                                  );
-    return createIndex(qModelingObject(d->qObject)->propertyGroupIndex(metaProperty), 0);
+    return createIndex(d->qObject->propertyGroupIndex(metaProperty), 0);
 }
 
 int QModelingObjectPropertyModel::rowCount(const QModelIndex &parent) const
@@ -260,9 +261,9 @@ QVariant QModelingObjectPropertyModel::data(const QModelIndex &index, int role)
                                                                              d->propertiesForGroup.values(d->propertyGroups.at(groupIndex)).at(index.row())->toLatin1())
                                                                          );
             if (metaProperty.isValid() && index.column() == 0 && metaProperty.isResettable())
-                font.setBold(qModelingObject(d->qObject)->isPropertyModified(metaProperty));
+                font.setBold(d->qObject->isPropertyModified(metaProperty));
             if (metaProperty.isValid() && index.column() == 0)
-                font.setItalic(QModelingElement::propertyData(QString::fromLatin1(d->modelingMetaObject->className()), metaProperty, QtModeling::AggregationRole).toString() == QString::fromLatin1("composite"));
+                font.setItalic(QModelingObject::propertyData(QString::fromLatin1(d->modelingMetaObject->className()), metaProperty, QtModeling::AggregationRole).toString() == QString::fromLatin1("composite"));
             return font;
         }
         case Qt::ToolTipRole: {
@@ -278,8 +279,8 @@ QVariant QModelingObjectPropertyModel::data(const QModelIndex &index, int role)
                                                                              d->propertiesForGroup.values(d->propertyGroups.at(groupIndex)).at(index.row())->toLatin1())
                                                                          );
             if (metaProperty.isValid()) {
-                QString toolTip = QModelingElement::propertyData(QString::fromLatin1(d->modelingMetaObject->className()), metaProperty, QtModeling::DocumentationRole).toString().remove(QRegularExpression(QString::fromLatin1(".$"))).append(QString::fromLatin1("."));
-                if (QModelingElement::propertyData(QString::fromLatin1(d->modelingMetaObject->className()), metaProperty, QtModeling::IsDerivedUnionRole).toBool())
+                QString toolTip = QModelingObject::propertyData(QString::fromLatin1(d->modelingMetaObject->className()), metaProperty, QtModeling::DocumentationRole).toString().remove(QRegularExpression(QString::fromLatin1(".$"))).append(QString::fromLatin1("."));
+                if (QModelingObject::propertyData(QString::fromLatin1(d->modelingMetaObject->className()), metaProperty, QtModeling::IsDerivedUnionRole).toBool())
                     toolTip += QString::fromLatin1(" This is a derived union property.");
                 else if (!metaProperty.isStored())
                     toolTip += QString::fromLatin1(" This is a derived property.");
@@ -291,16 +292,16 @@ QVariant QModelingObjectPropertyModel::data(const QModelIndex &index, int role)
                 if (!toolTip.isEmpty())
                     toolTip += QString::fromLatin1("\n\n");
                 toolTip += QString::fromLatin1("Type: %1").arg(QString::fromLatin1(metaProperty.typeName()));
-                QVariant variant = QModelingElement::propertyData(QString::fromLatin1(d->modelingMetaObject->className()), metaProperty, QtModeling::AggregationRole);
+                QVariant variant = QModelingObject::propertyData(QString::fromLatin1(d->modelingMetaObject->className()), metaProperty, QtModeling::AggregationRole);
                 if (variant.isValid() && variant.toString() != QString::fromLatin1("none"))
                     toolTip += QString::fromLatin1("\nAggregation: %1").arg(variant.toString());
-                QString redefinedProperties = QModelingElement::propertyData(QString::fromLatin1(d->modelingMetaObject->className()), metaProperty, QtModeling::RedefinedPropertiesRole).toString();
+                QString redefinedProperties = QModelingObject::propertyData(QString::fromLatin1(d->modelingMetaObject->className()), metaProperty, QtModeling::RedefinedPropertiesRole).toString();
                 if (!redefinedProperties.isEmpty())
                     toolTip += QString::fromLatin1("\nRedefines: %1").arg(redefinedProperties);
-                QString subsettedProperties = QModelingElement::propertyData(QString::fromLatin1(d->modelingMetaObject->className()), metaProperty, QtModeling::SubsettedPropertiesRole).toString();
+                QString subsettedProperties = QModelingObject::propertyData(QString::fromLatin1(d->modelingMetaObject->className()), metaProperty, QtModeling::SubsettedPropertiesRole).toString();
                 if (!subsettedProperties.isEmpty())
                     toolTip += QString::fromLatin1("\nSubsets: %1").arg(subsettedProperties);
-                QString oppositeEnd = QModelingElement::propertyData(QString::fromLatin1(d->modelingMetaObject->className()), metaProperty, QtModeling::OppositeEndRole).toString();
+                QString oppositeEnd = QModelingObject::propertyData(QString::fromLatin1(d->modelingMetaObject->className()), metaProperty, QtModeling::OppositeEndRole).toString();
                 if (!oppositeEnd.isEmpty())
                     toolTip += QString::fromLatin1("\nOpposite end: %1").arg(oppositeEnd);
                 return toolTip;
diff --git a/src/modelingwidgets/qmodelingobjectpropertymodel_p.h b/src/modelingwidgets/qmodelingobjectpropertymodel_p.h
index 770f4998..4a6eb04f 100644
--- a/src/modelingwidgets/qmodelingobjectpropertymodel_p.h
+++ b/src/modelingwidgets/qmodelingobjectpropertymodel_p.h
@@ -52,6 +52,7 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtModelingWidgets)
 
+class QModelingObject;
 class QMetaModelingObject;
 
 class Q_MODELINGWIDGETS_EXPORT QModelingObjectPropertyModelPrivate : public QAbstractItemModelPrivate
@@ -62,7 +63,7 @@ public:
     explicit QModelingObjectPropertyModelPrivate();
 
     QModelIndex modelingObjectIndex;
-    QObject *qObject;
+    QModelingObject *qObject;
     const QMetaObject *modelingMetaObject;
     QStringList propertyGroups;
     QMultiHash<QString, QString *> propertiesForGroup;
diff --git a/src/modelingwidgets/qmodelingobjectview.cpp b/src/modelingwidgets/qmodelingobjectview.cpp
index 107776b7..8b90a17d 100644
--- a/src/modelingwidgets/qmodelingobjectview.cpp
+++ b/src/modelingwidgets/qmodelingobjectview.cpp
@@ -43,6 +43,7 @@
 #include "qmodelingobjectmodel.h"
 
 #include <QtModeling/QModelingObject>
+#include <QtModeling/QModelingElement>
 
 #include <QtCore/QMetaProperty>
 #include <QtCore/QRegularExpression>
@@ -207,7 +208,7 @@ void QModelingObjectView::deleteObject()
         QModelingObjectModel *modelingObjectModel = dynamic_cast<QModelingObjectModel *>(d->treeView->model());
         modelingObjectModel->updateIndex(QModelIndex());
         d->treeView->setCurrentIndex(modelingObjectModel->index(0, 0));
-        emit modelingObjectChanged(qModelingObject(qvariant_cast<QObject *>(modelingObjectModel->index(0, 0).data(Qt::UserRole))));
+        emit modelingObjectChanged(qModelingElement(qvariant_cast<QObject *>(modelingObjectModel->index(0, 0).data(Qt::UserRole))));
         d->treeView->expandAll();
         d->treeView->resizeColumnToContents(0);
         d->treeView->resizeColumnToContents(1);
@@ -234,7 +235,7 @@ void QModelingObjectView::rowsInserted(const QModelIndex &parent, int first)
 
 void QModelingObjectView::selectionChanged(const QItemSelection &selected)
 {
-    emit modelingObjectChanged(qModelingObject(qvariant_cast<QObject *>(selected.indexes().first().data(Qt::UserRole))), selected.indexes().first());
+    emit modelingObjectChanged(qModelingElement(qvariant_cast<QObject *>(selected.indexes().first().data(Qt::UserRole))), selected.indexes().first());
 }
 
 #include "moc_qmodelingobjectview.cpp"
diff --git a/src/plugins/metamodels/uml/qumlmetamodelplugin.cpp b/src/plugins/metamodels/uml/qumlmetamodelplugin.cpp
index c310b2b6..b1f5d890 100644
--- a/src/plugins/metamodels/uml/qumlmetamodelplugin.cpp
+++ b/src/plugins/metamodels/uml/qumlmetamodelplugin.cpp
@@ -54,7 +54,7 @@ void QUmlMetaModelPlugin::initMetaModel(QScriptEngine *scriptEngine)
     QUmlMetaModel::init(scriptEngine);
 }
 
-QModelingObject *QUmlMetaModelPlugin::createModelingObject(QString type)
+QModelingElement *QUmlMetaModelPlugin::createModelingElement(QString type)
 {
     if (type == "QUmlAbstraction") return new QUmlAbstraction;
     else if (type == "QUmlAcceptCallAction") return new QUmlAcceptCallAction;
@@ -250,7 +250,7 @@ QModelingObject *QUmlMetaModelPlugin::createModelingObject(QString type)
     else if (type == "QUmlValueSpecificationAction") return new QUmlValueSpecificationAction;
     else if (type == "QUmlVariable") return new QUmlVariable;
     Q_ASSERT_X(true,
-               "QUmlMetaModelPlugin::createModelingObject",
+               "QUmlMetaModelPlugin::createModelingElement",
                QStringLiteral("QUmlMetaModelPlugin does not know how to create instances of '%1' type !").arg(type).toLatin1());
     return 0;
 }
diff --git a/src/plugins/metamodels/uml/qumlmetamodelplugin.h b/src/plugins/metamodels/uml/qumlmetamodelplugin.h
index 4587fd1a..4bb6dcad 100644
--- a/src/plugins/metamodels/uml/qumlmetamodelplugin.h
+++ b/src/plugins/metamodels/uml/qumlmetamodelplugin.h
@@ -44,7 +44,7 @@
 #include <QtModeling/QtModelingGlobal>
 #include <QtModeling/QMetaModelPlugin>
 
-class QModelingObject;
+class QModelingElement;
 
 class QUmlMetaModelPlugin : public QMetaModelPlugin
 {
@@ -55,7 +55,7 @@ public:
     QUmlMetaModelPlugin(QObject *parent = 0);
 
     virtual void initMetaModel(QScriptEngine *scriptEngine = 0);
-    virtual QModelingObject *createModelingObject(QString type);
+    virtual QModelingElement *createModelingElement(QString type);
 };
 
 #endif // QUMLMETAMODELPLUGIN_H
diff --git a/src/uml/qobjects/qumlabstractionobject.cpp b/src/uml/qobjects/qumlabstractionobject.cpp
index 74fe44f5..3d3e27a4 100644
--- a/src/uml/qobjects/qumlabstractionobject.cpp
+++ b/src/uml/qobjects/qumlabstractionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlabstractionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlAbstraction>
 #include <QtUml/QUmlComment>
@@ -54,16 +55,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlAbstractionObject::QUmlAbstractionObject(QUmlAbstraction *qModelingObject)
+QUmlAbstractionObject::QUmlAbstractionObject(QUmlAbstraction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlAbstractionObject::~QUmlAbstractionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlAbstraction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -72,43 +75,43 @@ QUmlAbstractionObject::~QUmlAbstractionObject()
 const QSet<QObject *> QUmlAbstractionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlAbstraction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAbstractionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlAbstraction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlAbstractionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlAbstraction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAbstraction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlAbstractionObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlAbstraction *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAbstraction *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlAbstractionObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlAbstraction *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAbstraction *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -116,42 +119,42 @@ QObject *QUmlAbstractionObject::templateParameter() const
 const QSet<QObject *> QUmlAbstractionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlAbstraction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlAbstractionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlAbstraction *>(this)->name();
 }
 
 QObject *QUmlAbstractionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlAbstraction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAbstraction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlAbstractionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlAbstraction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAbstraction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlAbstractionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlAbstraction *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlAbstractionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlAbstraction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Relationship]
@@ -159,8 +162,8 @@ QtUml::VisibilityKind QUmlAbstractionObject::visibility() const
 const QSet<QObject *> QUmlAbstractionObject::relatedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->relatedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlAbstraction *>(this)->relatedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -169,16 +172,16 @@ const QSet<QObject *> QUmlAbstractionObject::relatedElements() const
 const QSet<QObject *> QUmlAbstractionObject::sources() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->sources())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlAbstraction *>(this)->sources())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAbstractionObject::targets() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->targets())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlAbstraction *>(this)->targets())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -187,16 +190,16 @@ const QSet<QObject *> QUmlAbstractionObject::targets() const
 const QSet<QObject *> QUmlAbstractionObject::clients() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->clients())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlAbstraction *>(this)->clients())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAbstractionObject::suppliers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->suppliers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlAbstraction *>(this)->suppliers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -204,10 +207,10 @@ const QSet<QObject *> QUmlAbstractionObject::suppliers() const
 
 QObject *QUmlAbstractionObject::mapping() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->mapping())
+    if (!qmodelingelementproperty_cast<QUmlAbstraction *>(this)->mapping())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->mapping()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAbstraction *>(this)->mapping()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -215,26 +218,26 @@ QObject *QUmlAbstractionObject::mapping() const
 QSet<QObject *> QUmlAbstractionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlAbstraction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlAbstractionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlAbstraction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlAbstractionObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlAbstraction *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlAbstractionObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlAbstraction *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [NamedElement]
@@ -242,172 +245,229 @@ bool QUmlAbstractionObject::isTemplateParameter() const
 QList<QObject *> QUmlAbstractionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlAbstraction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlAbstractionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlAbstraction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlAbstractionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlAbstraction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlAbstractionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlAbstraction *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlAbstractionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlAbstraction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlAbstractionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlAbstraction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlAbstractionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlAbstraction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlAbstractionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlAbstraction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlAbstractionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlAbstraction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlAbstractionObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlAbstraction *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlAbstractionObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlAbstraction *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlAbstractionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlAbstraction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlAbstractionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlAbstraction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlAbstractionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlAbstraction *>(this)->setName(name);
 }
 
 void QUmlAbstractionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlAbstraction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlAbstractionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlAbstraction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlAbstractionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlAbstraction *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlAbstractionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlAbstraction *>(this)->setVisibility(visibility);
 }
 
 void QUmlAbstractionObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Relationship]
 
 void QUmlAbstractionObject::addRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->addRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlAbstraction *>(this)->addRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 void QUmlAbstractionObject::removeRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->removeRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlAbstraction *>(this)->removeRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [DirectedRelationship]
 
 void QUmlAbstractionObject::addSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->addSource(qmodelingobjectproperty_cast<QUmlElement *>(source));
+    qmodelingelementproperty_cast<QUmlAbstraction *>(this)->addSource(qmodelingelementproperty_cast<QUmlElement *>(source));
 }
 
 void QUmlAbstractionObject::removeSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->removeSource(qmodelingobjectproperty_cast<QUmlElement *>(source));
+    qmodelingelementproperty_cast<QUmlAbstraction *>(this)->removeSource(qmodelingelementproperty_cast<QUmlElement *>(source));
 }
 
 void QUmlAbstractionObject::addTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->addTarget(qmodelingobjectproperty_cast<QUmlElement *>(target));
+    qmodelingelementproperty_cast<QUmlAbstraction *>(this)->addTarget(qmodelingelementproperty_cast<QUmlElement *>(target));
 }
 
 void QUmlAbstractionObject::removeTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->removeTarget(qmodelingobjectproperty_cast<QUmlElement *>(target));
+    qmodelingelementproperty_cast<QUmlAbstraction *>(this)->removeTarget(qmodelingelementproperty_cast<QUmlElement *>(target));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Dependency]
 
 void QUmlAbstractionObject::addClient(QObject *client)
 {
-    qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->addClient(qmodelingobjectproperty_cast<QUmlNamedElement *>(client));
+    qmodelingelementproperty_cast<QUmlAbstraction *>(this)->addClient(qmodelingelementproperty_cast<QUmlNamedElement *>(client));
 }
 
 void QUmlAbstractionObject::removeClient(QObject *client)
 {
-    qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->removeClient(qmodelingobjectproperty_cast<QUmlNamedElement *>(client));
+    qmodelingelementproperty_cast<QUmlAbstraction *>(this)->removeClient(qmodelingelementproperty_cast<QUmlNamedElement *>(client));
 }
 
 void QUmlAbstractionObject::addSupplier(QObject *supplier)
 {
-    qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->addSupplier(qmodelingobjectproperty_cast<QUmlNamedElement *>(supplier));
+    qmodelingelementproperty_cast<QUmlAbstraction *>(this)->addSupplier(qmodelingelementproperty_cast<QUmlNamedElement *>(supplier));
 }
 
 void QUmlAbstractionObject::removeSupplier(QObject *supplier)
 {
-    qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->removeSupplier(qmodelingobjectproperty_cast<QUmlNamedElement *>(supplier));
+    qmodelingelementproperty_cast<QUmlAbstraction *>(this)->removeSupplier(qmodelingelementproperty_cast<QUmlNamedElement *>(supplier));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Abstraction]
 
 void QUmlAbstractionObject::setMapping(QObject *mapping)
 {
-    qmodelingobjectproperty_cast<QUmlAbstraction *>(this)->setMapping(qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(mapping));
+    qmodelingelementproperty_cast<QUmlAbstraction *>(this)->setMapping(qmodelingelementproperty_cast<QUmlOpaqueExpression *>(mapping));
+}
+
+
+void QUmlAbstractionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDirectedRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDependency");
+    d->groupProperties.insert(QStringLiteral("QUmlDependency"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clients"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDependency"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("suppliers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAbstraction");
+    d->groupProperties.insert(QStringLiteral("QUmlAbstraction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("mapping"))));
+}
+
+void QUmlAbstractionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAbstraction, mapping, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAbstraction, mapping, PropertyClassRole, QStringLiteral("QUmlAbstraction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAbstraction, mapping, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAbstraction, mapping, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAbstraction, mapping, DocumentationRole, QStringLiteral("An composition of an Expression that states the abstraction relationship between the supplier and the client. In some cases, such as Derivation, it is usually formal and unidirectional; in other cases, such as Trace, it is usually informal and bidirectional. The mapping expression is optional and may be omitted if the precise relationship between the elements is not specified."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAbstraction, mapping, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAbstraction, mapping, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAbstraction, mapping, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlabstractionobject_p.h b/src/uml/qobjects/qumlabstractionobject_p.h
index 569e7796..ed57d8c1 100644
--- a/src/uml/qobjects/qumlabstractionobject_p.h
+++ b/src/uml/qobjects/qumlabstractionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlAbstraction;
-class Q_UML_EXPORT QUmlAbstractionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlAbstractionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlAbstractionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -92,7 +95,7 @@ class Q_UML_EXPORT QUmlAbstractionObject : public QObject
     Q_PROPERTY(QObject * mapping READ mapping WRITE setMapping)
 
 public:
-    Q_INVOKABLE explicit QUmlAbstractionObject(QUmlAbstraction *qModelingObject);
+    Q_INVOKABLE explicit QUmlAbstractionObject(QUmlAbstraction *qModelingElement);
     virtual ~QUmlAbstractionObject();
 
     // Owned attributes [Element]
@@ -185,6 +188,10 @@ public Q_SLOTS:
 
     // Slots for owned attributes [Abstraction]
     void setMapping(QObject *mapping = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlacceptcallactionobject.cpp b/src/uml/qobjects/qumlacceptcallactionobject.cpp
index 1aa9831d..662db61c 100644
--- a/src/uml/qobjects/qumlacceptcallactionobject.cpp
+++ b/src/uml/qobjects/qumlacceptcallactionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlacceptcallactionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlAcceptCallAction>
 #include <QtUml/QUmlActivity>
@@ -65,16 +66,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlAcceptCallActionObject::QUmlAcceptCallActionObject(QUmlAcceptCallAction *qModelingObject)
+QUmlAcceptCallActionObject::QUmlAcceptCallActionObject(QUmlAcceptCallAction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlAcceptCallActionObject::~QUmlAcceptCallActionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -83,25 +86,25 @@ QUmlAcceptCallActionObject::~QUmlAcceptCallActionObject()
 const QSet<QObject *> QUmlAcceptCallActionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAcceptCallActionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlAcceptCallActionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -109,62 +112,62 @@ QObject *QUmlAcceptCallActionObject::owner() const
 const QSet<QObject *> QUmlAcceptCallActionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlAcceptCallActionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->name();
 }
 
 QObject *QUmlAcceptCallActionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlAcceptCallActionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlAcceptCallActionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlAcceptCallActionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlAcceptCallActionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlAcceptCallActionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAcceptCallActionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -172,65 +175,65 @@ const QSet<QObject *> QUmlAcceptCallActionObject::redefinitionContexts() const
 
 QObject *QUmlAcceptCallActionObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlAcceptCallActionObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAcceptCallActionObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAcceptCallActionObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlAcceptCallActionObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlAcceptCallActionObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAcceptCallActionObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAcceptCallActionObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -239,8 +242,8 @@ const QSet<QObject *> QUmlAcceptCallActionObject::redefinedNodes() const
 const QSet<QObject *> QUmlAcceptCallActionObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -248,46 +251,46 @@ const QSet<QObject *> QUmlAcceptCallActionObject::handlers() const
 
 QObject *QUmlAcceptCallActionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlAcceptCallActionObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlAcceptCallActionObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlAcceptCallActionObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAcceptCallActionObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlAcceptCallActionObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -295,22 +298,22 @@ const QList<QObject *> QUmlAcceptCallActionObject::outputs() const
 
 bool QUmlAcceptCallActionObject::isUnmarshall() const
 {
-    return qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->isUnmarshall();
+    return qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->isUnmarshall();
 }
 
 const QSet<QObject *> QUmlAcceptCallActionObject::results() const
 {
     QSet<QObject *> set;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->results())
-        set.insert(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->results())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAcceptCallActionObject::triggers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTrigger *element, qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->triggers())
-        set.insert(element->asQObject());
+    foreach (QUmlTrigger *element, qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->triggers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -318,10 +321,10 @@ const QSet<QObject *> QUmlAcceptCallActionObject::triggers() const
 
 QObject *QUmlAcceptCallActionObject::returnInformation() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->returnInformation())
+    if (!qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->returnInformation())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->returnInformation()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->returnInformation()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -329,14 +332,14 @@ QObject *QUmlAcceptCallActionObject::returnInformation() const
 QSet<QObject *> QUmlAcceptCallActionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlAcceptCallActionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -344,315 +347,388 @@ bool QUmlAcceptCallActionObject::mustBeOwned() const
 QList<QObject *> QUmlAcceptCallActionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlAcceptCallActionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlAcceptCallActionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlAcceptCallActionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlAcceptCallActionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlAcceptCallActionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlAcceptCallActionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlAcceptCallActionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlAcceptCallActionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlAcceptCallActionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlAcceptCallActionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlAcceptCallActionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlAcceptCallActionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlAcceptCallActionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->setName(name);
 }
 
 void QUmlAcceptCallActionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlAcceptCallActionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlAcceptCallActionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlAcceptCallActionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlAcceptCallActionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlAcceptCallActionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlAcceptCallActionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlAcceptCallActionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlAcceptCallActionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlAcceptCallActionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlAcceptCallActionObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlAcceptCallActionObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlAcceptCallActionObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlAcceptCallActionObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlAcceptCallActionObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlAcceptCallActionObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlAcceptCallActionObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlAcceptCallActionObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlAcceptCallActionObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlAcceptCallActionObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlAcceptCallActionObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlAcceptCallActionObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlAcceptCallActionObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlAcceptCallActionObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlAcceptCallActionObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlAcceptCallActionObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlAcceptCallActionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlAcceptCallActionObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlAcceptCallActionObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlAcceptCallActionObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlAcceptCallActionObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlAcceptCallActionObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlAcceptCallActionObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlAcceptCallActionObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlAcceptCallActionObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlAcceptCallActionObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlAcceptCallActionObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [AcceptEventAction]
 
 void QUmlAcceptCallActionObject::setUnmarshall(bool isUnmarshall)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->setUnmarshall(isUnmarshall);
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->setUnmarshall(isUnmarshall);
 }
 
 void QUmlAcceptCallActionObject::unsetUnmarshall()
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("unmarshall"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("unmarshall"));
 }
 
 void QUmlAcceptCallActionObject::addResult(QObject *result)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->addResult(qmodelingobjectproperty_cast<QUmlOutputPin *>(result));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->addResult(qmodelingelementproperty_cast<QUmlOutputPin *>(result));
 }
 
 void QUmlAcceptCallActionObject::removeResult(QObject *result)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->removeResult(qmodelingobjectproperty_cast<QUmlOutputPin *>(result));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->removeResult(qmodelingelementproperty_cast<QUmlOutputPin *>(result));
 }
 
 void QUmlAcceptCallActionObject::addTrigger(QObject *trigger)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->addTrigger(qmodelingobjectproperty_cast<QUmlTrigger *>(trigger));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->addTrigger(qmodelingelementproperty_cast<QUmlTrigger *>(trigger));
 }
 
 void QUmlAcceptCallActionObject::removeTrigger(QObject *trigger)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->removeTrigger(qmodelingobjectproperty_cast<QUmlTrigger *>(trigger));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->removeTrigger(qmodelingelementproperty_cast<QUmlTrigger *>(trigger));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [AcceptCallAction]
 
 void QUmlAcceptCallActionObject::setReturnInformation(QObject *returnInformation)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptCallAction *>(this)->setReturnInformation(qmodelingobjectproperty_cast<QUmlOutputPin *>(returnInformation));
+    qmodelingelementproperty_cast<QUmlAcceptCallAction *>(this)->setReturnInformation(qmodelingelementproperty_cast<QUmlOutputPin *>(returnInformation));
+}
+
+
+void QUmlAcceptCallActionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAcceptEventAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAcceptEventAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isUnmarshall"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAcceptEventAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("results"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAcceptEventAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("triggers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAcceptCallAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAcceptCallAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("returnInformation"))));
+}
+
+void QUmlAcceptCallActionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAcceptCallAction, returnInformation, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAcceptCallAction, returnInformation, PropertyClassRole, QStringLiteral("QUmlAcceptCallAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAcceptCallAction, returnInformation, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAcceptCallAction, returnInformation, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAcceptCallAction, returnInformation, DocumentationRole, QStringLiteral("Pin where a value is placed containing sufficient information to perform a subsequent reply and return control to the caller. The contents of this value are opaque. It can be passed and copied but it cannot be manipulated by the model."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAcceptCallAction, returnInformation, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAcceptCallAction, returnInformation, SubsettedPropertiesRole, QStringLiteral("Action-output"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAcceptCallAction, returnInformation, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlacceptcallactionobject_p.h b/src/uml/qobjects/qumlacceptcallactionobject_p.h
index 822c5fea..e43158fc 100644
--- a/src/uml/qobjects/qumlacceptcallactionobject_p.h
+++ b/src/uml/qobjects/qumlacceptcallactionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlAcceptCallAction;
-class Q_UML_EXPORT QUmlAcceptCallActionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlAcceptCallActionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlAcceptCallActionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -106,7 +109,7 @@ class Q_UML_EXPORT QUmlAcceptCallActionObject : public QObject
     Q_PROPERTY(QObject * returnInformation READ returnInformation WRITE setReturnInformation)
 
 public:
-    Q_INVOKABLE explicit QUmlAcceptCallActionObject(QUmlAcceptCallAction *qModelingObject);
+    Q_INVOKABLE explicit QUmlAcceptCallActionObject(QUmlAcceptCallAction *qModelingElement);
     virtual ~QUmlAcceptCallActionObject();
 
     // Owned attributes [Element]
@@ -239,6 +242,10 @@ public Q_SLOTS:
 
     // Slots for owned attributes [AcceptCallAction]
     void setReturnInformation(QObject *returnInformation = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlaccepteventactionobject.cpp b/src/uml/qobjects/qumlaccepteventactionobject.cpp
index 3d849338..0ca5b8cb 100644
--- a/src/uml/qobjects/qumlaccepteventactionobject.cpp
+++ b/src/uml/qobjects/qumlaccepteventactionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlaccepteventactionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlAcceptEventAction>
 #include <QtUml/QUmlActivity>
@@ -65,16 +66,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlAcceptEventActionObject::QUmlAcceptEventActionObject(QUmlAcceptEventAction *qModelingObject)
+QUmlAcceptEventActionObject::QUmlAcceptEventActionObject(QUmlAcceptEventAction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlAcceptEventActionObject::~QUmlAcceptEventActionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -83,25 +86,25 @@ QUmlAcceptEventActionObject::~QUmlAcceptEventActionObject()
 const QSet<QObject *> QUmlAcceptEventActionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAcceptEventActionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlAcceptEventActionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -109,62 +112,62 @@ QObject *QUmlAcceptEventActionObject::owner() const
 const QSet<QObject *> QUmlAcceptEventActionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlAcceptEventActionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->name();
 }
 
 QObject *QUmlAcceptEventActionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlAcceptEventActionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlAcceptEventActionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlAcceptEventActionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlAcceptEventActionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlAcceptEventActionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAcceptEventActionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -172,65 +175,65 @@ const QSet<QObject *> QUmlAcceptEventActionObject::redefinitionContexts() const
 
 QObject *QUmlAcceptEventActionObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlAcceptEventActionObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAcceptEventActionObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAcceptEventActionObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlAcceptEventActionObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlAcceptEventActionObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAcceptEventActionObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAcceptEventActionObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -239,8 +242,8 @@ const QSet<QObject *> QUmlAcceptEventActionObject::redefinedNodes() const
 const QSet<QObject *> QUmlAcceptEventActionObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -248,46 +251,46 @@ const QSet<QObject *> QUmlAcceptEventActionObject::handlers() const
 
 QObject *QUmlAcceptEventActionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlAcceptEventActionObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlAcceptEventActionObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlAcceptEventActionObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAcceptEventActionObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlAcceptEventActionObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -295,22 +298,22 @@ const QList<QObject *> QUmlAcceptEventActionObject::outputs() const
 
 bool QUmlAcceptEventActionObject::isUnmarshall() const
 {
-    return qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->isUnmarshall();
+    return qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->isUnmarshall();
 }
 
 const QSet<QObject *> QUmlAcceptEventActionObject::results() const
 {
     QSet<QObject *> set;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->results())
-        set.insert(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->results())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAcceptEventActionObject::triggers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTrigger *element, qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->triggers())
-        set.insert(element->asQObject());
+    foreach (QUmlTrigger *element, qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->triggers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -319,14 +322,14 @@ const QSet<QObject *> QUmlAcceptEventActionObject::triggers() const
 QSet<QObject *> QUmlAcceptEventActionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlAcceptEventActionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -334,308 +337,396 @@ bool QUmlAcceptEventActionObject::mustBeOwned() const
 QList<QObject *> QUmlAcceptEventActionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlAcceptEventActionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlAcceptEventActionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlAcceptEventActionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlAcceptEventActionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlAcceptEventActionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlAcceptEventActionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlAcceptEventActionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlAcceptEventActionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlAcceptEventActionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlAcceptEventActionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlAcceptEventActionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlAcceptEventActionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlAcceptEventActionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->setName(name);
 }
 
 void QUmlAcceptEventActionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlAcceptEventActionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlAcceptEventActionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlAcceptEventActionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlAcceptEventActionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlAcceptEventActionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlAcceptEventActionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlAcceptEventActionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlAcceptEventActionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlAcceptEventActionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlAcceptEventActionObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlAcceptEventActionObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlAcceptEventActionObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlAcceptEventActionObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlAcceptEventActionObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlAcceptEventActionObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlAcceptEventActionObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlAcceptEventActionObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlAcceptEventActionObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlAcceptEventActionObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlAcceptEventActionObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlAcceptEventActionObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlAcceptEventActionObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlAcceptEventActionObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlAcceptEventActionObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlAcceptEventActionObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlAcceptEventActionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlAcceptEventActionObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlAcceptEventActionObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlAcceptEventActionObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlAcceptEventActionObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlAcceptEventActionObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlAcceptEventActionObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlAcceptEventActionObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlAcceptEventActionObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlAcceptEventActionObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlAcceptEventActionObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [AcceptEventAction]
 
 void QUmlAcceptEventActionObject::setUnmarshall(bool isUnmarshall)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->setUnmarshall(isUnmarshall);
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->setUnmarshall(isUnmarshall);
 }
 
 void QUmlAcceptEventActionObject::unsetUnmarshall()
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("unmarshall"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("unmarshall"));
 }
 
 void QUmlAcceptEventActionObject::addResult(QObject *result)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->addResult(qmodelingobjectproperty_cast<QUmlOutputPin *>(result));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->addResult(qmodelingelementproperty_cast<QUmlOutputPin *>(result));
 }
 
 void QUmlAcceptEventActionObject::removeResult(QObject *result)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->removeResult(qmodelingobjectproperty_cast<QUmlOutputPin *>(result));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->removeResult(qmodelingelementproperty_cast<QUmlOutputPin *>(result));
 }
 
 void QUmlAcceptEventActionObject::addTrigger(QObject *trigger)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->addTrigger(qmodelingobjectproperty_cast<QUmlTrigger *>(trigger));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->addTrigger(qmodelingelementproperty_cast<QUmlTrigger *>(trigger));
 }
 
 void QUmlAcceptEventActionObject::removeTrigger(QObject *trigger)
 {
-    qmodelingobjectproperty_cast<QUmlAcceptEventAction *>(this)->removeTrigger(qmodelingobjectproperty_cast<QUmlTrigger *>(trigger));
+    qmodelingelementproperty_cast<QUmlAcceptEventAction *>(this)->removeTrigger(qmodelingelementproperty_cast<QUmlTrigger *>(trigger));
+}
+
+
+void QUmlAcceptEventActionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAcceptEventAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAcceptEventAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isUnmarshall"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAcceptEventAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("results"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAcceptEventAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("triggers"))));
+}
+
+void QUmlAcceptEventActionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAcceptEventAction, isUnmarshall, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAcceptEventAction, isUnmarshall, PropertyClassRole, QStringLiteral("QUmlAcceptEventAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAcceptEventAction, isUnmarshall, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAcceptEventAction, isUnmarshall, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAcceptEventAction, isUnmarshall, DocumentationRole, QStringLiteral("Indicates whether there is a single output pin for the event, or multiple output pins for attributes of the event."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAcceptEventAction, isUnmarshall, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAcceptEventAction, isUnmarshall, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAcceptEventAction, isUnmarshall, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAcceptEventAction, results, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAcceptEventAction, results, PropertyClassRole, QStringLiteral("QUmlAcceptEventAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAcceptEventAction, results, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAcceptEventAction, results, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAcceptEventAction, results, DocumentationRole, QStringLiteral("Pins holding the received event objects or their attributes. Event objects may be copied in transmission, so identity might not be preserved."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAcceptEventAction, results, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAcceptEventAction, results, SubsettedPropertiesRole, QStringLiteral("Action-output"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAcceptEventAction, results, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAcceptEventAction, triggers, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAcceptEventAction, triggers, PropertyClassRole, QStringLiteral("QUmlAcceptEventAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAcceptEventAction, triggers, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAcceptEventAction, triggers, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAcceptEventAction, triggers, DocumentationRole, QStringLiteral("The type of events accepted by the action, as specified by triggers. For triggers with signal events, a signal of the specified type or any subtype of the specified signal type is accepted."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAcceptEventAction, triggers, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAcceptEventAction, triggers, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAcceptEventAction, triggers, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlaccepteventactionobject_p.h b/src/uml/qobjects/qumlaccepteventactionobject_p.h
index fdb3cade..723e4165 100644
--- a/src/uml/qobjects/qumlaccepteventactionobject_p.h
+++ b/src/uml/qobjects/qumlaccepteventactionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlAcceptEventAction;
-class Q_UML_EXPORT QUmlAcceptEventActionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlAcceptEventActionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlAcceptEventActionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -103,7 +106,7 @@ class Q_UML_EXPORT QUmlAcceptEventActionObject : public QObject
     Q_PROPERTY(QSet<QObject *> triggers READ triggers)
 
 public:
-    Q_INVOKABLE explicit QUmlAcceptEventActionObject(QUmlAcceptEventAction *qModelingObject);
+    Q_INVOKABLE explicit QUmlAcceptEventActionObject(QUmlAcceptEventAction *qModelingElement);
     virtual ~QUmlAcceptEventActionObject();
 
     // Owned attributes [Element]
@@ -230,6 +233,10 @@ public Q_SLOTS:
     void removeResult(QObject *result);
     void addTrigger(QObject *trigger);
     void removeTrigger(QObject *trigger);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlactionexecutionspecificationobject.cpp b/src/uml/qobjects/qumlactionexecutionspecificationobject.cpp
index f0988b5c..e3972fb9 100644
--- a/src/uml/qobjects/qumlactionexecutionspecificationobject.cpp
+++ b/src/uml/qobjects/qumlactionexecutionspecificationobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlactionexecutionspecificationobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlActionExecutionSpecification>
 #include <QtUml/QUmlAction>
@@ -57,16 +58,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlActionExecutionSpecificationObject::QUmlActionExecutionSpecificationObject(QUmlActionExecutionSpecification *qModelingObject)
+QUmlActionExecutionSpecificationObject::QUmlActionExecutionSpecificationObject(QUmlActionExecutionSpecification *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlActionExecutionSpecificationObject::~QUmlActionExecutionSpecificationObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -75,25 +78,25 @@ QUmlActionExecutionSpecificationObject::~QUmlActionExecutionSpecificationObject(
 const QSet<QObject *> QUmlActionExecutionSpecificationObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActionExecutionSpecificationObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlActionExecutionSpecificationObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -101,40 +104,40 @@ QObject *QUmlActionExecutionSpecificationObject::owner() const
 const QSet<QObject *> QUmlActionExecutionSpecificationObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlActionExecutionSpecificationObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->name();
 }
 
 QObject *QUmlActionExecutionSpecificationObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlActionExecutionSpecificationObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlActionExecutionSpecificationObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlActionExecutionSpecificationObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [InteractionFragment]
@@ -142,32 +145,32 @@ QtUml::VisibilityKind QUmlActionExecutionSpecificationObject::visibility() const
 const QSet<QObject *> QUmlActionExecutionSpecificationObject::covered() const
 {
     QSet<QObject *> set;
-    foreach (QUmlLifeline *element, qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->covered())
-        set.insert(element->asQObject());
+    foreach (QUmlLifeline *element, qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->covered())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlActionExecutionSpecificationObject::enclosingInteraction() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->enclosingInteraction())
+    if (!qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->enclosingInteraction())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->enclosingInteraction()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->enclosingInteraction()->asQModelingObject();
 }
 
 QObject *QUmlActionExecutionSpecificationObject::enclosingOperand() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->enclosingOperand())
+    if (!qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->enclosingOperand())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->enclosingOperand()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->enclosingOperand()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlActionExecutionSpecificationObject::generalOrderings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralOrdering *element, qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->generalOrderings())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralOrdering *element, qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->generalOrderings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -175,28 +178,28 @@ const QSet<QObject *> QUmlActionExecutionSpecificationObject::generalOrderings()
 
 QObject *QUmlActionExecutionSpecificationObject::finish() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->finish())
+    if (!qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->finish())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->finish()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->finish()->asQModelingObject();
 }
 
 QObject *QUmlActionExecutionSpecificationObject::start() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->start())
+    if (!qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->start())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->start()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->start()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ActionExecutionSpecification]
 
 QObject *QUmlActionExecutionSpecificationObject::action() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->action())
+    if (!qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->action())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->action()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->action()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -204,14 +207,14 @@ QObject *QUmlActionExecutionSpecificationObject::action() const
 QSet<QObject *> QUmlActionExecutionSpecificationObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlActionExecutionSpecificationObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -219,142 +222,191 @@ bool QUmlActionExecutionSpecificationObject::mustBeOwned() const
 QList<QObject *> QUmlActionExecutionSpecificationObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlActionExecutionSpecificationObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlActionExecutionSpecificationObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlActionExecutionSpecificationObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlActionExecutionSpecificationObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlActionExecutionSpecificationObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlActionExecutionSpecificationObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlActionExecutionSpecificationObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlActionExecutionSpecificationObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlActionExecutionSpecificationObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlActionExecutionSpecificationObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlActionExecutionSpecificationObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->setName(name);
 }
 
 void QUmlActionExecutionSpecificationObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlActionExecutionSpecificationObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlActionExecutionSpecificationObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlActionExecutionSpecificationObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [InteractionFragment]
 
 void QUmlActionExecutionSpecificationObject::addCovered(QObject *covered)
 {
-    qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->addCovered(qmodelingobjectproperty_cast<QUmlLifeline *>(covered));
+    qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->addCovered(qmodelingelementproperty_cast<QUmlLifeline *>(covered));
 }
 
 void QUmlActionExecutionSpecificationObject::removeCovered(QObject *covered)
 {
-    qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->removeCovered(qmodelingobjectproperty_cast<QUmlLifeline *>(covered));
+    qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->removeCovered(qmodelingelementproperty_cast<QUmlLifeline *>(covered));
 }
 
 void QUmlActionExecutionSpecificationObject::setEnclosingInteraction(QObject *enclosingInteraction)
 {
-    qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->setEnclosingInteraction(qmodelingobjectproperty_cast<QUmlInteraction *>(enclosingInteraction));
+    qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->setEnclosingInteraction(qmodelingelementproperty_cast<QUmlInteraction *>(enclosingInteraction));
 }
 
 void QUmlActionExecutionSpecificationObject::setEnclosingOperand(QObject *enclosingOperand)
 {
-    qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->setEnclosingOperand(qmodelingobjectproperty_cast<QUmlInteractionOperand *>(enclosingOperand));
+    qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->setEnclosingOperand(qmodelingelementproperty_cast<QUmlInteractionOperand *>(enclosingOperand));
 }
 
 void QUmlActionExecutionSpecificationObject::addGeneralOrdering(QObject *generalOrdering)
 {
-    qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->addGeneralOrdering(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
+    qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->addGeneralOrdering(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
 }
 
 void QUmlActionExecutionSpecificationObject::removeGeneralOrdering(QObject *generalOrdering)
 {
-    qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->removeGeneralOrdering(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
+    qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->removeGeneralOrdering(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutionSpecification]
 
 void QUmlActionExecutionSpecificationObject::setFinish(QObject *finish)
 {
-    qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->setFinish(qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(finish));
+    qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->setFinish(qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(finish));
 }
 
 void QUmlActionExecutionSpecificationObject::setStart(QObject *start)
 {
-    qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->setStart(qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(start));
+    qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->setStart(qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(start));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActionExecutionSpecification]
 
 void QUmlActionExecutionSpecificationObject::setAction(QObject *action)
 {
-    qmodelingobjectproperty_cast<QUmlActionExecutionSpecification *>(this)->setAction(qmodelingobjectproperty_cast<QUmlAction *>(action));
+    qmodelingelementproperty_cast<QUmlActionExecutionSpecification *>(this)->setAction(qmodelingelementproperty_cast<QUmlAction *>(action));
+}
+
+
+void QUmlActionExecutionSpecificationObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlInteractionFragment");
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("covered"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingInteraction"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingOperand"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalOrderings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutionSpecification");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutionSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("finish"))));
+    d->groupProperties.insert(QStringLiteral("QUmlExecutionSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("start"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActionExecutionSpecification");
+    d->groupProperties.insert(QStringLiteral("QUmlActionExecutionSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("action"))));
+}
+
+void QUmlActionExecutionSpecificationObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActionExecutionSpecification, action, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActionExecutionSpecification, action, PropertyClassRole, QStringLiteral("QUmlActionExecutionSpecification"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActionExecutionSpecification, action, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActionExecutionSpecification, action, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActionExecutionSpecification, action, DocumentationRole, QStringLiteral("Action whose execution is occurring."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActionExecutionSpecification, action, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActionExecutionSpecification, action, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActionExecutionSpecification, action, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlactionexecutionspecificationobject_p.h b/src/uml/qobjects/qumlactionexecutionspecificationobject_p.h
index 6085f375..60cba2b6 100644
--- a/src/uml/qobjects/qumlactionexecutionspecificationobject_p.h
+++ b/src/uml/qobjects/qumlactionexecutionspecificationobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlActionExecutionSpecification;
-class Q_UML_EXPORT QUmlActionExecutionSpecificationObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlActionExecutionSpecificationObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlActionExecutionSpecificationObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -85,7 +88,7 @@ class Q_UML_EXPORT QUmlActionExecutionSpecificationObject : public QObject
     Q_PROPERTY(QObject * action READ action WRITE setAction)
 
 public:
-    Q_INVOKABLE explicit QUmlActionExecutionSpecificationObject(QUmlActionExecutionSpecification *qModelingObject);
+    Q_INVOKABLE explicit QUmlActionExecutionSpecificationObject(QUmlActionExecutionSpecification *qModelingElement);
     virtual ~QUmlActionExecutionSpecificationObject();
 
     // Owned attributes [Element]
@@ -156,6 +159,10 @@ public Q_SLOTS:
 
     // Slots for owned attributes [ActionExecutionSpecification]
     void setAction(QObject *action = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlactioninputpinobject.cpp b/src/uml/qobjects/qumlactioninputpinobject.cpp
index 16f562fc..a8ab10cf 100644
--- a/src/uml/qobjects/qumlactioninputpinobject.cpp
+++ b/src/uml/qobjects/qumlactioninputpinobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlactioninputpinobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlActionInputPin>
 #include <QtUml/QUmlAction>
@@ -66,16 +67,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlActionInputPinObject::QUmlActionInputPinObject(QUmlActionInputPin *qModelingObject)
+QUmlActionInputPinObject::QUmlActionInputPinObject(QUmlActionInputPin *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlActionInputPinObject::~QUmlActionInputPinObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -84,63 +87,63 @@ QUmlActionInputPinObject::~QUmlActionInputPinObject()
 const QSet<QObject *> QUmlActionInputPinObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActionInputPinObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlActionInputPinObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [MultiplicityElement]
 
 bool QUmlActionInputPinObject::isOrdered() const
 {
-    return qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->isOrdered();
+    return qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->isOrdered();
 }
 
 bool QUmlActionInputPinObject::isUnique() const
 {
-    return qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->isUnique();
+    return qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->isUnique();
 }
 
 int QUmlActionInputPinObject::lower() const
 {
-    return qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->lower();
+    return qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->lower();
 }
 
 QObject *QUmlActionInputPinObject::lowerValue() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->lowerValue())
+    if (!qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->lowerValue())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->lowerValue()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->lowerValue()->asQModelingObject();
 }
 
 int QUmlActionInputPinObject::upper() const
 {
-    return qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->upper();
+    return qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->upper();
 }
 
 QObject *QUmlActionInputPinObject::upperValue() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->upperValue())
+    if (!qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->upperValue())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->upperValue()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->upperValue()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -148,62 +151,62 @@ QObject *QUmlActionInputPinObject::upperValue() const
 const QSet<QObject *> QUmlActionInputPinObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlActionInputPinObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->name();
 }
 
 QObject *QUmlActionInputPinObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlActionInputPinObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlActionInputPinObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlActionInputPinObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlActionInputPinObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlActionInputPinObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActionInputPinObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -211,65 +214,65 @@ const QSet<QObject *> QUmlActionInputPinObject::redefinitionContexts() const
 
 QObject *QUmlActionInputPinObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlActionInputPinObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActionInputPinObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActionInputPinObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlActionInputPinObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlActionInputPinObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActionInputPinObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActionInputPinObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -277,10 +280,10 @@ const QSet<QObject *> QUmlActionInputPinObject::redefinedNodes() const
 
 QObject *QUmlActionInputPinObject::type() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->type())
+    if (!qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->type())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->type()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->type()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ObjectNode]
@@ -288,52 +291,52 @@ QObject *QUmlActionInputPinObject::type() const
 const QSet<QObject *> QUmlActionInputPinObject::inStates() const
 {
     QSet<QObject *> set;
-    foreach (QUmlState *element, qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->inStates())
-        set.insert(element->asQObject());
+    foreach (QUmlState *element, qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->inStates())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlActionInputPinObject::isControlType() const
 {
-    return qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->isControlType();
+    return qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->isControlType();
 }
 
 QtUml::ObjectNodeOrderingKind QUmlActionInputPinObject::ordering() const
 {
-    return qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->ordering();
+    return qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->ordering();
 }
 
 QObject *QUmlActionInputPinObject::selection() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->selection())
+    if (!qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->selection())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->selection()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->selection()->asQModelingObject();
 }
 
 QObject *QUmlActionInputPinObject::upperBound() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->upperBound())
+    if (!qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->upperBound())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->upperBound()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->upperBound()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [Pin]
 
 bool QUmlActionInputPinObject::isControl() const
 {
-    return qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->isControl();
+    return qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->isControl();
 }
 
 // OWNED ATTRIBUTES [ActionInputPin]
 
 QObject *QUmlActionInputPinObject::fromAction() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->fromAction())
+    if (!qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->fromAction())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->fromAction()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->fromAction()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -341,51 +344,51 @@ QObject *QUmlActionInputPinObject::fromAction() const
 QSet<QObject *> QUmlActionInputPinObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlActionInputPinObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [MultiplicityElement]
 
 bool QUmlActionInputPinObject::compatibleWith(QObject *other) const
 {
-    return qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->compatibleWith(qmodelingobjectproperty_cast<QUmlMultiplicityElement *>(other));
+    return qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->compatibleWith(qmodelingelementproperty_cast<QUmlMultiplicityElement *>(other));
 }
 
 bool QUmlActionInputPinObject::includesCardinality(int C) const
 {
-    return qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->includesCardinality(C);
+    return qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->includesCardinality(C);
 }
 
 bool QUmlActionInputPinObject::includesMultiplicity(QObject *M) const
 {
-    return qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->includesMultiplicity(qmodelingobjectproperty_cast<QUmlMultiplicityElement *>(M));
+    return qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->includesMultiplicity(qmodelingelementproperty_cast<QUmlMultiplicityElement *>(M));
 }
 
 bool QUmlActionInputPinObject::is(int lowerbound, int upperbound) const
 {
-    return qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->is(lowerbound, upperbound);
+    return qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->is(lowerbound, upperbound);
 }
 
 bool QUmlActionInputPinObject::isMultivalued() const
 {
-    return qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->isMultivalued();
+    return qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->isMultivalued();
 }
 
 int QUmlActionInputPinObject::lowerBound() const
 {
-    return qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->lowerBound();
+    return qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->lowerBound();
 }
 
 //int QUmlActionInputPinObject::upperBound() const
 //{
-//    return qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->upperBound();
+//    return qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->upperBound();
 //}
 
 // OPERATIONS [NamedElement]
@@ -393,327 +396,412 @@ int QUmlActionInputPinObject::lowerBound() const
 QList<QObject *> QUmlActionInputPinObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlActionInputPinObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlActionInputPinObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlActionInputPinObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlActionInputPinObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlActionInputPinObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlActionInputPinObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlActionInputPinObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlActionInputPinObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlActionInputPinObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlActionInputPinObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [MultiplicityElement]
 
 void QUmlActionInputPinObject::setOrdered(bool isOrdered)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->setOrdered(isOrdered);
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->setOrdered(isOrdered);
 }
 
 void QUmlActionInputPinObject::unsetOrdered()
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("ordered"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("ordered"));
 }
 
 void QUmlActionInputPinObject::setUnique(bool isUnique)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->setUnique(isUnique);
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->setUnique(isUnique);
 }
 
 void QUmlActionInputPinObject::unsetUnique()
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("unique"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("unique"));
 }
 
 void QUmlActionInputPinObject::setLower(int lower)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->setLower(lower);
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->setLower(lower);
 }
 
 void QUmlActionInputPinObject::unsetLower()
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("lower"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("lower"));
 }
 
 void QUmlActionInputPinObject::setLowerValue(QObject *lowerValue)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->setLowerValue(qmodelingobjectproperty_cast<QUmlValueSpecification *>(lowerValue));
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->setLowerValue(qmodelingelementproperty_cast<QUmlValueSpecification *>(lowerValue));
 }
 
 void QUmlActionInputPinObject::setUpper(int upper)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->setUpper(upper);
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->setUpper(upper);
 }
 
 void QUmlActionInputPinObject::unsetUpper()
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("upper"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("upper"));
 }
 
 void QUmlActionInputPinObject::setUpperValue(QObject *upperValue)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->setUpperValue(qmodelingobjectproperty_cast<QUmlValueSpecification *>(upperValue));
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->setUpperValue(qmodelingelementproperty_cast<QUmlValueSpecification *>(upperValue));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlActionInputPinObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlActionInputPinObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlActionInputPinObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->setName(name);
 }
 
 void QUmlActionInputPinObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlActionInputPinObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlActionInputPinObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlActionInputPinObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlActionInputPinObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlActionInputPinObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlActionInputPinObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlActionInputPinObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlActionInputPinObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlActionInputPinObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlActionInputPinObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlActionInputPinObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlActionInputPinObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlActionInputPinObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlActionInputPinObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlActionInputPinObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlActionInputPinObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlActionInputPinObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlActionInputPinObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlActionInputPinObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlActionInputPinObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlActionInputPinObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlActionInputPinObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlActionInputPinObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TypedElement]
 
 void QUmlActionInputPinObject::setType(QObject *type)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->setType(qmodelingobjectproperty_cast<QUmlType *>(type));
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->setType(qmodelingelementproperty_cast<QUmlType *>(type));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ObjectNode]
 
 void QUmlActionInputPinObject::addInState(QObject *inState)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->addInState(qmodelingobjectproperty_cast<QUmlState *>(inState));
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->addInState(qmodelingelementproperty_cast<QUmlState *>(inState));
 }
 
 void QUmlActionInputPinObject::removeInState(QObject *inState)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->removeInState(qmodelingobjectproperty_cast<QUmlState *>(inState));
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->removeInState(qmodelingelementproperty_cast<QUmlState *>(inState));
 }
 
 void QUmlActionInputPinObject::setControlType(bool isControlType)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->setControlType(isControlType);
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->setControlType(isControlType);
 }
 
 void QUmlActionInputPinObject::unsetControlType()
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("controlType"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("controlType"));
 }
 
 void QUmlActionInputPinObject::setOrdering(QtUml::ObjectNodeOrderingKind ordering)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->setOrdering(ordering);
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->setOrdering(ordering);
 }
 
 void QUmlActionInputPinObject::unsetOrdering()
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("ordering"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("ordering"));
 }
 
 void QUmlActionInputPinObject::setSelection(QObject *selection)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->setSelection(qmodelingobjectproperty_cast<QUmlBehavior *>(selection));
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->setSelection(qmodelingelementproperty_cast<QUmlBehavior *>(selection));
 }
 
 void QUmlActionInputPinObject::setUpperBound(QObject *upperBound)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->setUpperBound(qmodelingobjectproperty_cast<QUmlValueSpecification *>(upperBound));
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->setUpperBound(qmodelingelementproperty_cast<QUmlValueSpecification *>(upperBound));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Pin]
 
 void QUmlActionInputPinObject::setControl(bool isControl)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->setControl(isControl);
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->setControl(isControl);
 }
 
 void QUmlActionInputPinObject::unsetControl()
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("control"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("control"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActionInputPin]
 
 void QUmlActionInputPinObject::setFromAction(QObject *fromAction)
 {
-    qmodelingobjectproperty_cast<QUmlActionInputPin *>(this)->setFromAction(qmodelingobjectproperty_cast<QUmlAction *>(fromAction));
+    qmodelingelementproperty_cast<QUmlActionInputPin *>(this)->setFromAction(qmodelingelementproperty_cast<QUmlAction *>(fromAction));
+}
+
+
+void QUmlActionInputPinObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlMultiplicityElement");
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isOrdered"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isUnique"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lower"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lowerValue"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upper"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperValue"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTypedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
+
+    d->propertyGroups << QStringLiteral("QUmlObjectNode");
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStates"))));
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isControlType"))));
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ordering"))));
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("selection"))));
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperBound"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPin");
+    d->groupProperties.insert(QStringLiteral("QUmlPin"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isControl"))));
+
+    d->propertyGroups << QStringLiteral("QUmlInputPin");
+
+    d->propertyGroups << QStringLiteral("QUmlActionInputPin");
+    d->groupProperties.insert(QStringLiteral("QUmlActionInputPin"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("fromAction"))));
+}
+
+void QUmlActionInputPinObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActionInputPin, fromAction, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActionInputPin, fromAction, PropertyClassRole, QStringLiteral("QUmlActionInputPin"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActionInputPin, fromAction, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActionInputPin, fromAction, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActionInputPin, fromAction, DocumentationRole, QStringLiteral("The action used to provide values."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActionInputPin, fromAction, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActionInputPin, fromAction, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActionInputPin, fromAction, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlactioninputpinobject_p.h b/src/uml/qobjects/qumlactioninputpinobject_p.h
index 063790aa..3ba90639 100644
--- a/src/uml/qobjects/qumlactioninputpinobject_p.h
+++ b/src/uml/qobjects/qumlactioninputpinobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlActionInputPin;
-class Q_UML_EXPORT QUmlActionInputPinObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlActionInputPinObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlActionInputPinObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -111,7 +114,7 @@ class Q_UML_EXPORT QUmlActionInputPinObject : public QObject
     Q_PROPERTY(QObject * fromAction READ fromAction WRITE setFromAction)
 
 public:
-    Q_INVOKABLE explicit QUmlActionInputPinObject(QUmlActionInputPin *qModelingObject);
+    Q_INVOKABLE explicit QUmlActionInputPinObject(QUmlActionInputPin *qModelingElement);
     virtual ~QUmlActionInputPinObject();
 
     // Owned attributes [Element]
@@ -262,6 +265,10 @@ public Q_SLOTS:
 
     // Slots for owned attributes [ActionInputPin]
     void setFromAction(QObject *fromAction = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlactivityfinalnodeobject.cpp b/src/uml/qobjects/qumlactivityfinalnodeobject.cpp
index 2e0ebc3f..00f8b319 100644
--- a/src/uml/qobjects/qumlactivityfinalnodeobject.cpp
+++ b/src/uml/qobjects/qumlactivityfinalnodeobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlactivityfinalnodeobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlActivityFinalNode>
 #include <QtUml/QUmlActivity>
@@ -60,16 +61,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlActivityFinalNodeObject::QUmlActivityFinalNodeObject(QUmlActivityFinalNode *qModelingObject)
+QUmlActivityFinalNodeObject::QUmlActivityFinalNodeObject(QUmlActivityFinalNode *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlActivityFinalNodeObject::~QUmlActivityFinalNodeObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -78,25 +81,25 @@ QUmlActivityFinalNodeObject::~QUmlActivityFinalNodeObject()
 const QSet<QObject *> QUmlActivityFinalNodeObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActivityFinalNodeObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlActivityFinalNodeObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -104,62 +107,62 @@ QObject *QUmlActivityFinalNodeObject::owner() const
 const QSet<QObject *> QUmlActivityFinalNodeObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlActivityFinalNodeObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->name();
 }
 
 QObject *QUmlActivityFinalNodeObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlActivityFinalNodeObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlActivityFinalNodeObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlActivityFinalNodeObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlActivityFinalNodeObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlActivityFinalNodeObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActivityFinalNodeObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -167,65 +170,65 @@ const QSet<QObject *> QUmlActivityFinalNodeObject::redefinitionContexts() const
 
 QObject *QUmlActivityFinalNodeObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlActivityFinalNodeObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActivityFinalNodeObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActivityFinalNodeObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlActivityFinalNodeObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlActivityFinalNodeObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActivityFinalNodeObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActivityFinalNodeObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -234,14 +237,14 @@ const QSet<QObject *> QUmlActivityFinalNodeObject::redefinedNodes() const
 QSet<QObject *> QUmlActivityFinalNodeObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlActivityFinalNodeObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -249,207 +252,256 @@ bool QUmlActivityFinalNodeObject::mustBeOwned() const
 QList<QObject *> QUmlActivityFinalNodeObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlActivityFinalNodeObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlActivityFinalNodeObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlActivityFinalNodeObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlActivityFinalNodeObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlActivityFinalNodeObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlActivityFinalNodeObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlActivityFinalNodeObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlActivityFinalNodeObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlActivityFinalNodeObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlActivityFinalNodeObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlActivityFinalNodeObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlActivityFinalNodeObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlActivityFinalNodeObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->setName(name);
 }
 
 void QUmlActivityFinalNodeObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlActivityFinalNodeObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlActivityFinalNodeObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlActivityFinalNodeObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlActivityFinalNodeObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlActivityFinalNodeObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlActivityFinalNodeObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlActivityFinalNodeObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlActivityFinalNodeObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlActivityFinalNodeObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlActivityFinalNodeObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlActivityFinalNodeObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlActivityFinalNodeObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlActivityFinalNodeObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlActivityFinalNodeObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlActivityFinalNodeObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlActivityFinalNodeObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlActivityFinalNodeObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlActivityFinalNodeObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlActivityFinalNodeObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlActivityFinalNodeObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlActivityFinalNodeObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlActivityFinalNodeObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlActivityFinalNodeObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlActivityFinalNode *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlActivityFinalNode *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
+}
+
+
+void QUmlActivityFinalNodeObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlControlNode");
+
+    d->propertyGroups << QStringLiteral("QUmlFinalNode");
+
+    d->propertyGroups << QStringLiteral("QUmlActivityFinalNode");
+}
+
+void QUmlActivityFinalNodeObject::setPropertyData()
+{
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlactivityfinalnodeobject_p.h b/src/uml/qobjects/qumlactivityfinalnodeobject_p.h
index 5da10df5..0e56c824 100644
--- a/src/uml/qobjects/qumlactivityfinalnodeobject_p.h
+++ b/src/uml/qobjects/qumlactivityfinalnodeobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlActivityFinalNode;
-class Q_UML_EXPORT QUmlActivityFinalNodeObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlActivityFinalNodeObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlActivityFinalNodeObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -87,7 +90,7 @@ class Q_UML_EXPORT QUmlActivityFinalNodeObject : public QObject
     Q_PROPERTY(QSet<QObject *> redefinedNodes READ redefinedNodes)
 
 public:
-    Q_INVOKABLE explicit QUmlActivityFinalNodeObject(QUmlActivityFinalNode *qModelingObject);
+    Q_INVOKABLE explicit QUmlActivityFinalNodeObject(QUmlActivityFinalNode *qModelingElement);
     virtual ~QUmlActivityFinalNodeObject();
 
     // Owned attributes [Element]
@@ -173,6 +176,10 @@ public Q_SLOTS:
     void removeOutgoing(QObject *outgoing);
     void addRedefinedNode(QObject *redefinedNode);
     void removeRedefinedNode(QObject *redefinedNode);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlactivityobject.cpp b/src/uml/qobjects/qumlactivityobject.cpp
index 5c9a5e93..e3b03bf1 100644
--- a/src/uml/qobjects/qumlactivityobject.cpp
+++ b/src/uml/qobjects/qumlactivityobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlactivityobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlActivity>
 #include <QtUml/QUmlActivityEdge>
@@ -90,16 +91,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlActivityObject::QUmlActivityObject(QUmlActivity *qModelingObject)
+QUmlActivityObject::QUmlActivityObject(QUmlActivity *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlActivityObject::~QUmlActivityObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlActivity *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlActivity *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -108,25 +111,25 @@ QUmlActivityObject::~QUmlActivityObject()
 const QSet<QObject *> QUmlActivityObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActivityObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlActivityObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActivity *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlActivity *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActivity *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActivity *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -134,35 +137,35 @@ QObject *QUmlActivityObject::owner() const
 const QSet<QObject *> QUmlActivityObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlActivityObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlActivity *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlActivity *>(this)->name();
 }
 
 QObject *QUmlActivityObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActivity *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlActivity *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActivity *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActivity *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlActivityObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActivity *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlActivity *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActivity *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActivity *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlActivityObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlActivity *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlActivity *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [Namespace]
@@ -170,48 +173,48 @@ QString QUmlActivityObject::qualifiedName() const
 const QSet<QObject *> QUmlActivityObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActivityObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActivityObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActivityObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActivityObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActivityObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -219,49 +222,49 @@ const QSet<QObject *> QUmlActivityObject::packageImports() const
 
 QObject *QUmlActivityObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActivity *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlActivity *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActivity *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActivity *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlActivityObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlActivity *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlActivity *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Type]
 
 QObject *QUmlActivityObject::package() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActivity *>(this)->package())
+    if (!qmodelingelementproperty_cast<QUmlActivity *>(this)->package())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActivity *>(this)->package()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActivity *>(this)->package()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlActivityObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlActivity *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlActivity *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlActivityObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActivityObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -270,8 +273,8 @@ const QSet<QObject *> QUmlActivityObject::redefinitionContexts() const
 const QSet<QObject *> QUmlActivityObject::templateBindings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTemplateBinding *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->templateBindings())
-        set.insert(element->asQObject());
+    foreach (QUmlTemplateBinding *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->templateBindings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -280,109 +283,109 @@ const QSet<QObject *> QUmlActivityObject::templateBindings() const
 const QSet<QObject *> QUmlActivityObject::attributes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->attributes())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->attributes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActivityObject::collaborationUses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlCollaborationUse *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->collaborationUses())
-        set.insert(element->asQObject());
+    foreach (QUmlCollaborationUse *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->collaborationUses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActivityObject::features() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->features())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->features())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActivityObject::generalizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralization *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->generalizations())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralization *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->generalizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActivityObject::inheritedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->inheritedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->inheritedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlActivityObject::isFinalSpecialization() const
 {
-    return qmodelingobjectproperty_cast<QUmlActivity *>(this)->isFinalSpecialization();
+    return qmodelingelementproperty_cast<QUmlActivity *>(this)->isFinalSpecialization();
 }
 
 QObject *QUmlActivityObject::ownedTemplateSignature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActivity *>(this)->ownedTemplateSignature())
+    if (!qmodelingelementproperty_cast<QUmlActivity *>(this)->ownedTemplateSignature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActivity *>(this)->ownedTemplateSignature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActivity *>(this)->ownedTemplateSignature()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlActivityObject::ownedUseCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->ownedUseCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->ownedUseCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActivityObject::powertypeExtents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralizationSet *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->powertypeExtents())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralizationSet *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->powertypeExtents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActivityObject::redefinedClassifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->redefinedClassifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->redefinedClassifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlActivityObject::representation() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActivity *>(this)->representation())
+    if (!qmodelingelementproperty_cast<QUmlActivity *>(this)->representation())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActivity *>(this)->representation()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActivity *>(this)->representation()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlActivityObject::substitutions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlSubstitution *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->substitutions())
-        set.insert(element->asQObject());
+    foreach (QUmlSubstitution *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->substitutions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlActivityObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActivity *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlActivity *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActivity *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActivity *>(this)->templateParameter()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlActivityObject::useCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->useCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->useCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -391,24 +394,24 @@ const QSet<QObject *> QUmlActivityObject::useCases() const
 const QSet<QObject *> QUmlActivityObject::ownedConnectors() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConnector *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->ownedConnectors())
-        set.insert(element->asQObject());
+    foreach (QUmlConnector *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->ownedConnectors())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActivityObject::parts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->parts())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->parts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActivityObject::roles() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConnectableElement *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->roles())
-        set.insert(element->asQObject());
+    foreach (QUmlConnectableElement *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->roles())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -417,8 +420,8 @@ const QSet<QObject *> QUmlActivityObject::roles() const
 const QSet<QObject *> QUmlActivityObject::ownedPorts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPort *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->ownedPorts())
-        set.insert(element->asQObject());
+    foreach (QUmlPort *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->ownedPorts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -426,25 +429,25 @@ const QSet<QObject *> QUmlActivityObject::ownedPorts() const
 
 QObject *QUmlActivityObject::classifierBehavior() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActivity *>(this)->classifierBehavior())
+    if (!qmodelingelementproperty_cast<QUmlActivity *>(this)->classifierBehavior())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActivity *>(this)->classifierBehavior()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActivity *>(this)->classifierBehavior()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlActivityObject::interfaceRealizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterfaceRealization *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->interfaceRealizations())
-        set.insert(element->asQObject());
+    foreach (QUmlInterfaceRealization *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->interfaceRealizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActivityObject::ownedBehaviors() const
 {
     QSet<QObject *> set;
-    foreach (QUmlBehavior *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->ownedBehaviors())
-        set.insert(element->asQObject());
+    foreach (QUmlBehavior *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->ownedBehaviors())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -453,58 +456,58 @@ const QSet<QObject *> QUmlActivityObject::ownedBehaviors() const
 const QSet<QObject *> QUmlActivityObject::extensions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExtension *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->extensions())
-        set.insert(element->asQObject());
+    foreach (QUmlExtension *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->extensions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlActivityObject::isAbstract() const
 {
-    return qmodelingobjectproperty_cast<QUmlActivity *>(this)->isAbstract();
+    return qmodelingelementproperty_cast<QUmlActivity *>(this)->isAbstract();
 }
 
 bool QUmlActivityObject::isActive() const
 {
-    return qmodelingobjectproperty_cast<QUmlActivity *>(this)->isActive();
+    return qmodelingelementproperty_cast<QUmlActivity *>(this)->isActive();
 }
 
 const QList<QObject *> QUmlActivityObject::nestedClassifiers() const
 {
     QList<QObject *> list;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->nestedClassifiers())
-        list.append(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->nestedClassifiers())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QList<QObject *> QUmlActivityObject::ownedAttributes() const
 {
     QList<QObject *> list;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->ownedAttributes())
-        list.append(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->ownedAttributes())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QList<QObject *> QUmlActivityObject::ownedOperations() const
 {
     QList<QObject *> list;
-    foreach (QUmlOperation *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->ownedOperations())
-        list.append(element->asQObject());
+    foreach (QUmlOperation *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->ownedOperations())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QSet<QObject *> QUmlActivityObject::ownedReceptions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlReception *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->ownedReceptions())
-        set.insert(element->asQObject());
+    foreach (QUmlReception *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->ownedReceptions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActivityObject::superClasses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClass *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->superClasses())
-        set.insert(element->asQObject());
+    foreach (QUmlClass *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->superClasses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -512,63 +515,63 @@ const QSet<QObject *> QUmlActivityObject::superClasses() const
 
 QObject *QUmlActivityObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActivity *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlActivity *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActivity *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActivity *>(this)->context()->asQModelingObject();
 }
 
 bool QUmlActivityObject::isReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlActivity *>(this)->isReentrant();
+    return qmodelingelementproperty_cast<QUmlActivity *>(this)->isReentrant();
 }
 
 const QList<QObject *> QUmlActivityObject::ownedParameters() const
 {
     QList<QObject *> list;
-    foreach (QUmlParameter *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->ownedParameters())
-        list.append(element->asQObject());
+    foreach (QUmlParameter *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->ownedParameters())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QSet<QObject *> QUmlActivityObject::ownedParameterSets() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterSet *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->ownedParameterSets())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterSet *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->ownedParameterSets())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActivityObject::postconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->postconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->postconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActivityObject::preconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->preconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->preconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActivityObject::redefinedBehaviors() const
 {
     QSet<QObject *> set;
-    foreach (QUmlBehavior *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->redefinedBehaviors())
-        set.insert(element->asQObject());
+    foreach (QUmlBehavior *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->redefinedBehaviors())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlActivityObject::specification() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActivity *>(this)->specification())
+    if (!qmodelingelementproperty_cast<QUmlActivity *>(this)->specification())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActivity *>(this)->specification()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActivity *>(this)->specification()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [Activity]
@@ -576,58 +579,58 @@ QObject *QUmlActivityObject::specification() const
 const QSet<QObject *> QUmlActivityObject::edges() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->edges())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->edges())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActivityObject::groups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->groups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->groups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlActivityObject::isReadOnly() const
 {
-    return qmodelingobjectproperty_cast<QUmlActivity *>(this)->isReadOnly();
+    return qmodelingelementproperty_cast<QUmlActivity *>(this)->isReadOnly();
 }
 
 bool QUmlActivityObject::isSingleExecution() const
 {
-    return qmodelingobjectproperty_cast<QUmlActivity *>(this)->isSingleExecution();
+    return qmodelingelementproperty_cast<QUmlActivity *>(this)->isSingleExecution();
 }
 
 const QSet<QObject *> QUmlActivityObject::nodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->nodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->nodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActivityObject::partitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->partitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->partitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActivityObject::structuredNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlStructuredActivityNode *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->structuredNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlStructuredActivityNode *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->structuredNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActivityObject::variables() const
 {
     QSet<QObject *> set;
-    foreach (QUmlVariable *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->variables())
-        set.insert(element->asQObject());
+    foreach (QUmlVariable *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->variables())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -636,14 +639,14 @@ const QSet<QObject *> QUmlActivityObject::variables() const
 QSet<QObject *> QUmlActivityObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlActivityObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlActivity *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlActivity *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -651,27 +654,27 @@ bool QUmlActivityObject::mustBeOwned() const
 QList<QObject *> QUmlActivityObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlActivityObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlActivityObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlActivity *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlActivity *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlActivityObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlActivity *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlActivity *>(this)->separator();
 }
 
 // OPERATIONS [Namespace]
@@ -680,44 +683,44 @@ QSet<QObject *> QUmlActivityObject::excludeCollisions(QSet<QObject *> imps) cons
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlActivityObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlActivity *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlActivity *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlActivityObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlActivityObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlActivity *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlActivity *>(this)->membersAreDistinguishable();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlActivityObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlActivity *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlActivity *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlActivityObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlActivity *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlActivity *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [Type]
@@ -725,12 +728,12 @@ bool QUmlActivityObject::isTemplateParameter() const
 
 bool QUmlActivityObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlActivity *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlActivity *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlActivityObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlActivity *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlActivity *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [TemplateableElement]
@@ -738,8 +741,8 @@ bool QUmlActivityObject::isRedefinitionContextValid(QObject *redefined) const
 QSet<QObject *> QUmlActivityObject::parameterableElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterableElement *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->parameterableElements())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterableElement *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->parameterableElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -748,52 +751,52 @@ QSet<QObject *> QUmlActivityObject::parameterableElements() const
 QSet<QObject *> QUmlActivityObject::allFeatures() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->allFeatures())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->allFeatures())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlActivityObject::allParents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->allParents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->allParents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlActivityObject::conformsTo(QObject *other) const
 {
-    return qmodelingobjectproperty_cast<QUmlActivity *>(this)->conformsTo(qmodelingobjectproperty_cast<QUmlClassifier *>(other));
+    return qmodelingelementproperty_cast<QUmlActivity *>(this)->conformsTo(qmodelingelementproperty_cast<QUmlClassifier *>(other));
 }
 
 bool QUmlActivityObject::hasVisibilityOf(QObject *n) const
 {
-    return qmodelingobjectproperty_cast<QUmlActivity *>(this)->hasVisibilityOf(qmodelingobjectproperty_cast<QUmlNamedElement *>(n));
+    return qmodelingelementproperty_cast<QUmlActivity *>(this)->hasVisibilityOf(qmodelingelementproperty_cast<QUmlNamedElement *>(n));
 }
 
 QSet<QObject *> QUmlActivityObject::inheritableMembers(QObject *c) const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->inheritableMembers(qmodelingobjectproperty_cast<QUmlClassifier *>(c)))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->inheritableMembers(qmodelingelementproperty_cast<QUmlClassifier *>(c)))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlActivityObject::isTemplate() const
 {
-    return qmodelingobjectproperty_cast<QUmlActivity *>(this)->isTemplate();
+    return qmodelingelementproperty_cast<QUmlActivity *>(this)->isTemplate();
 }
 
 bool QUmlActivityObject::maySpecializeType(QObject *c) const
 {
-    return qmodelingobjectproperty_cast<QUmlActivity *>(this)->maySpecializeType(qmodelingobjectproperty_cast<QUmlClassifier *>(c));
+    return qmodelingelementproperty_cast<QUmlActivity *>(this)->maySpecializeType(qmodelingelementproperty_cast<QUmlClassifier *>(c));
 }
 
 QSet<QObject *> QUmlActivityObject::parents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->parents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->parents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -803,10 +806,10 @@ QSet<QObject *> QUmlActivityObject::inherit(QSet<QObject *> inhs) const
 {
     QSet<QUmlNamedElement *> inhsConverted;
     foreach (QObject *object, inhs)
-        inhsConverted.insert(qmodelingobjectproperty_cast<QUmlNamedElement *>(object));
+        inhsConverted.insert(qmodelingelementproperty_cast<QUmlNamedElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlActivity *>(this)->inherit(inhsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlActivity *>(this)->inherit(inhsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -814,623 +817,813 @@ QSet<QObject *> QUmlActivityObject::inherit(QSet<QObject *> inhs) const
 
 void QUmlActivityObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlActivityObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlActivityObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlActivityObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlActivityObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlActivityObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlActivityObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlActivityObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->setName(name);
 }
 
 void QUmlActivityObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlActivityObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlActivityObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlActivityObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlActivityObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlActivityObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlActivityObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlActivityObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlActivityObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlActivityObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlActivityObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlActivityObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlActivityObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlActivityObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlActivityObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlActivityObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlActivityObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->setVisibility(visibility);
 }
 
 void QUmlActivityObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Type]
 
 void QUmlActivityObject::setPackage(QObject *package)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->setPackage(qmodelingobjectproperty_cast<QUmlPackage *>(package));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->setPackage(qmodelingelementproperty_cast<QUmlPackage *>(package));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlActivityObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlActivityObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlActivityObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlActivityObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlActivityObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlActivityObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateableElement]
 
 void QUmlActivityObject::addTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 void QUmlActivityObject::removeTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Classifier]
 
 void QUmlActivityObject::addAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlActivityObject::removeAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlActivityObject::addCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlActivityObject::removeCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlActivityObject::addFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlActivityObject::removeFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlActivityObject::addGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlActivityObject::removeGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlActivityObject::addInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlActivityObject::removeInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlActivityObject::setFinalSpecialization(bool isFinalSpecialization)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->setFinalSpecialization(isFinalSpecialization);
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->setFinalSpecialization(isFinalSpecialization);
 }
 
 void QUmlActivityObject::unsetFinalSpecialization()
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("finalSpecialization"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
 void QUmlActivityObject::setOwnedTemplateSignature(QObject *ownedTemplateSignature)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->setOwnedTemplateSignature(qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->setOwnedTemplateSignature(qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
 }
 
 void QUmlActivityObject::addOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlActivityObject::removeOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlActivityObject::addPowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addPowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addPowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlActivityObject::removePowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removePowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removePowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlActivityObject::addRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlActivityObject::removeRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlActivityObject::setRepresentation(QObject *representation)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->setRepresentation(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(representation));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->setRepresentation(qmodelingelementproperty_cast<QUmlCollaborationUse *>(representation));
 }
 
 void QUmlActivityObject::addSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlActivityObject::removeSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlActivityObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
 }
 
 void QUmlActivityObject::addUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 void QUmlActivityObject::removeUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [StructuredClassifier]
 
 void QUmlActivityObject::addOwnedConnector(QObject *ownedConnector)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addOwnedConnector(qmodelingobjectproperty_cast<QUmlConnector *>(ownedConnector));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addOwnedConnector(qmodelingelementproperty_cast<QUmlConnector *>(ownedConnector));
 }
 
 void QUmlActivityObject::removeOwnedConnector(QObject *ownedConnector)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeOwnedConnector(qmodelingobjectproperty_cast<QUmlConnector *>(ownedConnector));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeOwnedConnector(qmodelingelementproperty_cast<QUmlConnector *>(ownedConnector));
 }
 
 void QUmlActivityObject::addPart(QObject *part)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addPart(qmodelingobjectproperty_cast<QUmlProperty *>(part));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addPart(qmodelingelementproperty_cast<QUmlProperty *>(part));
 }
 
 void QUmlActivityObject::removePart(QObject *part)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removePart(qmodelingobjectproperty_cast<QUmlProperty *>(part));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removePart(qmodelingelementproperty_cast<QUmlProperty *>(part));
 }
 
 void QUmlActivityObject::addRole(QObject *role)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addRole(qmodelingobjectproperty_cast<QUmlConnectableElement *>(role));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addRole(qmodelingelementproperty_cast<QUmlConnectableElement *>(role));
 }
 
 void QUmlActivityObject::removeRole(QObject *role)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeRole(qmodelingobjectproperty_cast<QUmlConnectableElement *>(role));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeRole(qmodelingelementproperty_cast<QUmlConnectableElement *>(role));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [EncapsulatedClassifier]
 
 void QUmlActivityObject::addOwnedPort(QObject *ownedPort)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addOwnedPort(qmodelingobjectproperty_cast<QUmlPort *>(ownedPort));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addOwnedPort(qmodelingelementproperty_cast<QUmlPort *>(ownedPort));
 }
 
 void QUmlActivityObject::removeOwnedPort(QObject *ownedPort)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeOwnedPort(qmodelingobjectproperty_cast<QUmlPort *>(ownedPort));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeOwnedPort(qmodelingelementproperty_cast<QUmlPort *>(ownedPort));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [BehavioredClassifier]
 
 void QUmlActivityObject::setClassifierBehavior(QObject *classifierBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->setClassifierBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(classifierBehavior));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->setClassifierBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(classifierBehavior));
 }
 
 void QUmlActivityObject::addInterfaceRealization(QObject *interfaceRealization)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addInterfaceRealization(qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addInterfaceRealization(qmodelingelementproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
 }
 
 void QUmlActivityObject::removeInterfaceRealization(QObject *interfaceRealization)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeInterfaceRealization(qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeInterfaceRealization(qmodelingelementproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
 }
 
 void QUmlActivityObject::addOwnedBehavior(QObject *ownedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addOwnedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(ownedBehavior));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addOwnedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(ownedBehavior));
 }
 
 void QUmlActivityObject::removeOwnedBehavior(QObject *ownedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeOwnedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(ownedBehavior));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeOwnedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(ownedBehavior));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Class]
 
 void QUmlActivityObject::addExtension(QObject *extension)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addExtension(qmodelingobjectproperty_cast<QUmlExtension *>(extension));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addExtension(qmodelingelementproperty_cast<QUmlExtension *>(extension));
 }
 
 void QUmlActivityObject::removeExtension(QObject *extension)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeExtension(qmodelingobjectproperty_cast<QUmlExtension *>(extension));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeExtension(qmodelingelementproperty_cast<QUmlExtension *>(extension));
 }
 
 void QUmlActivityObject::setAbstract(bool isAbstract)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->setAbstract(isAbstract);
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->setAbstract(isAbstract);
 }
 
 void QUmlActivityObject::unsetAbstract()
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("abstract"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
 void QUmlActivityObject::setActive(bool isActive)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->setActive(isActive);
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->setActive(isActive);
 }
 
 void QUmlActivityObject::unsetActive()
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("active"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("active"));
 }
 
 void QUmlActivityObject::addNestedClassifier(QObject *nestedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addNestedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(nestedClassifier));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addNestedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(nestedClassifier));
 }
 
 void QUmlActivityObject::removeNestedClassifier(QObject *nestedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeNestedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(nestedClassifier));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeNestedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(nestedClassifier));
 }
 
 void QUmlActivityObject::addOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlActivityObject::removeOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlActivityObject::addOwnedOperation(QObject *ownedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addOwnedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(ownedOperation));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addOwnedOperation(qmodelingelementproperty_cast<QUmlOperation *>(ownedOperation));
 }
 
 void QUmlActivityObject::removeOwnedOperation(QObject *ownedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeOwnedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(ownedOperation));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeOwnedOperation(qmodelingelementproperty_cast<QUmlOperation *>(ownedOperation));
 }
 
 void QUmlActivityObject::addOwnedReception(QObject *ownedReception)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addOwnedReception(qmodelingobjectproperty_cast<QUmlReception *>(ownedReception));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addOwnedReception(qmodelingelementproperty_cast<QUmlReception *>(ownedReception));
 }
 
 void QUmlActivityObject::removeOwnedReception(QObject *ownedReception)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeOwnedReception(qmodelingobjectproperty_cast<QUmlReception *>(ownedReception));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeOwnedReception(qmodelingelementproperty_cast<QUmlReception *>(ownedReception));
 }
 
 void QUmlActivityObject::addSuperClass(QObject *superClass)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addSuperClass(qmodelingobjectproperty_cast<QUmlClass *>(superClass));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addSuperClass(qmodelingelementproperty_cast<QUmlClass *>(superClass));
 }
 
 void QUmlActivityObject::removeSuperClass(QObject *superClass)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeSuperClass(qmodelingobjectproperty_cast<QUmlClass *>(superClass));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeSuperClass(qmodelingelementproperty_cast<QUmlClass *>(superClass));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Behavior]
 
 void QUmlActivityObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->setContext(qmodelingobjectproperty_cast<QUmlBehavioredClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->setContext(qmodelingelementproperty_cast<QUmlBehavioredClassifier *>(context));
 }
 
 void QUmlActivityObject::setReentrant(bool isReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->setReentrant(isReentrant);
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->setReentrant(isReentrant);
 }
 
 void QUmlActivityObject::unsetReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("reentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("reentrant"));
 }
 
 void QUmlActivityObject::addOwnedParameter(QObject *ownedParameter)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addOwnedParameter(qmodelingobjectproperty_cast<QUmlParameter *>(ownedParameter));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addOwnedParameter(qmodelingelementproperty_cast<QUmlParameter *>(ownedParameter));
 }
 
 void QUmlActivityObject::removeOwnedParameter(QObject *ownedParameter)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeOwnedParameter(qmodelingobjectproperty_cast<QUmlParameter *>(ownedParameter));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeOwnedParameter(qmodelingelementproperty_cast<QUmlParameter *>(ownedParameter));
 }
 
 void QUmlActivityObject::addOwnedParameterSet(QObject *ownedParameterSet)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addOwnedParameterSet(qmodelingobjectproperty_cast<QUmlParameterSet *>(ownedParameterSet));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addOwnedParameterSet(qmodelingelementproperty_cast<QUmlParameterSet *>(ownedParameterSet));
 }
 
 void QUmlActivityObject::removeOwnedParameterSet(QObject *ownedParameterSet)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeOwnedParameterSet(qmodelingobjectproperty_cast<QUmlParameterSet *>(ownedParameterSet));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeOwnedParameterSet(qmodelingelementproperty_cast<QUmlParameterSet *>(ownedParameterSet));
 }
 
 void QUmlActivityObject::addPostcondition(QObject *postcondition)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(postcondition));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(postcondition));
 }
 
 void QUmlActivityObject::removePostcondition(QObject *postcondition)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removePostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(postcondition));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removePostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(postcondition));
 }
 
 void QUmlActivityObject::addPrecondition(QObject *precondition)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(precondition));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(precondition));
 }
 
 void QUmlActivityObject::removePrecondition(QObject *precondition)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removePrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(precondition));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removePrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(precondition));
 }
 
 void QUmlActivityObject::addRedefinedBehavior(QObject *redefinedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addRedefinedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(redefinedBehavior));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addRedefinedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(redefinedBehavior));
 }
 
 void QUmlActivityObject::removeRedefinedBehavior(QObject *redefinedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeRedefinedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(redefinedBehavior));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeRedefinedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(redefinedBehavior));
 }
 
 void QUmlActivityObject::setSpecification(QObject *specification)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->setSpecification(qmodelingobjectproperty_cast<QUmlBehavioralFeature *>(specification));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->setSpecification(qmodelingelementproperty_cast<QUmlBehavioralFeature *>(specification));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Activity]
 
 void QUmlActivityObject::addEdge(QObject *edge)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addEdge(qmodelingobjectproperty_cast<QUmlActivityEdge *>(edge));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addEdge(qmodelingelementproperty_cast<QUmlActivityEdge *>(edge));
 }
 
 void QUmlActivityObject::removeEdge(QObject *edge)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeEdge(qmodelingobjectproperty_cast<QUmlActivityEdge *>(edge));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeEdge(qmodelingelementproperty_cast<QUmlActivityEdge *>(edge));
 }
 
 void QUmlActivityObject::addGroup(QObject *group)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(group));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(group));
 }
 
 void QUmlActivityObject::removeGroup(QObject *group)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(group));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(group));
 }
 
 void QUmlActivityObject::setReadOnly(bool isReadOnly)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->setReadOnly(isReadOnly);
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->setReadOnly(isReadOnly);
 }
 
 void QUmlActivityObject::unsetReadOnly()
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("readOnly"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("readOnly"));
 }
 
 void QUmlActivityObject::setSingleExecution(bool isSingleExecution)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->setSingleExecution(isSingleExecution);
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->setSingleExecution(isSingleExecution);
 }
 
 void QUmlActivityObject::unsetSingleExecution()
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("singleExecution"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("singleExecution"));
 }
 
 void QUmlActivityObject::addNode(QObject *node)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(node));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addNode(qmodelingelementproperty_cast<QUmlActivityNode *>(node));
 }
 
 void QUmlActivityObject::removeNode(QObject *node)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(node));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeNode(qmodelingelementproperty_cast<QUmlActivityNode *>(node));
 }
 
 void QUmlActivityObject::addPartition(QObject *partition)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(partition));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(partition));
 }
 
 void QUmlActivityObject::removePartition(QObject *partition)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removePartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(partition));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removePartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(partition));
 }
 
 void QUmlActivityObject::addStructuredNode(QObject *structuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(structuredNode));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(structuredNode));
 }
 
 void QUmlActivityObject::removeStructuredNode(QObject *structuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(structuredNode));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(structuredNode));
 }
 
 void QUmlActivityObject::addVariable(QObject *variable)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->addVariable(qmodelingobjectproperty_cast<QUmlVariable *>(variable));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->addVariable(qmodelingelementproperty_cast<QUmlVariable *>(variable));
 }
 
 void QUmlActivityObject::removeVariable(QObject *variable)
 {
-    qmodelingobjectproperty_cast<QUmlActivity *>(this)->removeVariable(qmodelingobjectproperty_cast<QUmlVariable *>(variable));
+    qmodelingelementproperty_cast<QUmlActivity *>(this)->removeVariable(qmodelingelementproperty_cast<QUmlVariable *>(variable));
+}
+
+
+void QUmlActivityObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlType");
+    d->groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
+
+    d->propertyGroups << QStringLiteral("QUmlStructuredClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedConnectors"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parts"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("roles"))));
+
+    d->propertyGroups << QStringLiteral("QUmlEncapsulatedClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlEncapsulatedClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedPorts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlBehavioredClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifierBehavior"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interfaceRealizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedBehaviors"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClass");
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extensions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isActive"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedReceptions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superClasses"))));
+
+    d->propertyGroups << QStringLiteral("QUmlBehavior");
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameters"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameterSets"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("postconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("preconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedBehaviors"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("specification"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivity");
+    d->groupProperties.insert(QStringLiteral("QUmlActivity"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("edges"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivity"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("groups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivity"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isReadOnly"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivity"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isSingleExecution"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivity"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nodes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivity"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("partitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivity"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("structuredNodes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivity"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("variables"))));
+}
+
+void QUmlActivityObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, edges, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, edges, PropertyClassRole, QStringLiteral("QUmlActivity"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, edges, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, edges, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, edges, DocumentationRole, QStringLiteral("Edges expressing flow between nodes of the activity."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, edges, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, edges, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, edges, OppositeEndRole, QStringLiteral("ActivityEdge-activity"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, groups, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, groups, PropertyClassRole, QStringLiteral("QUmlActivity"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, groups, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, groups, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, groups, DocumentationRole, QStringLiteral("Top-level groups in the activity."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, groups, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, groups, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, groups, OppositeEndRole, QStringLiteral("ActivityGroup-inActivity"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, isReadOnly, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, isReadOnly, PropertyClassRole, QStringLiteral("QUmlActivity"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, isReadOnly, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, isReadOnly, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, isReadOnly, DocumentationRole, QStringLiteral("If true, this activity must not make any changes to variables outside the activity or to objects. (This is an assertion, not an executable property. It may be used by an execution engine to optimize model execution. If the assertion is violated by the action, then the model is ill-formed.) The default is false (an activity may make nonlocal changes)."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, isReadOnly, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, isReadOnly, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, isReadOnly, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, isSingleExecution, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, isSingleExecution, PropertyClassRole, QStringLiteral("QUmlActivity"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, isSingleExecution, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, isSingleExecution, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, isSingleExecution, DocumentationRole, QStringLiteral("If true, all invocations of the activity are handled by the same execution."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, isSingleExecution, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, isSingleExecution, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, isSingleExecution, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, nodes, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, nodes, PropertyClassRole, QStringLiteral("QUmlActivity"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, nodes, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, nodes, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, nodes, DocumentationRole, QStringLiteral("Nodes coordinated by the activity."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, nodes, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, nodes, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, nodes, OppositeEndRole, QStringLiteral("ActivityNode-activity"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, partitions, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, partitions, PropertyClassRole, QStringLiteral("QUmlActivity"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, partitions, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, partitions, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, partitions, DocumentationRole, QStringLiteral("Top-level partitions in the activity."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, partitions, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, partitions, SubsettedPropertiesRole, QStringLiteral("Activity-group"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, partitions, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, structuredNodes, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, structuredNodes, PropertyClassRole, QStringLiteral("QUmlActivity"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, structuredNodes, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, structuredNodes, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, structuredNodes, DocumentationRole, QStringLiteral("Top-level structured nodes in the activity."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, structuredNodes, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, structuredNodes, SubsettedPropertiesRole, QStringLiteral("Activity-group Activity-node"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, structuredNodes, OppositeEndRole, QStringLiteral("StructuredActivityNode-activity"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, variables, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, variables, PropertyClassRole, QStringLiteral("QUmlActivity"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, variables, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, variables, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, variables, DocumentationRole, QStringLiteral("Top-level variables in the activity."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, variables, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, variables, SubsettedPropertiesRole, QStringLiteral("Namespace-ownedMember"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivity, variables, OppositeEndRole, QStringLiteral("Variable-activityScope"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlactivityobject_p.h b/src/uml/qobjects/qumlactivityobject_p.h
index 3ee4aa1f..f564b438 100644
--- a/src/uml/qobjects/qumlactivityobject_p.h
+++ b/src/uml/qobjects/qumlactivityobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlActivity;
-class Q_UML_EXPORT QUmlActivityObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlActivityObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlActivityObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -155,7 +158,7 @@ class Q_UML_EXPORT QUmlActivityObject : public QObject
     Q_PROPERTY(QSet<QObject *> variables READ variables)
 
 public:
-    Q_INVOKABLE explicit QUmlActivityObject(QUmlActivity *qModelingObject);
+    Q_INVOKABLE explicit QUmlActivityObject(QUmlActivity *qModelingElement);
     virtual ~QUmlActivityObject();
 
     // Owned attributes [Element]
@@ -446,6 +449,10 @@ public Q_SLOTS:
     void removeStructuredNode(QObject *structuredNode);
     void addVariable(QObject *variable);
     void removeVariable(QObject *variable);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlactivityparameternodeobject.cpp b/src/uml/qobjects/qumlactivityparameternodeobject.cpp
index f43b3004..4b17cf95 100644
--- a/src/uml/qobjects/qumlactivityparameternodeobject.cpp
+++ b/src/uml/qobjects/qumlactivityparameternodeobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlactivityparameternodeobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlActivityParameterNode>
 #include <QtUml/QUmlActivity>
@@ -65,16 +66,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlActivityParameterNodeObject::QUmlActivityParameterNodeObject(QUmlActivityParameterNode *qModelingObject)
+QUmlActivityParameterNodeObject::QUmlActivityParameterNodeObject(QUmlActivityParameterNode *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlActivityParameterNodeObject::~QUmlActivityParameterNodeObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -83,25 +86,25 @@ QUmlActivityParameterNodeObject::~QUmlActivityParameterNodeObject()
 const QSet<QObject *> QUmlActivityParameterNodeObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActivityParameterNodeObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlActivityParameterNodeObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -109,62 +112,62 @@ QObject *QUmlActivityParameterNodeObject::owner() const
 const QSet<QObject *> QUmlActivityParameterNodeObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlActivityParameterNodeObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->name();
 }
 
 QObject *QUmlActivityParameterNodeObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlActivityParameterNodeObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlActivityParameterNodeObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlActivityParameterNodeObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlActivityParameterNodeObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlActivityParameterNodeObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActivityParameterNodeObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -172,65 +175,65 @@ const QSet<QObject *> QUmlActivityParameterNodeObject::redefinitionContexts() co
 
 QObject *QUmlActivityParameterNodeObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlActivityParameterNodeObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActivityParameterNodeObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActivityParameterNodeObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlActivityParameterNodeObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlActivityParameterNodeObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActivityParameterNodeObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActivityParameterNodeObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -238,10 +241,10 @@ const QSet<QObject *> QUmlActivityParameterNodeObject::redefinedNodes() const
 
 QObject *QUmlActivityParameterNodeObject::type() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->type())
+    if (!qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->type())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->type()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->type()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ObjectNode]
@@ -249,45 +252,45 @@ QObject *QUmlActivityParameterNodeObject::type() const
 const QSet<QObject *> QUmlActivityParameterNodeObject::inStates() const
 {
     QSet<QObject *> set;
-    foreach (QUmlState *element, qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->inStates())
-        set.insert(element->asQObject());
+    foreach (QUmlState *element, qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->inStates())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlActivityParameterNodeObject::isControlType() const
 {
-    return qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->isControlType();
+    return qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->isControlType();
 }
 
 QtUml::ObjectNodeOrderingKind QUmlActivityParameterNodeObject::ordering() const
 {
-    return qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->ordering();
+    return qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->ordering();
 }
 
 QObject *QUmlActivityParameterNodeObject::selection() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->selection())
+    if (!qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->selection())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->selection()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->selection()->asQModelingObject();
 }
 
 QObject *QUmlActivityParameterNodeObject::upperBound() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->upperBound())
+    if (!qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->upperBound())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->upperBound()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->upperBound()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ActivityParameterNode]
 
 QObject *QUmlActivityParameterNodeObject::parameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->parameter())
+    if (!qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->parameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->parameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->parameter()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -295,14 +298,14 @@ QObject *QUmlActivityParameterNodeObject::parameter() const
 QSet<QObject *> QUmlActivityParameterNodeObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlActivityParameterNodeObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -310,263 +313,330 @@ bool QUmlActivityParameterNodeObject::mustBeOwned() const
 QList<QObject *> QUmlActivityParameterNodeObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlActivityParameterNodeObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlActivityParameterNodeObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlActivityParameterNodeObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlActivityParameterNodeObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlActivityParameterNodeObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlActivityParameterNodeObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlActivityParameterNodeObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlActivityParameterNodeObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlActivityParameterNodeObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlActivityParameterNodeObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlActivityParameterNodeObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlActivityParameterNodeObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlActivityParameterNodeObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->setName(name);
 }
 
 void QUmlActivityParameterNodeObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlActivityParameterNodeObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlActivityParameterNodeObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlActivityParameterNodeObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlActivityParameterNodeObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlActivityParameterNodeObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlActivityParameterNodeObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlActivityParameterNodeObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlActivityParameterNodeObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlActivityParameterNodeObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlActivityParameterNodeObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlActivityParameterNodeObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlActivityParameterNodeObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlActivityParameterNodeObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlActivityParameterNodeObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlActivityParameterNodeObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlActivityParameterNodeObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlActivityParameterNodeObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlActivityParameterNodeObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlActivityParameterNodeObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlActivityParameterNodeObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlActivityParameterNodeObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlActivityParameterNodeObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlActivityParameterNodeObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TypedElement]
 
 void QUmlActivityParameterNodeObject::setType(QObject *type)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->setType(qmodelingobjectproperty_cast<QUmlType *>(type));
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->setType(qmodelingelementproperty_cast<QUmlType *>(type));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ObjectNode]
 
 void QUmlActivityParameterNodeObject::addInState(QObject *inState)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->addInState(qmodelingobjectproperty_cast<QUmlState *>(inState));
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->addInState(qmodelingelementproperty_cast<QUmlState *>(inState));
 }
 
 void QUmlActivityParameterNodeObject::removeInState(QObject *inState)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->removeInState(qmodelingobjectproperty_cast<QUmlState *>(inState));
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->removeInState(qmodelingelementproperty_cast<QUmlState *>(inState));
 }
 
 void QUmlActivityParameterNodeObject::setControlType(bool isControlType)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->setControlType(isControlType);
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->setControlType(isControlType);
 }
 
 void QUmlActivityParameterNodeObject::unsetControlType()
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("controlType"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("controlType"));
 }
 
 void QUmlActivityParameterNodeObject::setOrdering(QtUml::ObjectNodeOrderingKind ordering)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->setOrdering(ordering);
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->setOrdering(ordering);
 }
 
 void QUmlActivityParameterNodeObject::unsetOrdering()
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("ordering"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("ordering"));
 }
 
 void QUmlActivityParameterNodeObject::setSelection(QObject *selection)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->setSelection(qmodelingobjectproperty_cast<QUmlBehavior *>(selection));
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->setSelection(qmodelingelementproperty_cast<QUmlBehavior *>(selection));
 }
 
 void QUmlActivityParameterNodeObject::setUpperBound(QObject *upperBound)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->setUpperBound(qmodelingobjectproperty_cast<QUmlValueSpecification *>(upperBound));
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->setUpperBound(qmodelingelementproperty_cast<QUmlValueSpecification *>(upperBound));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityParameterNode]
 
 void QUmlActivityParameterNodeObject::setParameter(QObject *parameter)
 {
-    qmodelingobjectproperty_cast<QUmlActivityParameterNode *>(this)->setParameter(qmodelingobjectproperty_cast<QUmlParameter *>(parameter));
+    qmodelingelementproperty_cast<QUmlActivityParameterNode *>(this)->setParameter(qmodelingelementproperty_cast<QUmlParameter *>(parameter));
+}
+
+
+void QUmlActivityParameterNodeObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTypedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
+
+    d->propertyGroups << QStringLiteral("QUmlObjectNode");
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStates"))));
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isControlType"))));
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ordering"))));
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("selection"))));
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperBound"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityParameterNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityParameterNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parameter"))));
+}
+
+void QUmlActivityParameterNodeObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityParameterNode, parameter, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityParameterNode, parameter, PropertyClassRole, QStringLiteral("QUmlActivityParameterNode"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityParameterNode, parameter, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityParameterNode, parameter, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityParameterNode, parameter, DocumentationRole, QStringLiteral("The parameter the object node will be accepting or providing values for."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityParameterNode, parameter, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityParameterNode, parameter, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityParameterNode, parameter, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlactivityparameternodeobject_p.h b/src/uml/qobjects/qumlactivityparameternodeobject_p.h
index 48be6b72..7887dd68 100644
--- a/src/uml/qobjects/qumlactivityparameternodeobject_p.h
+++ b/src/uml/qobjects/qumlactivityparameternodeobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlActivityParameterNode;
-class Q_UML_EXPORT QUmlActivityParameterNodeObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlActivityParameterNodeObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlActivityParameterNodeObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -100,7 +103,7 @@ class Q_UML_EXPORT QUmlActivityParameterNodeObject : public QObject
     Q_PROPERTY(QObject * parameter READ parameter WRITE setParameter)
 
 public:
-    Q_INVOKABLE explicit QUmlActivityParameterNodeObject(QUmlActivityParameterNode *qModelingObject);
+    Q_INVOKABLE explicit QUmlActivityParameterNodeObject(QUmlActivityParameterNode *qModelingElement);
     virtual ~QUmlActivityParameterNodeObject();
 
     // Owned attributes [Element]
@@ -215,6 +218,10 @@ public Q_SLOTS:
 
     // Slots for owned attributes [ActivityParameterNode]
     void setParameter(QObject *parameter = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlactivitypartitionobject.cpp b/src/uml/qobjects/qumlactivitypartitionobject.cpp
index 80263747..0dc7d385 100644
--- a/src/uml/qobjects/qumlactivitypartitionobject.cpp
+++ b/src/uml/qobjects/qumlactivitypartitionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlactivitypartitionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlActivityPartition>
 #include <QtUml/QUmlActivity>
@@ -55,16 +56,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlActivityPartitionObject::QUmlActivityPartitionObject(QUmlActivityPartition *qModelingObject)
+QUmlActivityPartitionObject::QUmlActivityPartitionObject(QUmlActivityPartition *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlActivityPartitionObject::~QUmlActivityPartitionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -73,25 +76,25 @@ QUmlActivityPartitionObject::~QUmlActivityPartitionObject()
 const QSet<QObject *> QUmlActivityPartitionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActivityPartitionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlActivityPartitionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -99,40 +102,40 @@ QObject *QUmlActivityPartitionObject::owner() const
 const QSet<QObject *> QUmlActivityPartitionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlActivityPartitionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->name();
 }
 
 QObject *QUmlActivityPartitionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlActivityPartitionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlActivityPartitionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlActivityPartitionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [ActivityGroup]
@@ -140,41 +143,41 @@ QtUml::VisibilityKind QUmlActivityPartitionObject::visibility() const
 const QSet<QObject *> QUmlActivityPartitionObject::containedEdges() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->containedEdges())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->containedEdges())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActivityPartitionObject::containedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->containedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->containedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlActivityPartitionObject::inActivity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->inActivity())
+    if (!qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->inActivity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->inActivity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->inActivity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlActivityPartitionObject::subgroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->subgroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->subgroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlActivityPartitionObject::superGroup() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->superGroup())
+    if (!qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->superGroup())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->superGroup()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->superGroup()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ActivityPartition]
@@ -182,51 +185,51 @@ QObject *QUmlActivityPartitionObject::superGroup() const
 const QSet<QObject *> QUmlActivityPartitionObject::edges() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->edges())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->edges())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlActivityPartitionObject::isDimension() const
 {
-    return qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->isDimension();
+    return qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->isDimension();
 }
 
 bool QUmlActivityPartitionObject::isExternal() const
 {
-    return qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->isExternal();
+    return qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->isExternal();
 }
 
 const QSet<QObject *> QUmlActivityPartitionObject::nodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->nodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->nodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlActivityPartitionObject::represents() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->represents())
+    if (!qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->represents())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->represents()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->represents()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlActivityPartitionObject::subpartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->subpartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->subpartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlActivityPartitionObject::superPartition() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->superPartition())
+    if (!qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->superPartition())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->superPartition()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->superPartition()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -234,14 +237,14 @@ QObject *QUmlActivityPartitionObject::superPartition() const
 QSet<QObject *> QUmlActivityPartitionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlActivityPartitionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -249,195 +252,303 @@ bool QUmlActivityPartitionObject::mustBeOwned() const
 QList<QObject *> QUmlActivityPartitionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlActivityPartitionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlActivityPartitionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlActivityPartitionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlActivityPartitionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlActivityPartitionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlActivityPartitionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlActivityPartitionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlActivityPartitionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlActivityPartitionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlActivityPartitionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlActivityPartitionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->setName(name);
 }
 
 void QUmlActivityPartitionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlActivityPartitionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlActivityPartitionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlActivityPartitionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityGroup]
 
 void QUmlActivityPartitionObject::addContainedEdge(QObject *containedEdge)
 {
-    qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->addContainedEdge(qmodelingobjectproperty_cast<QUmlActivityEdge *>(containedEdge));
+    qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->addContainedEdge(qmodelingelementproperty_cast<QUmlActivityEdge *>(containedEdge));
 }
 
 void QUmlActivityPartitionObject::removeContainedEdge(QObject *containedEdge)
 {
-    qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->removeContainedEdge(qmodelingobjectproperty_cast<QUmlActivityEdge *>(containedEdge));
+    qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->removeContainedEdge(qmodelingelementproperty_cast<QUmlActivityEdge *>(containedEdge));
 }
 
 void QUmlActivityPartitionObject::addContainedNode(QObject *containedNode)
 {
-    qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->addContainedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(containedNode));
+    qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->addContainedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(containedNode));
 }
 
 void QUmlActivityPartitionObject::removeContainedNode(QObject *containedNode)
 {
-    qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->removeContainedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(containedNode));
+    qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->removeContainedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(containedNode));
 }
 
 void QUmlActivityPartitionObject::setInActivity(QObject *inActivity)
 {
-    qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->setInActivity(qmodelingobjectproperty_cast<QUmlActivity *>(inActivity));
+    qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->setInActivity(qmodelingelementproperty_cast<QUmlActivity *>(inActivity));
 }
 
 void QUmlActivityPartitionObject::addSubgroup(QObject *subgroup)
 {
-    qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->addSubgroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(subgroup));
+    qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->addSubgroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(subgroup));
 }
 
 void QUmlActivityPartitionObject::removeSubgroup(QObject *subgroup)
 {
-    qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->removeSubgroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(subgroup));
+    qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->removeSubgroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(subgroup));
 }
 
 void QUmlActivityPartitionObject::setSuperGroup(QObject *superGroup)
 {
-    qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->setSuperGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(superGroup));
+    qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->setSuperGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(superGroup));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityPartition]
 
 void QUmlActivityPartitionObject::addEdge(QObject *edge)
 {
-    qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->addEdge(qmodelingobjectproperty_cast<QUmlActivityEdge *>(edge));
+    qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->addEdge(qmodelingelementproperty_cast<QUmlActivityEdge *>(edge));
 }
 
 void QUmlActivityPartitionObject::removeEdge(QObject *edge)
 {
-    qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->removeEdge(qmodelingobjectproperty_cast<QUmlActivityEdge *>(edge));
+    qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->removeEdge(qmodelingelementproperty_cast<QUmlActivityEdge *>(edge));
 }
 
 void QUmlActivityPartitionObject::setDimension(bool isDimension)
 {
-    qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->setDimension(isDimension);
+    qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->setDimension(isDimension);
 }
 
 void QUmlActivityPartitionObject::unsetDimension()
 {
-    qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("dimension"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("dimension"));
 }
 
 void QUmlActivityPartitionObject::setExternal(bool isExternal)
 {
-    qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->setExternal(isExternal);
+    qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->setExternal(isExternal);
 }
 
 void QUmlActivityPartitionObject::unsetExternal()
 {
-    qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("external"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("external"));
 }
 
 void QUmlActivityPartitionObject::addNode(QObject *node)
 {
-    qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->addNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(node));
+    qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->addNode(qmodelingelementproperty_cast<QUmlActivityNode *>(node));
 }
 
 void QUmlActivityPartitionObject::removeNode(QObject *node)
 {
-    qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->removeNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(node));
+    qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->removeNode(qmodelingelementproperty_cast<QUmlActivityNode *>(node));
 }
 
 void QUmlActivityPartitionObject::setRepresents(QObject *represents)
 {
-    qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->setRepresents(qmodelingobjectproperty_cast<QUmlElement *>(represents));
+    qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->setRepresents(qmodelingelementproperty_cast<QUmlElement *>(represents));
 }
 
 void QUmlActivityPartitionObject::addSubpartition(QObject *subpartition)
 {
-    qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->addSubpartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(subpartition));
+    qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->addSubpartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(subpartition));
 }
 
 void QUmlActivityPartitionObject::removeSubpartition(QObject *subpartition)
 {
-    qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->removeSubpartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(subpartition));
+    qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->removeSubpartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(subpartition));
 }
 
 void QUmlActivityPartitionObject::setSuperPartition(QObject *superPartition)
 {
-    qmodelingobjectproperty_cast<QUmlActivityPartition *>(this)->setSuperPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(superPartition));
+    qmodelingelementproperty_cast<QUmlActivityPartition *>(this)->setSuperPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(superPartition));
+}
+
+
+void QUmlActivityPartitionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityGroup");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("containedEdges"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("containedNodes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inActivity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("subgroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superGroup"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityPartition");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityPartition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("edges"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityPartition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isDimension"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityPartition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isExternal"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityPartition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nodes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityPartition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("represents"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityPartition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("subpartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityPartition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superPartition"))));
+}
+
+void QUmlActivityPartitionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, edges, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, edges, PropertyClassRole, QStringLiteral("QUmlActivityPartition"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, edges, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, edges, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, edges, DocumentationRole, QStringLiteral("Edges immediately contained in the group."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, edges, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, edges, SubsettedPropertiesRole, QStringLiteral("ActivityGroup-containedEdge"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, edges, OppositeEndRole, QStringLiteral("ActivityEdge-inPartition"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, isDimension, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, isDimension, PropertyClassRole, QStringLiteral("QUmlActivityPartition"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, isDimension, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, isDimension, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, isDimension, DocumentationRole, QStringLiteral("Tells whether the partition groups other partitions along a dimension."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, isDimension, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, isDimension, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, isDimension, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, isExternal, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, isExternal, PropertyClassRole, QStringLiteral("QUmlActivityPartition"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, isExternal, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, isExternal, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, isExternal, DocumentationRole, QStringLiteral("Tells whether the partition represents an entity to which the partitioning structure does not apply."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, isExternal, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, isExternal, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, isExternal, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, nodes, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, nodes, PropertyClassRole, QStringLiteral("QUmlActivityPartition"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, nodes, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, nodes, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, nodes, DocumentationRole, QStringLiteral("Nodes immediately contained in the group."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, nodes, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, nodes, SubsettedPropertiesRole, QStringLiteral("ActivityGroup-containedNode"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, nodes, OppositeEndRole, QStringLiteral("ActivityNode-inPartition"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, represents, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, represents, PropertyClassRole, QStringLiteral("QUmlActivityPartition"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, represents, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, represents, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, represents, DocumentationRole, QStringLiteral("An element constraining behaviors invoked by nodes in the partition."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, represents, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, represents, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, represents, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, subpartitions, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, subpartitions, PropertyClassRole, QStringLiteral("QUmlActivityPartition"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, subpartitions, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, subpartitions, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, subpartitions, DocumentationRole, QStringLiteral("Partitions immediately contained in the partition."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, subpartitions, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, subpartitions, SubsettedPropertiesRole, QStringLiteral("ActivityGroup-subgroup"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, subpartitions, OppositeEndRole, QStringLiteral("ActivityPartition-superPartition"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, superPartition, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, superPartition, PropertyClassRole, QStringLiteral("QUmlActivityPartition"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, superPartition, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, superPartition, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, superPartition, DocumentationRole, QStringLiteral("Partition immediately containing the partition."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, superPartition, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, superPartition, SubsettedPropertiesRole, QStringLiteral("ActivityGroup-superGroup"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlActivityPartition, superPartition, OppositeEndRole, QStringLiteral("ActivityPartition-subpartition"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlactivitypartitionobject_p.h b/src/uml/qobjects/qumlactivitypartitionobject_p.h
index e3c81307..5a68e5ee 100644
--- a/src/uml/qobjects/qumlactivitypartitionobject_p.h
+++ b/src/uml/qobjects/qumlactivitypartitionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlActivityPartition;
-class Q_UML_EXPORT QUmlActivityPartitionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlActivityPartitionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlActivityPartitionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -88,7 +91,7 @@ class Q_UML_EXPORT QUmlActivityPartitionObject : public QObject
     Q_PROPERTY(QObject * superPartition READ superPartition WRITE setSuperPartition)
 
 public:
-    Q_INVOKABLE explicit QUmlActivityPartitionObject(QUmlActivityPartition *qModelingObject);
+    Q_INVOKABLE explicit QUmlActivityPartitionObject(QUmlActivityPartition *qModelingElement);
     virtual ~QUmlActivityPartitionObject();
 
     // Owned attributes [Element]
@@ -171,6 +174,10 @@ public Q_SLOTS:
     void addSubpartition(QObject *subpartition);
     void removeSubpartition(QObject *subpartition);
     void setSuperPartition(QObject *superPartition = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlactorobject.cpp b/src/uml/qobjects/qumlactorobject.cpp
index 5cfbd054..95d43927 100644
--- a/src/uml/qobjects/qumlactorobject.cpp
+++ b/src/uml/qobjects/qumlactorobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlactorobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlActor>
 #include <QtUml/QUmlBehavior>
@@ -73,16 +74,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlActorObject::QUmlActorObject(QUmlActor *qModelingObject)
+QUmlActorObject::QUmlActorObject(QUmlActor *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlActorObject::~QUmlActorObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlActor *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlActor *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -91,25 +94,25 @@ QUmlActorObject::~QUmlActorObject()
 const QSet<QObject *> QUmlActorObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlActor *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlActor *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActorObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlActor *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlActor *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlActorObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActor *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlActor *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActor *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActor *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -117,35 +120,35 @@ QObject *QUmlActorObject::owner() const
 const QSet<QObject *> QUmlActorObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlActor *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlActor *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlActorObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlActor *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlActor *>(this)->name();
 }
 
 QObject *QUmlActorObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActor *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlActor *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActor *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActor *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlActorObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActor *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlActor *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActor *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActor *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlActorObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlActor *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlActor *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [Namespace]
@@ -153,48 +156,48 @@ QString QUmlActorObject::qualifiedName() const
 const QSet<QObject *> QUmlActorObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlActor *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlActor *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActorObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlActor *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlActor *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActorObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlActor *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlActor *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActorObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlActor *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlActor *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActorObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlActor *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlActor *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActorObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlActor *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlActor *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -202,49 +205,49 @@ const QSet<QObject *> QUmlActorObject::packageImports() const
 
 QObject *QUmlActorObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActor *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlActor *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActor *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActor *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlActorObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlActor *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlActor *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Type]
 
 QObject *QUmlActorObject::package() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActor *>(this)->package())
+    if (!qmodelingelementproperty_cast<QUmlActor *>(this)->package())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActor *>(this)->package()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActor *>(this)->package()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlActorObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlActor *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlActor *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlActorObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlActor *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlActor *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActorObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlActor *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlActor *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -253,8 +256,8 @@ const QSet<QObject *> QUmlActorObject::redefinitionContexts() const
 const QSet<QObject *> QUmlActorObject::templateBindings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTemplateBinding *element, qmodelingobjectproperty_cast<QUmlActor *>(this)->templateBindings())
-        set.insert(element->asQObject());
+    foreach (QUmlTemplateBinding *element, qmodelingelementproperty_cast<QUmlActor *>(this)->templateBindings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -263,122 +266,122 @@ const QSet<QObject *> QUmlActorObject::templateBindings() const
 const QSet<QObject *> QUmlActorObject::attributes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlActor *>(this)->attributes())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlActor *>(this)->attributes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActorObject::collaborationUses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlCollaborationUse *element, qmodelingobjectproperty_cast<QUmlActor *>(this)->collaborationUses())
-        set.insert(element->asQObject());
+    foreach (QUmlCollaborationUse *element, qmodelingelementproperty_cast<QUmlActor *>(this)->collaborationUses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActorObject::features() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlActor *>(this)->features())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlActor *>(this)->features())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActorObject::generals() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlActor *>(this)->generals())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlActor *>(this)->generals())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActorObject::generalizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralization *element, qmodelingobjectproperty_cast<QUmlActor *>(this)->generalizations())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralization *element, qmodelingelementproperty_cast<QUmlActor *>(this)->generalizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActorObject::inheritedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlActor *>(this)->inheritedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlActor *>(this)->inheritedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlActorObject::isAbstract() const
 {
-    return qmodelingobjectproperty_cast<QUmlActor *>(this)->isAbstract();
+    return qmodelingelementproperty_cast<QUmlActor *>(this)->isAbstract();
 }
 
 bool QUmlActorObject::isFinalSpecialization() const
 {
-    return qmodelingobjectproperty_cast<QUmlActor *>(this)->isFinalSpecialization();
+    return qmodelingelementproperty_cast<QUmlActor *>(this)->isFinalSpecialization();
 }
 
 QObject *QUmlActorObject::ownedTemplateSignature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActor *>(this)->ownedTemplateSignature())
+    if (!qmodelingelementproperty_cast<QUmlActor *>(this)->ownedTemplateSignature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActor *>(this)->ownedTemplateSignature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActor *>(this)->ownedTemplateSignature()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlActorObject::ownedUseCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlActor *>(this)->ownedUseCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlActor *>(this)->ownedUseCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActorObject::powertypeExtents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralizationSet *element, qmodelingobjectproperty_cast<QUmlActor *>(this)->powertypeExtents())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralizationSet *element, qmodelingelementproperty_cast<QUmlActor *>(this)->powertypeExtents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActorObject::redefinedClassifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlActor *>(this)->redefinedClassifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlActor *>(this)->redefinedClassifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlActorObject::representation() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActor *>(this)->representation())
+    if (!qmodelingelementproperty_cast<QUmlActor *>(this)->representation())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActor *>(this)->representation()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActor *>(this)->representation()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlActorObject::substitutions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlSubstitution *element, qmodelingobjectproperty_cast<QUmlActor *>(this)->substitutions())
-        set.insert(element->asQObject());
+    foreach (QUmlSubstitution *element, qmodelingelementproperty_cast<QUmlActor *>(this)->substitutions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlActorObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActor *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlActor *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActor *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActor *>(this)->templateParameter()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlActorObject::useCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlActor *>(this)->useCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlActor *>(this)->useCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -386,25 +389,25 @@ const QSet<QObject *> QUmlActorObject::useCases() const
 
 QObject *QUmlActorObject::classifierBehavior() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlActor *>(this)->classifierBehavior())
+    if (!qmodelingelementproperty_cast<QUmlActor *>(this)->classifierBehavior())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlActor *>(this)->classifierBehavior()->asQObject();
+        return qmodelingelementproperty_cast<QUmlActor *>(this)->classifierBehavior()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlActorObject::interfaceRealizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterfaceRealization *element, qmodelingobjectproperty_cast<QUmlActor *>(this)->interfaceRealizations())
-        set.insert(element->asQObject());
+    foreach (QUmlInterfaceRealization *element, qmodelingelementproperty_cast<QUmlActor *>(this)->interfaceRealizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlActorObject::ownedBehaviors() const
 {
     QSet<QObject *> set;
-    foreach (QUmlBehavior *element, qmodelingobjectproperty_cast<QUmlActor *>(this)->ownedBehaviors())
-        set.insert(element->asQObject());
+    foreach (QUmlBehavior *element, qmodelingelementproperty_cast<QUmlActor *>(this)->ownedBehaviors())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -413,14 +416,14 @@ const QSet<QObject *> QUmlActorObject::ownedBehaviors() const
 QSet<QObject *> QUmlActorObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlActor *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlActor *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlActorObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlActor *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlActor *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -428,27 +431,27 @@ bool QUmlActorObject::mustBeOwned() const
 QList<QObject *> QUmlActorObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlActor *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlActor *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlActorObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlActor *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlActor *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlActorObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlActor *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlActor *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlActorObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlActor *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlActor *>(this)->separator();
 }
 
 // OPERATIONS [Namespace]
@@ -457,44 +460,44 @@ QSet<QObject *> QUmlActorObject::excludeCollisions(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlActor *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlActor *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlActorObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlActor *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlActor *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlActorObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlActor *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlActor *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlActorObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlActor *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlActor *>(this)->membersAreDistinguishable();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlActorObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlActor *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlActor *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlActorObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlActor *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlActor *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [Type]
@@ -502,12 +505,12 @@ bool QUmlActorObject::isTemplateParameter() const
 
 bool QUmlActorObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlActor *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlActor *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlActorObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlActor *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlActor *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [TemplateableElement]
@@ -515,8 +518,8 @@ bool QUmlActorObject::isRedefinitionContextValid(QObject *redefined) const
 QSet<QObject *> QUmlActorObject::parameterableElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterableElement *element, qmodelingobjectproperty_cast<QUmlActor *>(this)->parameterableElements())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterableElement *element, qmodelingelementproperty_cast<QUmlActor *>(this)->parameterableElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -525,63 +528,63 @@ QSet<QObject *> QUmlActorObject::parameterableElements() const
 QSet<QObject *> QUmlActorObject::allFeatures() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlActor *>(this)->allFeatures())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlActor *>(this)->allFeatures())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlActorObject::allParents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlActor *>(this)->allParents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlActor *>(this)->allParents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlActorObject::conformsTo(QObject *other) const
 {
-    return qmodelingobjectproperty_cast<QUmlActor *>(this)->conformsTo(qmodelingobjectproperty_cast<QUmlClassifier *>(other));
+    return qmodelingelementproperty_cast<QUmlActor *>(this)->conformsTo(qmodelingelementproperty_cast<QUmlClassifier *>(other));
 }
 
 bool QUmlActorObject::hasVisibilityOf(QObject *n) const
 {
-    return qmodelingobjectproperty_cast<QUmlActor *>(this)->hasVisibilityOf(qmodelingobjectproperty_cast<QUmlNamedElement *>(n));
+    return qmodelingelementproperty_cast<QUmlActor *>(this)->hasVisibilityOf(qmodelingelementproperty_cast<QUmlNamedElement *>(n));
 }
 
 QSet<QObject *> QUmlActorObject::inherit(QSet<QObject *> inhs) const
 {
     QSet<QUmlNamedElement *> inhsConverted;
     foreach (QObject *object, inhs)
-        inhsConverted.insert(qmodelingobjectproperty_cast<QUmlNamedElement *>(object));
+        inhsConverted.insert(qmodelingelementproperty_cast<QUmlNamedElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlActor *>(this)->inherit(inhsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlActor *>(this)->inherit(inhsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlActorObject::inheritableMembers(QObject *c) const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlActor *>(this)->inheritableMembers(qmodelingobjectproperty_cast<QUmlClassifier *>(c)))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlActor *>(this)->inheritableMembers(qmodelingelementproperty_cast<QUmlClassifier *>(c)))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlActorObject::isTemplate() const
 {
-    return qmodelingobjectproperty_cast<QUmlActor *>(this)->isTemplate();
+    return qmodelingelementproperty_cast<QUmlActor *>(this)->isTemplate();
 }
 
 bool QUmlActorObject::maySpecializeType(QObject *c) const
 {
-    return qmodelingobjectproperty_cast<QUmlActor *>(this)->maySpecializeType(qmodelingobjectproperty_cast<QUmlClassifier *>(c));
+    return qmodelingelementproperty_cast<QUmlActor *>(this)->maySpecializeType(qmodelingelementproperty_cast<QUmlClassifier *>(c));
 }
 
 QSet<QObject *> QUmlActorObject::parents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlActor *>(this)->parents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlActor *>(this)->parents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -589,363 +592,443 @@ QSet<QObject *> QUmlActorObject::parents() const
 
 void QUmlActorObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlActorObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlActorObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlActorObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlActorObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlActorObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlActorObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlActorObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlActor *>(this)->setName(name);
 }
 
 void QUmlActorObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlActorObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlActorObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlActor *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlActorObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlActorObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlActorObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlActorObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlActorObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlActorObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlActorObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlActorObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlActorObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlActorObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlActorObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlActorObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlActorObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlActorObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlActor *>(this)->setVisibility(visibility);
 }
 
 void QUmlActorObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Type]
 
 void QUmlActorObject::setPackage(QObject *package)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->setPackage(qmodelingobjectproperty_cast<QUmlPackage *>(package));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->setPackage(qmodelingelementproperty_cast<QUmlPackage *>(package));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlActorObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlActor *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlActorObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlActorObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlActorObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlActorObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlActorObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateableElement]
 
 void QUmlActorObject::addTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->addTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->addTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 void QUmlActorObject::removeTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->removeTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->removeTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Classifier]
 
 void QUmlActorObject::addAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->addAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->addAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlActorObject::removeAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->removeAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->removeAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlActorObject::addCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->addCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->addCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlActorObject::removeCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->removeCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->removeCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlActorObject::addFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->addFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->addFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlActorObject::removeFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->removeFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->removeFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlActorObject::addGeneral(QObject *general)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->addGeneral(qmodelingobjectproperty_cast<QUmlClassifier *>(general));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->addGeneral(qmodelingelementproperty_cast<QUmlClassifier *>(general));
 }
 
 void QUmlActorObject::removeGeneral(QObject *general)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->removeGeneral(qmodelingobjectproperty_cast<QUmlClassifier *>(general));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->removeGeneral(qmodelingelementproperty_cast<QUmlClassifier *>(general));
 }
 
 void QUmlActorObject::addGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->addGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->addGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlActorObject::removeGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->removeGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->removeGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlActorObject::addInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->addInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->addInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlActorObject::removeInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->removeInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->removeInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlActorObject::setAbstract(bool isAbstract)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->setAbstract(isAbstract);
+    qmodelingelementproperty_cast<QUmlActor *>(this)->setAbstract(isAbstract);
 }
 
 void QUmlActorObject::unsetAbstract()
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("abstract"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
 void QUmlActorObject::setFinalSpecialization(bool isFinalSpecialization)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->setFinalSpecialization(isFinalSpecialization);
+    qmodelingelementproperty_cast<QUmlActor *>(this)->setFinalSpecialization(isFinalSpecialization);
 }
 
 void QUmlActorObject::unsetFinalSpecialization()
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("finalSpecialization"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
 void QUmlActorObject::setOwnedTemplateSignature(QObject *ownedTemplateSignature)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->setOwnedTemplateSignature(qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->setOwnedTemplateSignature(qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
 }
 
 void QUmlActorObject::addOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->addOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->addOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlActorObject::removeOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->removeOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->removeOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlActorObject::addPowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->addPowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->addPowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlActorObject::removePowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->removePowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->removePowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlActorObject::addRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->addRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->addRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlActorObject::removeRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->removeRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->removeRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlActorObject::setRepresentation(QObject *representation)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->setRepresentation(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(representation));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->setRepresentation(qmodelingelementproperty_cast<QUmlCollaborationUse *>(representation));
 }
 
 void QUmlActorObject::addSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->addSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->addSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlActorObject::removeSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->removeSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->removeSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlActorObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
 }
 
 void QUmlActorObject::addUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->addUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->addUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 void QUmlActorObject::removeUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->removeUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->removeUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [BehavioredClassifier]
 
 void QUmlActorObject::setClassifierBehavior(QObject *classifierBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->setClassifierBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(classifierBehavior));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->setClassifierBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(classifierBehavior));
 }
 
 void QUmlActorObject::addInterfaceRealization(QObject *interfaceRealization)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->addInterfaceRealization(qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->addInterfaceRealization(qmodelingelementproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
 }
 
 void QUmlActorObject::removeInterfaceRealization(QObject *interfaceRealization)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->removeInterfaceRealization(qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->removeInterfaceRealization(qmodelingelementproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
 }
 
 void QUmlActorObject::addOwnedBehavior(QObject *ownedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->addOwnedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(ownedBehavior));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->addOwnedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(ownedBehavior));
 }
 
 void QUmlActorObject::removeOwnedBehavior(QObject *ownedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlActor *>(this)->removeOwnedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(ownedBehavior));
+    qmodelingelementproperty_cast<QUmlActor *>(this)->removeOwnedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(ownedBehavior));
+}
+
+
+void QUmlActorObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlType");
+    d->groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generals"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
+
+    d->propertyGroups << QStringLiteral("QUmlBehavioredClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifierBehavior"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interfaceRealizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedBehaviors"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActor");
+}
+
+void QUmlActorObject::setPropertyData()
+{
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlactorobject_p.h b/src/uml/qobjects/qumlactorobject_p.h
index 0675351b..d467520e 100644
--- a/src/uml/qobjects/qumlactorobject_p.h
+++ b/src/uml/qobjects/qumlactorobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlActor;
-class Q_UML_EXPORT QUmlActorObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlActorObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlActorObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -119,7 +122,7 @@ class Q_UML_EXPORT QUmlActorObject : public QObject
     Q_PROPERTY(QSet<QObject *> ownedBehaviors READ ownedBehaviors)
 
 public:
-    Q_INVOKABLE explicit QUmlActorObject(QUmlActor *qModelingObject);
+    Q_INVOKABLE explicit QUmlActorObject(QUmlActor *qModelingElement);
     virtual ~QUmlActorObject();
 
     // Owned attributes [Element]
@@ -312,6 +315,10 @@ public Q_SLOTS:
     void removeInterfaceRealization(QObject *interfaceRealization);
     void addOwnedBehavior(QObject *ownedBehavior);
     void removeOwnedBehavior(QObject *ownedBehavior);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumladdstructuralfeaturevalueactionobject.cpp b/src/uml/qobjects/qumladdstructuralfeaturevalueactionobject.cpp
index 90d03a2f..d144c3f4 100644
--- a/src/uml/qobjects/qumladdstructuralfeaturevalueactionobject.cpp
+++ b/src/uml/qobjects/qumladdstructuralfeaturevalueactionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumladdstructuralfeaturevalueactionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlAddStructuralFeatureValueAction>
 #include <QtUml/QUmlActivity>
@@ -65,16 +66,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlAddStructuralFeatureValueActionObject::QUmlAddStructuralFeatureValueActionObject(QUmlAddStructuralFeatureValueAction *qModelingObject)
+QUmlAddStructuralFeatureValueActionObject::QUmlAddStructuralFeatureValueActionObject(QUmlAddStructuralFeatureValueAction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlAddStructuralFeatureValueActionObject::~QUmlAddStructuralFeatureValueActionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -83,25 +86,25 @@ QUmlAddStructuralFeatureValueActionObject::~QUmlAddStructuralFeatureValueActionO
 const QSet<QObject *> QUmlAddStructuralFeatureValueActionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAddStructuralFeatureValueActionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlAddStructuralFeatureValueActionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -109,62 +112,62 @@ QObject *QUmlAddStructuralFeatureValueActionObject::owner() const
 const QSet<QObject *> QUmlAddStructuralFeatureValueActionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlAddStructuralFeatureValueActionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->name();
 }
 
 QObject *QUmlAddStructuralFeatureValueActionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlAddStructuralFeatureValueActionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlAddStructuralFeatureValueActionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlAddStructuralFeatureValueActionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlAddStructuralFeatureValueActionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlAddStructuralFeatureValueActionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAddStructuralFeatureValueActionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -172,65 +175,65 @@ const QSet<QObject *> QUmlAddStructuralFeatureValueActionObject::redefinitionCon
 
 QObject *QUmlAddStructuralFeatureValueActionObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlAddStructuralFeatureValueActionObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAddStructuralFeatureValueActionObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAddStructuralFeatureValueActionObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlAddStructuralFeatureValueActionObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlAddStructuralFeatureValueActionObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAddStructuralFeatureValueActionObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAddStructuralFeatureValueActionObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -239,8 +242,8 @@ const QSet<QObject *> QUmlAddStructuralFeatureValueActionObject::redefinedNodes(
 const QSet<QObject *> QUmlAddStructuralFeatureValueActionObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -248,46 +251,46 @@ const QSet<QObject *> QUmlAddStructuralFeatureValueActionObject::handlers() cons
 
 QObject *QUmlAddStructuralFeatureValueActionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlAddStructuralFeatureValueActionObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlAddStructuralFeatureValueActionObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlAddStructuralFeatureValueActionObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAddStructuralFeatureValueActionObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlAddStructuralFeatureValueActionObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -295,51 +298,51 @@ const QList<QObject *> QUmlAddStructuralFeatureValueActionObject::outputs() cons
 
 QObject *QUmlAddStructuralFeatureValueActionObject::object() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->object())
+    if (!qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->object())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->object()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->object()->asQModelingObject();
 }
 
 QObject *QUmlAddStructuralFeatureValueActionObject::structuralFeature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->structuralFeature())
+    if (!qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->structuralFeature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->structuralFeature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->structuralFeature()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [WriteStructuralFeatureAction]
 
 QObject *QUmlAddStructuralFeatureValueActionObject::result() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->result())
+    if (!qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->result())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->result()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->result()->asQModelingObject();
 }
 
 QObject *QUmlAddStructuralFeatureValueActionObject::value() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->value())
+    if (!qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->value())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->value()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->value()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [AddStructuralFeatureValueAction]
 
 QObject *QUmlAddStructuralFeatureValueActionObject::insertAt() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->insertAt())
+    if (!qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->insertAt())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->insertAt()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->insertAt()->asQModelingObject();
 }
 
 bool QUmlAddStructuralFeatureValueActionObject::isReplaceAll() const
 {
-    return qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->isReplaceAll();
+    return qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->isReplaceAll();
 }
 
 // OPERATIONS [Element]
@@ -347,14 +350,14 @@ bool QUmlAddStructuralFeatureValueActionObject::isReplaceAll() const
 QSet<QObject *> QUmlAddStructuralFeatureValueActionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlAddStructuralFeatureValueActionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -362,317 +365,403 @@ bool QUmlAddStructuralFeatureValueActionObject::mustBeOwned() const
 QList<QObject *> QUmlAddStructuralFeatureValueActionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlAddStructuralFeatureValueActionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlAddStructuralFeatureValueActionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlAddStructuralFeatureValueActionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlAddStructuralFeatureValueActionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlAddStructuralFeatureValueActionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlAddStructuralFeatureValueActionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlAddStructuralFeatureValueActionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlAddStructuralFeatureValueActionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlAddStructuralFeatureValueActionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlAddStructuralFeatureValueActionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlAddStructuralFeatureValueActionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlAddStructuralFeatureValueActionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlAddStructuralFeatureValueActionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->setName(name);
 }
 
 void QUmlAddStructuralFeatureValueActionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlAddStructuralFeatureValueActionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlAddStructuralFeatureValueActionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlAddStructuralFeatureValueActionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlAddStructuralFeatureValueActionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlAddStructuralFeatureValueActionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlAddStructuralFeatureValueActionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlAddStructuralFeatureValueActionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlAddStructuralFeatureValueActionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlAddStructuralFeatureValueActionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlAddStructuralFeatureValueActionObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlAddStructuralFeatureValueActionObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlAddStructuralFeatureValueActionObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlAddStructuralFeatureValueActionObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlAddStructuralFeatureValueActionObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlAddStructuralFeatureValueActionObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlAddStructuralFeatureValueActionObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlAddStructuralFeatureValueActionObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlAddStructuralFeatureValueActionObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlAddStructuralFeatureValueActionObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlAddStructuralFeatureValueActionObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlAddStructuralFeatureValueActionObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlAddStructuralFeatureValueActionObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlAddStructuralFeatureValueActionObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlAddStructuralFeatureValueActionObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlAddStructuralFeatureValueActionObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlAddStructuralFeatureValueActionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlAddStructuralFeatureValueActionObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlAddStructuralFeatureValueActionObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlAddStructuralFeatureValueActionObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlAddStructuralFeatureValueActionObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlAddStructuralFeatureValueActionObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlAddStructuralFeatureValueActionObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlAddStructuralFeatureValueActionObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlAddStructuralFeatureValueActionObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlAddStructuralFeatureValueActionObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlAddStructuralFeatureValueActionObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [StructuralFeatureAction]
 
 void QUmlAddStructuralFeatureValueActionObject::setObject(QObject *object)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->setObject(qmodelingobjectproperty_cast<QUmlInputPin *>(object));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->setObject(qmodelingelementproperty_cast<QUmlInputPin *>(object));
 }
 
 void QUmlAddStructuralFeatureValueActionObject::setStructuralFeature(QObject *structuralFeature)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->setStructuralFeature(qmodelingobjectproperty_cast<QUmlStructuralFeature *>(structuralFeature));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->setStructuralFeature(qmodelingelementproperty_cast<QUmlStructuralFeature *>(structuralFeature));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [WriteStructuralFeatureAction]
 
 void QUmlAddStructuralFeatureValueActionObject::setResult(QObject *result)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->setResult(qmodelingobjectproperty_cast<QUmlOutputPin *>(result));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->setResult(qmodelingelementproperty_cast<QUmlOutputPin *>(result));
 }
 
 void QUmlAddStructuralFeatureValueActionObject::setValue(QObject *value)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->setValue(qmodelingobjectproperty_cast<QUmlInputPin *>(value));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->setValue(qmodelingelementproperty_cast<QUmlInputPin *>(value));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [AddStructuralFeatureValueAction]
 
 void QUmlAddStructuralFeatureValueActionObject::setInsertAt(QObject *insertAt)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->setInsertAt(qmodelingobjectproperty_cast<QUmlInputPin *>(insertAt));
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->setInsertAt(qmodelingelementproperty_cast<QUmlInputPin *>(insertAt));
 }
 
 void QUmlAddStructuralFeatureValueActionObject::setReplaceAll(bool isReplaceAll)
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->setReplaceAll(isReplaceAll);
+    qmodelingelementproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->setReplaceAll(isReplaceAll);
 }
 
 void QUmlAddStructuralFeatureValueActionObject::unsetReplaceAll()
 {
-    qmodelingobjectproperty_cast<QUmlAddStructuralFeatureValueAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("replaceAll"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("replaceAll"));
+}
+
+
+void QUmlAddStructuralFeatureValueActionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlStructuralFeatureAction");
+    d->groupProperties.insert(QStringLiteral("QUmlStructuralFeatureAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("object"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuralFeatureAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("structuralFeature"))));
+
+    d->propertyGroups << QStringLiteral("QUmlWriteStructuralFeatureAction");
+    d->groupProperties.insert(QStringLiteral("QUmlWriteStructuralFeatureAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("result"))));
+    d->groupProperties.insert(QStringLiteral("QUmlWriteStructuralFeatureAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("value"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAddStructuralFeatureValueAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAddStructuralFeatureValueAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("insertAt"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAddStructuralFeatureValueAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isReplaceAll"))));
+}
+
+void QUmlAddStructuralFeatureValueActionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAddStructuralFeatureValueAction, insertAt, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAddStructuralFeatureValueAction, insertAt, PropertyClassRole, QStringLiteral("QUmlAddStructuralFeatureValueAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAddStructuralFeatureValueAction, insertAt, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAddStructuralFeatureValueAction, insertAt, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAddStructuralFeatureValueAction, insertAt, DocumentationRole, QStringLiteral("Gives the position at which to insert a new value or move an existing value in ordered structural features. The type of the pin is UnlimitedNatural, but the value cannot be zero. This pin is omitted for unordered structural features."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAddStructuralFeatureValueAction, insertAt, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAddStructuralFeatureValueAction, insertAt, SubsettedPropertiesRole, QStringLiteral("Action-input"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAddStructuralFeatureValueAction, insertAt, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAddStructuralFeatureValueAction, isReplaceAll, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAddStructuralFeatureValueAction, isReplaceAll, PropertyClassRole, QStringLiteral("QUmlAddStructuralFeatureValueAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAddStructuralFeatureValueAction, isReplaceAll, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAddStructuralFeatureValueAction, isReplaceAll, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAddStructuralFeatureValueAction, isReplaceAll, DocumentationRole, QStringLiteral("Specifies whether existing values of the structural feature of the object should be removed before adding the new value."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAddStructuralFeatureValueAction, isReplaceAll, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAddStructuralFeatureValueAction, isReplaceAll, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAddStructuralFeatureValueAction, isReplaceAll, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumladdstructuralfeaturevalueactionobject_p.h b/src/uml/qobjects/qumladdstructuralfeaturevalueactionobject_p.h
index a4b05ea5..d115abf6 100644
--- a/src/uml/qobjects/qumladdstructuralfeaturevalueactionobject_p.h
+++ b/src/uml/qobjects/qumladdstructuralfeaturevalueactionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlAddStructuralFeatureValueAction;
-class Q_UML_EXPORT QUmlAddStructuralFeatureValueActionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlAddStructuralFeatureValueActionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlAddStructuralFeatureValueActionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -110,7 +113,7 @@ class Q_UML_EXPORT QUmlAddStructuralFeatureValueActionObject : public QObject
     Q_PROPERTY(bool isReplaceAll READ isReplaceAll WRITE setReplaceAll RESET unsetReplaceAll)
 
 public:
-    Q_INVOKABLE explicit QUmlAddStructuralFeatureValueActionObject(QUmlAddStructuralFeatureValueAction *qModelingObject);
+    Q_INVOKABLE explicit QUmlAddStructuralFeatureValueActionObject(QUmlAddStructuralFeatureValueAction *qModelingElement);
     virtual ~QUmlAddStructuralFeatureValueActionObject();
 
     // Owned attributes [Element]
@@ -249,6 +252,10 @@ public Q_SLOTS:
     void setInsertAt(QObject *insertAt = 0);
     void setReplaceAll(bool isReplaceAll);
     void unsetReplaceAll();
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumladdvariablevalueactionobject.cpp b/src/uml/qobjects/qumladdvariablevalueactionobject.cpp
index 6241eca6..5f81d376 100644
--- a/src/uml/qobjects/qumladdvariablevalueactionobject.cpp
+++ b/src/uml/qobjects/qumladdvariablevalueactionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumladdvariablevalueactionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlAddVariableValueAction>
 #include <QtUml/QUmlActivity>
@@ -65,16 +66,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlAddVariableValueActionObject::QUmlAddVariableValueActionObject(QUmlAddVariableValueAction *qModelingObject)
+QUmlAddVariableValueActionObject::QUmlAddVariableValueActionObject(QUmlAddVariableValueAction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlAddVariableValueActionObject::~QUmlAddVariableValueActionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -83,25 +86,25 @@ QUmlAddVariableValueActionObject::~QUmlAddVariableValueActionObject()
 const QSet<QObject *> QUmlAddVariableValueActionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAddVariableValueActionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlAddVariableValueActionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -109,62 +112,62 @@ QObject *QUmlAddVariableValueActionObject::owner() const
 const QSet<QObject *> QUmlAddVariableValueActionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlAddVariableValueActionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->name();
 }
 
 QObject *QUmlAddVariableValueActionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlAddVariableValueActionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlAddVariableValueActionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlAddVariableValueActionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlAddVariableValueActionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlAddVariableValueActionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAddVariableValueActionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -172,65 +175,65 @@ const QSet<QObject *> QUmlAddVariableValueActionObject::redefinitionContexts() c
 
 QObject *QUmlAddVariableValueActionObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlAddVariableValueActionObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAddVariableValueActionObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAddVariableValueActionObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlAddVariableValueActionObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlAddVariableValueActionObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAddVariableValueActionObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAddVariableValueActionObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -239,8 +242,8 @@ const QSet<QObject *> QUmlAddVariableValueActionObject::redefinedNodes() const
 const QSet<QObject *> QUmlAddVariableValueActionObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -248,46 +251,46 @@ const QSet<QObject *> QUmlAddVariableValueActionObject::handlers() const
 
 QObject *QUmlAddVariableValueActionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlAddVariableValueActionObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlAddVariableValueActionObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlAddVariableValueActionObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAddVariableValueActionObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlAddVariableValueActionObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -295,35 +298,35 @@ const QList<QObject *> QUmlAddVariableValueActionObject::outputs() const
 
 QObject *QUmlAddVariableValueActionObject::variable() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->variable())
+    if (!qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->variable())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->variable()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->variable()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [WriteVariableAction]
 
 QObject *QUmlAddVariableValueActionObject::value() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->value())
+    if (!qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->value())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->value()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->value()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [AddVariableValueAction]
 
 QObject *QUmlAddVariableValueActionObject::insertAt() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->insertAt())
+    if (!qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->insertAt())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->insertAt()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->insertAt()->asQModelingObject();
 }
 
 bool QUmlAddVariableValueActionObject::isReplaceAll() const
 {
-    return qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->isReplaceAll();
+    return qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->isReplaceAll();
 }
 
 // OPERATIONS [Element]
@@ -331,14 +334,14 @@ bool QUmlAddVariableValueActionObject::isReplaceAll() const
 QSet<QObject *> QUmlAddVariableValueActionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlAddVariableValueActionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -346,307 +349,391 @@ bool QUmlAddVariableValueActionObject::mustBeOwned() const
 QList<QObject *> QUmlAddVariableValueActionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlAddVariableValueActionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlAddVariableValueActionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlAddVariableValueActionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlAddVariableValueActionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlAddVariableValueActionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlAddVariableValueActionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlAddVariableValueActionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlAddVariableValueActionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlAddVariableValueActionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlAddVariableValueActionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlAddVariableValueActionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlAddVariableValueActionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlAddVariableValueActionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->setName(name);
 }
 
 void QUmlAddVariableValueActionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlAddVariableValueActionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlAddVariableValueActionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlAddVariableValueActionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlAddVariableValueActionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlAddVariableValueActionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlAddVariableValueActionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlAddVariableValueActionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlAddVariableValueActionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlAddVariableValueActionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlAddVariableValueActionObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlAddVariableValueActionObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlAddVariableValueActionObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlAddVariableValueActionObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlAddVariableValueActionObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlAddVariableValueActionObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlAddVariableValueActionObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlAddVariableValueActionObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlAddVariableValueActionObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlAddVariableValueActionObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlAddVariableValueActionObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlAddVariableValueActionObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlAddVariableValueActionObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlAddVariableValueActionObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlAddVariableValueActionObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlAddVariableValueActionObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlAddVariableValueActionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlAddVariableValueActionObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlAddVariableValueActionObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlAddVariableValueActionObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlAddVariableValueActionObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlAddVariableValueActionObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlAddVariableValueActionObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlAddVariableValueActionObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlAddVariableValueActionObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlAddVariableValueActionObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlAddVariableValueActionObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [VariableAction]
 
 void QUmlAddVariableValueActionObject::setVariable(QObject *variable)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->setVariable(qmodelingobjectproperty_cast<QUmlVariable *>(variable));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->setVariable(qmodelingelementproperty_cast<QUmlVariable *>(variable));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [WriteVariableAction]
 
 void QUmlAddVariableValueActionObject::setValue(QObject *value)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->setValue(qmodelingobjectproperty_cast<QUmlInputPin *>(value));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->setValue(qmodelingelementproperty_cast<QUmlInputPin *>(value));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [AddVariableValueAction]
 
 void QUmlAddVariableValueActionObject::setInsertAt(QObject *insertAt)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->setInsertAt(qmodelingobjectproperty_cast<QUmlInputPin *>(insertAt));
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->setInsertAt(qmodelingelementproperty_cast<QUmlInputPin *>(insertAt));
 }
 
 void QUmlAddVariableValueActionObject::setReplaceAll(bool isReplaceAll)
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->setReplaceAll(isReplaceAll);
+    qmodelingelementproperty_cast<QUmlAddVariableValueAction *>(this)->setReplaceAll(isReplaceAll);
 }
 
 void QUmlAddVariableValueActionObject::unsetReplaceAll()
 {
-    qmodelingobjectproperty_cast<QUmlAddVariableValueAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("replaceAll"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("replaceAll"));
+}
+
+
+void QUmlAddVariableValueActionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlVariableAction");
+    d->groupProperties.insert(QStringLiteral("QUmlVariableAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("variable"))));
+
+    d->propertyGroups << QStringLiteral("QUmlWriteVariableAction");
+    d->groupProperties.insert(QStringLiteral("QUmlWriteVariableAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("value"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAddVariableValueAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAddVariableValueAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("insertAt"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAddVariableValueAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isReplaceAll"))));
+}
+
+void QUmlAddVariableValueActionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAddVariableValueAction, insertAt, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAddVariableValueAction, insertAt, PropertyClassRole, QStringLiteral("QUmlAddVariableValueAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAddVariableValueAction, insertAt, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAddVariableValueAction, insertAt, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAddVariableValueAction, insertAt, DocumentationRole, QStringLiteral("Gives the position at which to insert a new value or move an existing value in ordered variables. The types is UnlimitedINatural, but the value cannot be zero. This pin is omitted for unordered variables."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAddVariableValueAction, insertAt, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAddVariableValueAction, insertAt, SubsettedPropertiesRole, QStringLiteral("Action-input"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAddVariableValueAction, insertAt, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAddVariableValueAction, isReplaceAll, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAddVariableValueAction, isReplaceAll, PropertyClassRole, QStringLiteral("QUmlAddVariableValueAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAddVariableValueAction, isReplaceAll, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAddVariableValueAction, isReplaceAll, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAddVariableValueAction, isReplaceAll, DocumentationRole, QStringLiteral("Specifies whether existing values of the variable should be removed before adding the new value."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAddVariableValueAction, isReplaceAll, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAddVariableValueAction, isReplaceAll, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAddVariableValueAction, isReplaceAll, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumladdvariablevalueactionobject_p.h b/src/uml/qobjects/qumladdvariablevalueactionobject_p.h
index 62c893bd..a5a0d60a 100644
--- a/src/uml/qobjects/qumladdvariablevalueactionobject_p.h
+++ b/src/uml/qobjects/qumladdvariablevalueactionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlAddVariableValueAction;
-class Q_UML_EXPORT QUmlAddVariableValueActionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlAddVariableValueActionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlAddVariableValueActionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -108,7 +111,7 @@ class Q_UML_EXPORT QUmlAddVariableValueActionObject : public QObject
     Q_PROPERTY(bool isReplaceAll READ isReplaceAll WRITE setReplaceAll RESET unsetReplaceAll)
 
 public:
-    Q_INVOKABLE explicit QUmlAddVariableValueActionObject(QUmlAddVariableValueAction *qModelingObject);
+    Q_INVOKABLE explicit QUmlAddVariableValueActionObject(QUmlAddVariableValueAction *qModelingElement);
     virtual ~QUmlAddVariableValueActionObject();
 
     // Owned attributes [Element]
@@ -243,6 +246,10 @@ public Q_SLOTS:
     void setInsertAt(QObject *insertAt = 0);
     void setReplaceAll(bool isReplaceAll);
     void unsetReplaceAll();
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlanyreceiveeventobject.cpp b/src/uml/qobjects/qumlanyreceiveeventobject.cpp
index 9c80786e..50cfd1aa 100644
--- a/src/uml/qobjects/qumlanyreceiveeventobject.cpp
+++ b/src/uml/qobjects/qumlanyreceiveeventobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlanyreceiveeventobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlAnyReceiveEvent>
 #include <QtUml/QUmlComment>
@@ -53,16 +54,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlAnyReceiveEventObject::QUmlAnyReceiveEventObject(QUmlAnyReceiveEvent *qModelingObject)
+QUmlAnyReceiveEventObject::QUmlAnyReceiveEventObject(QUmlAnyReceiveEvent *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlAnyReceiveEventObject::~QUmlAnyReceiveEventObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -71,43 +74,43 @@ QUmlAnyReceiveEventObject::~QUmlAnyReceiveEventObject()
 const QSet<QObject *> QUmlAnyReceiveEventObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAnyReceiveEventObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlAnyReceiveEventObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlAnyReceiveEventObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlAnyReceiveEventObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -115,42 +118,42 @@ QObject *QUmlAnyReceiveEventObject::templateParameter() const
 const QSet<QObject *> QUmlAnyReceiveEventObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlAnyReceiveEventObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->name();
 }
 
 QObject *QUmlAnyReceiveEventObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlAnyReceiveEventObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlAnyReceiveEventObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlAnyReceiveEventObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->visibility();
 }
 
 // OPERATIONS [Element]
@@ -158,26 +161,26 @@ QtUml::VisibilityKind QUmlAnyReceiveEventObject::visibility() const
 QSet<QObject *> QUmlAnyReceiveEventObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlAnyReceiveEventObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlAnyReceiveEventObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlAnyReceiveEventObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [NamedElement]
@@ -185,109 +188,149 @@ bool QUmlAnyReceiveEventObject::isTemplateParameter() const
 QList<QObject *> QUmlAnyReceiveEventObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlAnyReceiveEventObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlAnyReceiveEventObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlAnyReceiveEventObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlAnyReceiveEventObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlAnyReceiveEventObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlAnyReceiveEventObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlAnyReceiveEventObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlAnyReceiveEventObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlAnyReceiveEventObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlAnyReceiveEventObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlAnyReceiveEventObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlAnyReceiveEventObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlAnyReceiveEventObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->setName(name);
 }
 
 void QUmlAnyReceiveEventObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlAnyReceiveEventObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlAnyReceiveEventObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlAnyReceiveEventObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlAnyReceiveEvent *>(this)->setVisibility(visibility);
 }
 
 void QUmlAnyReceiveEventObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlAnyReceiveEvent *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
+}
+
+
+void QUmlAnyReceiveEventObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlEvent");
+
+    d->propertyGroups << QStringLiteral("QUmlMessageEvent");
+
+    d->propertyGroups << QStringLiteral("QUmlAnyReceiveEvent");
+}
+
+void QUmlAnyReceiveEventObject::setPropertyData()
+{
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlanyreceiveeventobject_p.h b/src/uml/qobjects/qumlanyreceiveeventobject_p.h
index a3b7218a..aa493726 100644
--- a/src/uml/qobjects/qumlanyreceiveeventobject_p.h
+++ b/src/uml/qobjects/qumlanyreceiveeventobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlAnyReceiveEvent;
-class Q_UML_EXPORT QUmlAnyReceiveEventObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlAnyReceiveEventObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlAnyReceiveEventObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -78,7 +81,7 @@ class Q_UML_EXPORT QUmlAnyReceiveEventObject : public QObject
     Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
 public:
-    Q_INVOKABLE explicit QUmlAnyReceiveEventObject(QUmlAnyReceiveEvent *qModelingObject);
+    Q_INVOKABLE explicit QUmlAnyReceiveEventObject(QUmlAnyReceiveEvent *qModelingElement);
     virtual ~QUmlAnyReceiveEventObject();
 
     // Owned attributes [Element]
@@ -138,6 +141,10 @@ public Q_SLOTS:
     // Slots for owned attributes [PackageableElement]
     void setVisibility(QtUml::VisibilityKind visibility);
     void unsetVisibility();
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlartifactobject.cpp b/src/uml/qobjects/qumlartifactobject.cpp
index 8192736a..73a407c1 100644
--- a/src/uml/qobjects/qumlartifactobject.cpp
+++ b/src/uml/qobjects/qumlartifactobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlartifactobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlArtifact>
 #include <QtUml/QUmlClassifier>
@@ -73,16 +74,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlArtifactObject::QUmlArtifactObject(QUmlArtifact *qModelingObject)
+QUmlArtifactObject::QUmlArtifactObject(QUmlArtifact *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlArtifactObject::~QUmlArtifactObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlArtifact *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlArtifact *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -91,25 +94,25 @@ QUmlArtifactObject::~QUmlArtifactObject()
 const QSet<QObject *> QUmlArtifactObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlArtifact *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlArtifact *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlArtifactObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlArtifact *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlArtifact *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlArtifactObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlArtifact *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlArtifact *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlArtifact *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlArtifact *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -117,35 +120,35 @@ QObject *QUmlArtifactObject::owner() const
 const QSet<QObject *> QUmlArtifactObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlArtifact *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlArtifact *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlArtifactObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlArtifact *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlArtifact *>(this)->name();
 }
 
 QObject *QUmlArtifactObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlArtifact *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlArtifact *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlArtifact *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlArtifact *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlArtifactObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlArtifact *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlArtifact *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlArtifact *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlArtifact *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlArtifactObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlArtifact *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlArtifact *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [Namespace]
@@ -153,48 +156,48 @@ QString QUmlArtifactObject::qualifiedName() const
 const QSet<QObject *> QUmlArtifactObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlArtifact *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlArtifact *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlArtifactObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlArtifact *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlArtifact *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlArtifactObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlArtifact *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlArtifact *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlArtifactObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlArtifact *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlArtifact *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlArtifactObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlArtifact *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlArtifact *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlArtifactObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlArtifact *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlArtifact *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -202,49 +205,49 @@ const QSet<QObject *> QUmlArtifactObject::packageImports() const
 
 QObject *QUmlArtifactObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlArtifact *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlArtifact *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlArtifact *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlArtifact *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlArtifactObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlArtifact *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlArtifact *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Type]
 
 QObject *QUmlArtifactObject::package() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlArtifact *>(this)->package())
+    if (!qmodelingelementproperty_cast<QUmlArtifact *>(this)->package())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlArtifact *>(this)->package()->asQObject();
+        return qmodelingelementproperty_cast<QUmlArtifact *>(this)->package()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlArtifactObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlArtifact *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlArtifact *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlArtifactObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlArtifact *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlArtifact *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlArtifactObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlArtifact *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlArtifact *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -253,8 +256,8 @@ const QSet<QObject *> QUmlArtifactObject::redefinitionContexts() const
 const QSet<QObject *> QUmlArtifactObject::templateBindings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTemplateBinding *element, qmodelingobjectproperty_cast<QUmlArtifact *>(this)->templateBindings())
-        set.insert(element->asQObject());
+    foreach (QUmlTemplateBinding *element, qmodelingelementproperty_cast<QUmlArtifact *>(this)->templateBindings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -263,122 +266,122 @@ const QSet<QObject *> QUmlArtifactObject::templateBindings() const
 const QSet<QObject *> QUmlArtifactObject::attributes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlArtifact *>(this)->attributes())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlArtifact *>(this)->attributes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlArtifactObject::collaborationUses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlCollaborationUse *element, qmodelingobjectproperty_cast<QUmlArtifact *>(this)->collaborationUses())
-        set.insert(element->asQObject());
+    foreach (QUmlCollaborationUse *element, qmodelingelementproperty_cast<QUmlArtifact *>(this)->collaborationUses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlArtifactObject::features() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlArtifact *>(this)->features())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlArtifact *>(this)->features())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlArtifactObject::generals() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlArtifact *>(this)->generals())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlArtifact *>(this)->generals())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlArtifactObject::generalizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralization *element, qmodelingobjectproperty_cast<QUmlArtifact *>(this)->generalizations())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralization *element, qmodelingelementproperty_cast<QUmlArtifact *>(this)->generalizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlArtifactObject::inheritedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlArtifact *>(this)->inheritedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlArtifact *>(this)->inheritedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlArtifactObject::isAbstract() const
 {
-    return qmodelingobjectproperty_cast<QUmlArtifact *>(this)->isAbstract();
+    return qmodelingelementproperty_cast<QUmlArtifact *>(this)->isAbstract();
 }
 
 bool QUmlArtifactObject::isFinalSpecialization() const
 {
-    return qmodelingobjectproperty_cast<QUmlArtifact *>(this)->isFinalSpecialization();
+    return qmodelingelementproperty_cast<QUmlArtifact *>(this)->isFinalSpecialization();
 }
 
 QObject *QUmlArtifactObject::ownedTemplateSignature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlArtifact *>(this)->ownedTemplateSignature())
+    if (!qmodelingelementproperty_cast<QUmlArtifact *>(this)->ownedTemplateSignature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlArtifact *>(this)->ownedTemplateSignature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlArtifact *>(this)->ownedTemplateSignature()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlArtifactObject::ownedUseCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlArtifact *>(this)->ownedUseCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlArtifact *>(this)->ownedUseCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlArtifactObject::powertypeExtents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralizationSet *element, qmodelingobjectproperty_cast<QUmlArtifact *>(this)->powertypeExtents())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralizationSet *element, qmodelingelementproperty_cast<QUmlArtifact *>(this)->powertypeExtents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlArtifactObject::redefinedClassifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlArtifact *>(this)->redefinedClassifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlArtifact *>(this)->redefinedClassifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlArtifactObject::representation() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlArtifact *>(this)->representation())
+    if (!qmodelingelementproperty_cast<QUmlArtifact *>(this)->representation())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlArtifact *>(this)->representation()->asQObject();
+        return qmodelingelementproperty_cast<QUmlArtifact *>(this)->representation()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlArtifactObject::substitutions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlSubstitution *element, qmodelingobjectproperty_cast<QUmlArtifact *>(this)->substitutions())
-        set.insert(element->asQObject());
+    foreach (QUmlSubstitution *element, qmodelingelementproperty_cast<QUmlArtifact *>(this)->substitutions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlArtifactObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlArtifact *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlArtifact *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlArtifact *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlArtifact *>(this)->templateParameter()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlArtifactObject::useCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlArtifact *>(this)->useCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlArtifact *>(this)->useCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -386,38 +389,38 @@ const QSet<QObject *> QUmlArtifactObject::useCases() const
 
 QString QUmlArtifactObject::fileName() const
 {
-    return qmodelingobjectproperty_cast<QUmlArtifact *>(this)->fileName();
+    return qmodelingelementproperty_cast<QUmlArtifact *>(this)->fileName();
 }
 
 const QSet<QObject *> QUmlArtifactObject::manifestations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlManifestation *element, qmodelingobjectproperty_cast<QUmlArtifact *>(this)->manifestations())
-        set.insert(element->asQObject());
+    foreach (QUmlManifestation *element, qmodelingelementproperty_cast<QUmlArtifact *>(this)->manifestations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlArtifactObject::nestedArtifacts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlArtifact *element, qmodelingobjectproperty_cast<QUmlArtifact *>(this)->nestedArtifacts())
-        set.insert(element->asQObject());
+    foreach (QUmlArtifact *element, qmodelingelementproperty_cast<QUmlArtifact *>(this)->nestedArtifacts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlArtifactObject::ownedAttributes() const
 {
     QList<QObject *> list;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlArtifact *>(this)->ownedAttributes())
-        list.append(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlArtifact *>(this)->ownedAttributes())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QList<QObject *> QUmlArtifactObject::ownedOperations() const
 {
     QList<QObject *> list;
-    foreach (QUmlOperation *element, qmodelingobjectproperty_cast<QUmlArtifact *>(this)->ownedOperations())
-        list.append(element->asQObject());
+    foreach (QUmlOperation *element, qmodelingelementproperty_cast<QUmlArtifact *>(this)->ownedOperations())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -426,14 +429,14 @@ const QList<QObject *> QUmlArtifactObject::ownedOperations() const
 QSet<QObject *> QUmlArtifactObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlArtifact *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlArtifact *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlArtifactObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlArtifact *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlArtifact *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -441,27 +444,27 @@ bool QUmlArtifactObject::mustBeOwned() const
 QList<QObject *> QUmlArtifactObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlArtifact *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlArtifact *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlArtifactObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlArtifact *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlArtifact *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlArtifactObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlArtifact *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlArtifact *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlArtifactObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlArtifact *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlArtifact *>(this)->separator();
 }
 
 // OPERATIONS [Namespace]
@@ -470,44 +473,44 @@ QSet<QObject *> QUmlArtifactObject::excludeCollisions(QSet<QObject *> imps) cons
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlArtifact *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlArtifact *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlArtifactObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlArtifact *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlArtifact *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlArtifactObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlArtifact *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlArtifact *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlArtifactObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlArtifact *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlArtifact *>(this)->membersAreDistinguishable();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlArtifactObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlArtifact *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlArtifact *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlArtifactObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlArtifact *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlArtifact *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [Type]
@@ -515,12 +518,12 @@ bool QUmlArtifactObject::isTemplateParameter() const
 
 bool QUmlArtifactObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlArtifact *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlArtifact *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlArtifactObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlArtifact *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlArtifact *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [TemplateableElement]
@@ -528,8 +531,8 @@ bool QUmlArtifactObject::isRedefinitionContextValid(QObject *redefined) const
 QSet<QObject *> QUmlArtifactObject::parameterableElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterableElement *element, qmodelingobjectproperty_cast<QUmlArtifact *>(this)->parameterableElements())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterableElement *element, qmodelingelementproperty_cast<QUmlArtifact *>(this)->parameterableElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -538,63 +541,63 @@ QSet<QObject *> QUmlArtifactObject::parameterableElements() const
 QSet<QObject *> QUmlArtifactObject::allFeatures() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlArtifact *>(this)->allFeatures())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlArtifact *>(this)->allFeatures())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlArtifactObject::allParents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlArtifact *>(this)->allParents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlArtifact *>(this)->allParents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlArtifactObject::conformsTo(QObject *other) const
 {
-    return qmodelingobjectproperty_cast<QUmlArtifact *>(this)->conformsTo(qmodelingobjectproperty_cast<QUmlClassifier *>(other));
+    return qmodelingelementproperty_cast<QUmlArtifact *>(this)->conformsTo(qmodelingelementproperty_cast<QUmlClassifier *>(other));
 }
 
 bool QUmlArtifactObject::hasVisibilityOf(QObject *n) const
 {
-    return qmodelingobjectproperty_cast<QUmlArtifact *>(this)->hasVisibilityOf(qmodelingobjectproperty_cast<QUmlNamedElement *>(n));
+    return qmodelingelementproperty_cast<QUmlArtifact *>(this)->hasVisibilityOf(qmodelingelementproperty_cast<QUmlNamedElement *>(n));
 }
 
 QSet<QObject *> QUmlArtifactObject::inherit(QSet<QObject *> inhs) const
 {
     QSet<QUmlNamedElement *> inhsConverted;
     foreach (QObject *object, inhs)
-        inhsConverted.insert(qmodelingobjectproperty_cast<QUmlNamedElement *>(object));
+        inhsConverted.insert(qmodelingelementproperty_cast<QUmlNamedElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlArtifact *>(this)->inherit(inhsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlArtifact *>(this)->inherit(inhsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlArtifactObject::inheritableMembers(QObject *c) const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlArtifact *>(this)->inheritableMembers(qmodelingobjectproperty_cast<QUmlClassifier *>(c)))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlArtifact *>(this)->inheritableMembers(qmodelingelementproperty_cast<QUmlClassifier *>(c)))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlArtifactObject::isTemplate() const
 {
-    return qmodelingobjectproperty_cast<QUmlArtifact *>(this)->isTemplate();
+    return qmodelingelementproperty_cast<QUmlArtifact *>(this)->isTemplate();
 }
 
 bool QUmlArtifactObject::maySpecializeType(QObject *c) const
 {
-    return qmodelingobjectproperty_cast<QUmlArtifact *>(this)->maySpecializeType(qmodelingobjectproperty_cast<QUmlClassifier *>(c));
+    return qmodelingelementproperty_cast<QUmlArtifact *>(this)->maySpecializeType(qmodelingelementproperty_cast<QUmlClassifier *>(c));
 }
 
 QSet<QObject *> QUmlArtifactObject::parents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlArtifact *>(this)->parents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlArtifact *>(this)->parents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -602,383 +605,510 @@ QSet<QObject *> QUmlArtifactObject::parents() const
 
 void QUmlArtifactObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlArtifactObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlArtifactObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlArtifactObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlArtifactObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlArtifactObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlArtifactObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlArtifactObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->setName(name);
 }
 
 void QUmlArtifactObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlArtifactObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlArtifactObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlArtifactObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlArtifactObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlArtifactObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlArtifactObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlArtifactObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlArtifactObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlArtifactObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlArtifactObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlArtifactObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlArtifactObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlArtifactObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlArtifactObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlArtifactObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlArtifactObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->setVisibility(visibility);
 }
 
 void QUmlArtifactObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Type]
 
 void QUmlArtifactObject::setPackage(QObject *package)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->setPackage(qmodelingobjectproperty_cast<QUmlPackage *>(package));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->setPackage(qmodelingelementproperty_cast<QUmlPackage *>(package));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlArtifactObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlArtifactObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlArtifactObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlArtifactObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlArtifactObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlArtifactObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateableElement]
 
 void QUmlArtifactObject::addTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->addTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->addTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 void QUmlArtifactObject::removeTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->removeTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->removeTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Classifier]
 
 void QUmlArtifactObject::addAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->addAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->addAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlArtifactObject::removeAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->removeAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->removeAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlArtifactObject::addCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->addCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->addCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlArtifactObject::removeCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->removeCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->removeCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlArtifactObject::addFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->addFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->addFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlArtifactObject::removeFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->removeFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->removeFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlArtifactObject::addGeneral(QObject *general)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->addGeneral(qmodelingobjectproperty_cast<QUmlClassifier *>(general));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->addGeneral(qmodelingelementproperty_cast<QUmlClassifier *>(general));
 }
 
 void QUmlArtifactObject::removeGeneral(QObject *general)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->removeGeneral(qmodelingobjectproperty_cast<QUmlClassifier *>(general));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->removeGeneral(qmodelingelementproperty_cast<QUmlClassifier *>(general));
 }
 
 void QUmlArtifactObject::addGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->addGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->addGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlArtifactObject::removeGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->removeGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->removeGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlArtifactObject::addInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->addInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->addInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlArtifactObject::removeInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->removeInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->removeInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlArtifactObject::setAbstract(bool isAbstract)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->setAbstract(isAbstract);
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->setAbstract(isAbstract);
 }
 
 void QUmlArtifactObject::unsetAbstract()
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("abstract"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
 void QUmlArtifactObject::setFinalSpecialization(bool isFinalSpecialization)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->setFinalSpecialization(isFinalSpecialization);
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->setFinalSpecialization(isFinalSpecialization);
 }
 
 void QUmlArtifactObject::unsetFinalSpecialization()
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("finalSpecialization"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
 void QUmlArtifactObject::setOwnedTemplateSignature(QObject *ownedTemplateSignature)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->setOwnedTemplateSignature(qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->setOwnedTemplateSignature(qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
 }
 
 void QUmlArtifactObject::addOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->addOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->addOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlArtifactObject::removeOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->removeOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->removeOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlArtifactObject::addPowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->addPowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->addPowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlArtifactObject::removePowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->removePowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->removePowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlArtifactObject::addRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->addRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->addRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlArtifactObject::removeRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->removeRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->removeRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlArtifactObject::setRepresentation(QObject *representation)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->setRepresentation(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(representation));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->setRepresentation(qmodelingelementproperty_cast<QUmlCollaborationUse *>(representation));
 }
 
 void QUmlArtifactObject::addSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->addSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->addSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlArtifactObject::removeSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->removeSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->removeSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlArtifactObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
 }
 
 void QUmlArtifactObject::addUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->addUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->addUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 void QUmlArtifactObject::removeUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->removeUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->removeUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Artifact]
 
 void QUmlArtifactObject::setFileName(QString fileName)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->setFileName(fileName);
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->setFileName(fileName);
 }
 
 void QUmlArtifactObject::addManifestation(QObject *manifestation)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->addManifestation(qmodelingobjectproperty_cast<QUmlManifestation *>(manifestation));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->addManifestation(qmodelingelementproperty_cast<QUmlManifestation *>(manifestation));
 }
 
 void QUmlArtifactObject::removeManifestation(QObject *manifestation)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->removeManifestation(qmodelingobjectproperty_cast<QUmlManifestation *>(manifestation));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->removeManifestation(qmodelingelementproperty_cast<QUmlManifestation *>(manifestation));
 }
 
 void QUmlArtifactObject::addNestedArtifact(QObject *nestedArtifact)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->addNestedArtifact(qmodelingobjectproperty_cast<QUmlArtifact *>(nestedArtifact));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->addNestedArtifact(qmodelingelementproperty_cast<QUmlArtifact *>(nestedArtifact));
 }
 
 void QUmlArtifactObject::removeNestedArtifact(QObject *nestedArtifact)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->removeNestedArtifact(qmodelingobjectproperty_cast<QUmlArtifact *>(nestedArtifact));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->removeNestedArtifact(qmodelingelementproperty_cast<QUmlArtifact *>(nestedArtifact));
 }
 
 void QUmlArtifactObject::addOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->addOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->addOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlArtifactObject::removeOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->removeOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->removeOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlArtifactObject::addOwnedOperation(QObject *ownedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->addOwnedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(ownedOperation));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->addOwnedOperation(qmodelingelementproperty_cast<QUmlOperation *>(ownedOperation));
 }
 
 void QUmlArtifactObject::removeOwnedOperation(QObject *ownedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlArtifact *>(this)->removeOwnedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(ownedOperation));
+    qmodelingelementproperty_cast<QUmlArtifact *>(this)->removeOwnedOperation(qmodelingelementproperty_cast<QUmlOperation *>(ownedOperation));
+}
+
+
+void QUmlArtifactObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDeployedArtifact");
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlType");
+    d->groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generals"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
+
+    d->propertyGroups << QStringLiteral("QUmlArtifact");
+    d->groupProperties.insert(QStringLiteral("QUmlArtifact"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("fileName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlArtifact"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("manifestations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlArtifact"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedArtifacts"))));
+    d->groupProperties.insert(QStringLiteral("QUmlArtifact"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlArtifact"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
+}
+
+void QUmlArtifactObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, fileName, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, fileName, PropertyClassRole, QStringLiteral("QUmlArtifact"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, fileName, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, fileName, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, fileName, DocumentationRole, QStringLiteral("A concrete name that is used to refer to the Artifact in a physical context. Example: file system name, universal resource locator."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, fileName, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, fileName, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, fileName, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, manifestations, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, manifestations, PropertyClassRole, QStringLiteral("QUmlArtifact"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, manifestations, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, manifestations, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, manifestations, DocumentationRole, QStringLiteral("The set of model elements that are manifested in the Artifact. That is, these model elements are utilized in the construction (or generation) of the artifact."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, manifestations, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, manifestations, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement NamedElement-clientDependency"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, manifestations, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, nestedArtifacts, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, nestedArtifacts, PropertyClassRole, QStringLiteral("QUmlArtifact"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, nestedArtifacts, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, nestedArtifacts, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, nestedArtifacts, DocumentationRole, QStringLiteral("The Artifacts that are defined (nested) within the Artifact. The association is a specialization of the ownedMember association from Namespace to NamedElement."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, nestedArtifacts, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, nestedArtifacts, SubsettedPropertiesRole, QStringLiteral("Namespace-ownedMember"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, nestedArtifacts, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, ownedAttributes, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, ownedAttributes, PropertyClassRole, QStringLiteral("QUmlArtifact"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, ownedAttributes, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, ownedAttributes, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, ownedAttributes, DocumentationRole, QStringLiteral("The attributes or association ends defined for the Artifact. The association is a specialization of the ownedMember association."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, ownedAttributes, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, ownedAttributes, SubsettedPropertiesRole, QStringLiteral("Namespace-ownedMember Classifier-attribute"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, ownedAttributes, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, ownedOperations, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, ownedOperations, PropertyClassRole, QStringLiteral("QUmlArtifact"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, ownedOperations, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, ownedOperations, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, ownedOperations, DocumentationRole, QStringLiteral("The Operations defined for the Artifact. The association is a specialization of the ownedMember association."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, ownedOperations, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, ownedOperations, SubsettedPropertiesRole, QStringLiteral("Classifier-feature A_redefinitionContext_redefinableElement-redefinableElement Namespace-ownedMember"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlArtifact, ownedOperations, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlartifactobject_p.h b/src/uml/qobjects/qumlartifactobject_p.h
index 43467646..459f4176 100644
--- a/src/uml/qobjects/qumlartifactobject_p.h
+++ b/src/uml/qobjects/qumlartifactobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlArtifact;
-class Q_UML_EXPORT QUmlArtifactObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlArtifactObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlArtifactObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -121,7 +124,7 @@ class Q_UML_EXPORT QUmlArtifactObject : public QObject
     Q_PROPERTY(QList<QObject *> ownedOperations READ ownedOperations)
 
 public:
-    Q_INVOKABLE explicit QUmlArtifactObject(QUmlArtifact *qModelingObject);
+    Q_INVOKABLE explicit QUmlArtifactObject(QUmlArtifact *qModelingElement);
     virtual ~QUmlArtifactObject();
 
     // Owned attributes [Element]
@@ -320,6 +323,10 @@ public Q_SLOTS:
     void removeOwnedAttribute(QObject *ownedAttribute);
     void addOwnedOperation(QObject *ownedOperation);
     void removeOwnedOperation(QObject *ownedOperation);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlassociationclassobject.cpp b/src/uml/qobjects/qumlassociationclassobject.cpp
index 24114f9e..907723be 100644
--- a/src/uml/qobjects/qumlassociationclassobject.cpp
+++ b/src/uml/qobjects/qumlassociationclassobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlassociationclassobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlAssociationClass>
 #include <QtUml/QUmlBehavior>
@@ -80,16 +81,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlAssociationClassObject::QUmlAssociationClassObject(QUmlAssociationClass *qModelingObject)
+QUmlAssociationClassObject::QUmlAssociationClassObject(QUmlAssociationClass *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlAssociationClassObject::~QUmlAssociationClassObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -98,25 +101,25 @@ QUmlAssociationClassObject::~QUmlAssociationClassObject()
 const QSet<QObject *> QUmlAssociationClassObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAssociationClassObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlAssociationClassObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -124,35 +127,35 @@ QObject *QUmlAssociationClassObject::owner() const
 const QSet<QObject *> QUmlAssociationClassObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlAssociationClassObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->name();
 }
 
 QObject *QUmlAssociationClassObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlAssociationClassObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlAssociationClassObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [Namespace]
@@ -160,48 +163,48 @@ QString QUmlAssociationClassObject::qualifiedName() const
 const QSet<QObject *> QUmlAssociationClassObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAssociationClassObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAssociationClassObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAssociationClassObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAssociationClassObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAssociationClassObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -209,49 +212,49 @@ const QSet<QObject *> QUmlAssociationClassObject::packageImports() const
 
 QObject *QUmlAssociationClassObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlAssociationClassObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Type]
 
 QObject *QUmlAssociationClassObject::package() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->package())
+    if (!qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->package())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->package()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->package()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlAssociationClassObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlAssociationClassObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAssociationClassObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -260,8 +263,8 @@ const QSet<QObject *> QUmlAssociationClassObject::redefinitionContexts() const
 const QSet<QObject *> QUmlAssociationClassObject::templateBindings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTemplateBinding *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->templateBindings())
-        set.insert(element->asQObject());
+    foreach (QUmlTemplateBinding *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->templateBindings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -270,109 +273,109 @@ const QSet<QObject *> QUmlAssociationClassObject::templateBindings() const
 const QSet<QObject *> QUmlAssociationClassObject::attributes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->attributes())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->attributes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAssociationClassObject::collaborationUses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlCollaborationUse *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->collaborationUses())
-        set.insert(element->asQObject());
+    foreach (QUmlCollaborationUse *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->collaborationUses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAssociationClassObject::features() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->features())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->features())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAssociationClassObject::generalizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralization *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->generalizations())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralization *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->generalizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAssociationClassObject::inheritedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->inheritedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->inheritedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlAssociationClassObject::isFinalSpecialization() const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->isFinalSpecialization();
+    return qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->isFinalSpecialization();
 }
 
 QObject *QUmlAssociationClassObject::ownedTemplateSignature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->ownedTemplateSignature())
+    if (!qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->ownedTemplateSignature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->ownedTemplateSignature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->ownedTemplateSignature()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlAssociationClassObject::ownedUseCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->ownedUseCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->ownedUseCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAssociationClassObject::powertypeExtents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralizationSet *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->powertypeExtents())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralizationSet *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->powertypeExtents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAssociationClassObject::redefinedClassifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->redefinedClassifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->redefinedClassifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlAssociationClassObject::representation() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->representation())
+    if (!qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->representation())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->representation()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->representation()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlAssociationClassObject::substitutions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlSubstitution *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->substitutions())
-        set.insert(element->asQObject());
+    foreach (QUmlSubstitution *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->substitutions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlAssociationClassObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->templateParameter()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlAssociationClassObject::useCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->useCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->useCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -381,24 +384,24 @@ const QSet<QObject *> QUmlAssociationClassObject::useCases() const
 const QSet<QObject *> QUmlAssociationClassObject::ownedConnectors() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConnector *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->ownedConnectors())
-        set.insert(element->asQObject());
+    foreach (QUmlConnector *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->ownedConnectors())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAssociationClassObject::parts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->parts())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->parts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAssociationClassObject::roles() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConnectableElement *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->roles())
-        set.insert(element->asQObject());
+    foreach (QUmlConnectableElement *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->roles())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -407,8 +410,8 @@ const QSet<QObject *> QUmlAssociationClassObject::roles() const
 const QSet<QObject *> QUmlAssociationClassObject::ownedPorts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPort *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->ownedPorts())
-        set.insert(element->asQObject());
+    foreach (QUmlPort *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->ownedPorts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -416,25 +419,25 @@ const QSet<QObject *> QUmlAssociationClassObject::ownedPorts() const
 
 QObject *QUmlAssociationClassObject::classifierBehavior() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->classifierBehavior())
+    if (!qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->classifierBehavior())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->classifierBehavior()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->classifierBehavior()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlAssociationClassObject::interfaceRealizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterfaceRealization *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->interfaceRealizations())
-        set.insert(element->asQObject());
+    foreach (QUmlInterfaceRealization *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->interfaceRealizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAssociationClassObject::ownedBehaviors() const
 {
     QSet<QObject *> set;
-    foreach (QUmlBehavior *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->ownedBehaviors())
-        set.insert(element->asQObject());
+    foreach (QUmlBehavior *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->ownedBehaviors())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -443,58 +446,58 @@ const QSet<QObject *> QUmlAssociationClassObject::ownedBehaviors() const
 const QSet<QObject *> QUmlAssociationClassObject::extensions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExtension *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->extensions())
-        set.insert(element->asQObject());
+    foreach (QUmlExtension *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->extensions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlAssociationClassObject::isAbstract() const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->isAbstract();
+    return qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->isAbstract();
 }
 
 bool QUmlAssociationClassObject::isActive() const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->isActive();
+    return qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->isActive();
 }
 
 const QList<QObject *> QUmlAssociationClassObject::nestedClassifiers() const
 {
     QList<QObject *> list;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->nestedClassifiers())
-        list.append(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->nestedClassifiers())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QList<QObject *> QUmlAssociationClassObject::ownedAttributes() const
 {
     QList<QObject *> list;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->ownedAttributes())
-        list.append(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->ownedAttributes())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QList<QObject *> QUmlAssociationClassObject::ownedOperations() const
 {
     QList<QObject *> list;
-    foreach (QUmlOperation *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->ownedOperations())
-        list.append(element->asQObject());
+    foreach (QUmlOperation *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->ownedOperations())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QSet<QObject *> QUmlAssociationClassObject::ownedReceptions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlReception *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->ownedReceptions())
-        set.insert(element->asQObject());
+    foreach (QUmlReception *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->ownedReceptions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAssociationClassObject::superClasses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClass *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->superClasses())
-        set.insert(element->asQObject());
+    foreach (QUmlClass *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->superClasses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -503,8 +506,8 @@ const QSet<QObject *> QUmlAssociationClassObject::superClasses() const
 const QSet<QObject *> QUmlAssociationClassObject::relatedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->relatedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->relatedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -513,37 +516,37 @@ const QSet<QObject *> QUmlAssociationClassObject::relatedElements() const
 const QList<QObject *> QUmlAssociationClassObject::endTypes() const
 {
     QList<QObject *> list;
-    foreach (QUmlType *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->endTypes())
-        list.append(element->asQObject());
+    foreach (QUmlType *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->endTypes())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlAssociationClassObject::isDerived() const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->isDerived();
+    return qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->isDerived();
 }
 
 const QList<QObject *> QUmlAssociationClassObject::memberEnds() const
 {
     QList<QObject *> list;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->memberEnds())
-        list.append(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->memberEnds())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QSet<QObject *> QUmlAssociationClassObject::navigableOwnedEnds() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->navigableOwnedEnds())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->navigableOwnedEnds())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlAssociationClassObject::ownedEnds() const
 {
     QList<QObject *> list;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->ownedEnds())
-        list.append(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->ownedEnds())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -552,14 +555,14 @@ const QList<QObject *> QUmlAssociationClassObject::ownedEnds() const
 QSet<QObject *> QUmlAssociationClassObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlAssociationClassObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -567,27 +570,27 @@ bool QUmlAssociationClassObject::mustBeOwned() const
 QList<QObject *> QUmlAssociationClassObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlAssociationClassObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlAssociationClassObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlAssociationClassObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->separator();
 }
 
 // OPERATIONS [Namespace]
@@ -596,44 +599,44 @@ QSet<QObject *> QUmlAssociationClassObject::excludeCollisions(QSet<QObject *> im
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlAssociationClassObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlAssociationClassObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlAssociationClassObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->membersAreDistinguishable();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlAssociationClassObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlAssociationClassObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [Type]
@@ -641,12 +644,12 @@ bool QUmlAssociationClassObject::isTemplateParameter() const
 
 bool QUmlAssociationClassObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlAssociationClassObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [TemplateableElement]
@@ -654,8 +657,8 @@ bool QUmlAssociationClassObject::isRedefinitionContextValid(QObject *redefined)
 QSet<QObject *> QUmlAssociationClassObject::parameterableElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterableElement *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->parameterableElements())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterableElement *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->parameterableElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -664,52 +667,52 @@ QSet<QObject *> QUmlAssociationClassObject::parameterableElements() const
 QSet<QObject *> QUmlAssociationClassObject::allFeatures() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->allFeatures())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->allFeatures())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlAssociationClassObject::allParents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->allParents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->allParents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlAssociationClassObject::conformsTo(QObject *other) const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->conformsTo(qmodelingobjectproperty_cast<QUmlClassifier *>(other));
+    return qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->conformsTo(qmodelingelementproperty_cast<QUmlClassifier *>(other));
 }
 
 bool QUmlAssociationClassObject::hasVisibilityOf(QObject *n) const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->hasVisibilityOf(qmodelingobjectproperty_cast<QUmlNamedElement *>(n));
+    return qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->hasVisibilityOf(qmodelingelementproperty_cast<QUmlNamedElement *>(n));
 }
 
 QSet<QObject *> QUmlAssociationClassObject::inheritableMembers(QObject *c) const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->inheritableMembers(qmodelingobjectproperty_cast<QUmlClassifier *>(c)))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->inheritableMembers(qmodelingelementproperty_cast<QUmlClassifier *>(c)))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlAssociationClassObject::isTemplate() const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->isTemplate();
+    return qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->isTemplate();
 }
 
 bool QUmlAssociationClassObject::maySpecializeType(QObject *c) const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->maySpecializeType(qmodelingobjectproperty_cast<QUmlClassifier *>(c));
+    return qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->maySpecializeType(qmodelingelementproperty_cast<QUmlClassifier *>(c));
 }
 
 QSet<QObject *> QUmlAssociationClassObject::parents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->parents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->parents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -719,10 +722,10 @@ QSet<QObject *> QUmlAssociationClassObject::inherit(QSet<QObject *> inhs) const
 {
     QSet<QUmlNamedElement *> inhsConverted;
     foreach (QObject *object, inhs)
-        inhsConverted.insert(qmodelingobjectproperty_cast<QUmlNamedElement *>(object));
+        inhsConverted.insert(qmodelingelementproperty_cast<QUmlNamedElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->inherit(inhsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->inherit(inhsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -730,533 +733,641 @@ QSet<QObject *> QUmlAssociationClassObject::inherit(QSet<QObject *> inhs) const
 
 void QUmlAssociationClassObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlAssociationClassObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlAssociationClassObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlAssociationClassObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlAssociationClassObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlAssociationClassObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlAssociationClassObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlAssociationClassObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->setName(name);
 }
 
 void QUmlAssociationClassObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlAssociationClassObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlAssociationClassObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlAssociationClassObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlAssociationClassObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlAssociationClassObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlAssociationClassObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlAssociationClassObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlAssociationClassObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlAssociationClassObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlAssociationClassObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlAssociationClassObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlAssociationClassObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlAssociationClassObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlAssociationClassObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlAssociationClassObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlAssociationClassObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->setVisibility(visibility);
 }
 
 void QUmlAssociationClassObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Type]
 
 void QUmlAssociationClassObject::setPackage(QObject *package)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->setPackage(qmodelingobjectproperty_cast<QUmlPackage *>(package));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->setPackage(qmodelingelementproperty_cast<QUmlPackage *>(package));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlAssociationClassObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlAssociationClassObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlAssociationClassObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlAssociationClassObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlAssociationClassObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlAssociationClassObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateableElement]
 
 void QUmlAssociationClassObject::addTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 void QUmlAssociationClassObject::removeTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removeTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removeTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Classifier]
 
 void QUmlAssociationClassObject::addAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlAssociationClassObject::removeAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removeAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removeAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlAssociationClassObject::addCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlAssociationClassObject::removeCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removeCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removeCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlAssociationClassObject::addFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlAssociationClassObject::removeFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removeFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removeFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlAssociationClassObject::addGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlAssociationClassObject::removeGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removeGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removeGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlAssociationClassObject::addInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlAssociationClassObject::removeInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removeInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removeInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlAssociationClassObject::setFinalSpecialization(bool isFinalSpecialization)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->setFinalSpecialization(isFinalSpecialization);
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->setFinalSpecialization(isFinalSpecialization);
 }
 
 void QUmlAssociationClassObject::unsetFinalSpecialization()
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("finalSpecialization"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
 void QUmlAssociationClassObject::setOwnedTemplateSignature(QObject *ownedTemplateSignature)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->setOwnedTemplateSignature(qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->setOwnedTemplateSignature(qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
 }
 
 void QUmlAssociationClassObject::addOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlAssociationClassObject::removeOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removeOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removeOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlAssociationClassObject::addPowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addPowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addPowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlAssociationClassObject::removePowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removePowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removePowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlAssociationClassObject::addRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlAssociationClassObject::removeRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removeRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removeRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlAssociationClassObject::setRepresentation(QObject *representation)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->setRepresentation(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(representation));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->setRepresentation(qmodelingelementproperty_cast<QUmlCollaborationUse *>(representation));
 }
 
 void QUmlAssociationClassObject::addSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlAssociationClassObject::removeSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removeSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removeSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlAssociationClassObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
 }
 
 void QUmlAssociationClassObject::addUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 void QUmlAssociationClassObject::removeUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removeUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removeUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [StructuredClassifier]
 
 void QUmlAssociationClassObject::addOwnedConnector(QObject *ownedConnector)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addOwnedConnector(qmodelingobjectproperty_cast<QUmlConnector *>(ownedConnector));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addOwnedConnector(qmodelingelementproperty_cast<QUmlConnector *>(ownedConnector));
 }
 
 void QUmlAssociationClassObject::removeOwnedConnector(QObject *ownedConnector)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removeOwnedConnector(qmodelingobjectproperty_cast<QUmlConnector *>(ownedConnector));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removeOwnedConnector(qmodelingelementproperty_cast<QUmlConnector *>(ownedConnector));
 }
 
 void QUmlAssociationClassObject::addPart(QObject *part)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addPart(qmodelingobjectproperty_cast<QUmlProperty *>(part));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addPart(qmodelingelementproperty_cast<QUmlProperty *>(part));
 }
 
 void QUmlAssociationClassObject::removePart(QObject *part)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removePart(qmodelingobjectproperty_cast<QUmlProperty *>(part));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removePart(qmodelingelementproperty_cast<QUmlProperty *>(part));
 }
 
 void QUmlAssociationClassObject::addRole(QObject *role)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addRole(qmodelingobjectproperty_cast<QUmlConnectableElement *>(role));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addRole(qmodelingelementproperty_cast<QUmlConnectableElement *>(role));
 }
 
 void QUmlAssociationClassObject::removeRole(QObject *role)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removeRole(qmodelingobjectproperty_cast<QUmlConnectableElement *>(role));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removeRole(qmodelingelementproperty_cast<QUmlConnectableElement *>(role));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [EncapsulatedClassifier]
 
 void QUmlAssociationClassObject::addOwnedPort(QObject *ownedPort)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addOwnedPort(qmodelingobjectproperty_cast<QUmlPort *>(ownedPort));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addOwnedPort(qmodelingelementproperty_cast<QUmlPort *>(ownedPort));
 }
 
 void QUmlAssociationClassObject::removeOwnedPort(QObject *ownedPort)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removeOwnedPort(qmodelingobjectproperty_cast<QUmlPort *>(ownedPort));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removeOwnedPort(qmodelingelementproperty_cast<QUmlPort *>(ownedPort));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [BehavioredClassifier]
 
 void QUmlAssociationClassObject::setClassifierBehavior(QObject *classifierBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->setClassifierBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(classifierBehavior));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->setClassifierBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(classifierBehavior));
 }
 
 void QUmlAssociationClassObject::addInterfaceRealization(QObject *interfaceRealization)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addInterfaceRealization(qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addInterfaceRealization(qmodelingelementproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
 }
 
 void QUmlAssociationClassObject::removeInterfaceRealization(QObject *interfaceRealization)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removeInterfaceRealization(qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removeInterfaceRealization(qmodelingelementproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
 }
 
 void QUmlAssociationClassObject::addOwnedBehavior(QObject *ownedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addOwnedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(ownedBehavior));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addOwnedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(ownedBehavior));
 }
 
 void QUmlAssociationClassObject::removeOwnedBehavior(QObject *ownedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removeOwnedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(ownedBehavior));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removeOwnedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(ownedBehavior));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Class]
 
 void QUmlAssociationClassObject::addExtension(QObject *extension)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addExtension(qmodelingobjectproperty_cast<QUmlExtension *>(extension));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addExtension(qmodelingelementproperty_cast<QUmlExtension *>(extension));
 }
 
 void QUmlAssociationClassObject::removeExtension(QObject *extension)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removeExtension(qmodelingobjectproperty_cast<QUmlExtension *>(extension));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removeExtension(qmodelingelementproperty_cast<QUmlExtension *>(extension));
 }
 
 void QUmlAssociationClassObject::setAbstract(bool isAbstract)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->setAbstract(isAbstract);
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->setAbstract(isAbstract);
 }
 
 void QUmlAssociationClassObject::unsetAbstract()
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("abstract"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
 void QUmlAssociationClassObject::setActive(bool isActive)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->setActive(isActive);
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->setActive(isActive);
 }
 
 void QUmlAssociationClassObject::unsetActive()
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("active"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("active"));
 }
 
 void QUmlAssociationClassObject::addNestedClassifier(QObject *nestedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addNestedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(nestedClassifier));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addNestedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(nestedClassifier));
 }
 
 void QUmlAssociationClassObject::removeNestedClassifier(QObject *nestedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removeNestedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(nestedClassifier));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removeNestedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(nestedClassifier));
 }
 
 void QUmlAssociationClassObject::addOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlAssociationClassObject::removeOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removeOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removeOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlAssociationClassObject::addOwnedOperation(QObject *ownedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addOwnedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(ownedOperation));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addOwnedOperation(qmodelingelementproperty_cast<QUmlOperation *>(ownedOperation));
 }
 
 void QUmlAssociationClassObject::removeOwnedOperation(QObject *ownedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removeOwnedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(ownedOperation));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removeOwnedOperation(qmodelingelementproperty_cast<QUmlOperation *>(ownedOperation));
 }
 
 void QUmlAssociationClassObject::addOwnedReception(QObject *ownedReception)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addOwnedReception(qmodelingobjectproperty_cast<QUmlReception *>(ownedReception));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addOwnedReception(qmodelingelementproperty_cast<QUmlReception *>(ownedReception));
 }
 
 void QUmlAssociationClassObject::removeOwnedReception(QObject *ownedReception)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removeOwnedReception(qmodelingobjectproperty_cast<QUmlReception *>(ownedReception));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removeOwnedReception(qmodelingelementproperty_cast<QUmlReception *>(ownedReception));
 }
 
 void QUmlAssociationClassObject::addSuperClass(QObject *superClass)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addSuperClass(qmodelingobjectproperty_cast<QUmlClass *>(superClass));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addSuperClass(qmodelingelementproperty_cast<QUmlClass *>(superClass));
 }
 
 void QUmlAssociationClassObject::removeSuperClass(QObject *superClass)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removeSuperClass(qmodelingobjectproperty_cast<QUmlClass *>(superClass));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removeSuperClass(qmodelingelementproperty_cast<QUmlClass *>(superClass));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Relationship]
 
 void QUmlAssociationClassObject::addRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 void QUmlAssociationClassObject::removeRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removeRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removeRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Association]
 
 void QUmlAssociationClassObject::addEndType(QObject *endType)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addEndType(qmodelingobjectproperty_cast<QUmlType *>(endType));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addEndType(qmodelingelementproperty_cast<QUmlType *>(endType));
 }
 
 void QUmlAssociationClassObject::removeEndType(QObject *endType)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removeEndType(qmodelingobjectproperty_cast<QUmlType *>(endType));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removeEndType(qmodelingelementproperty_cast<QUmlType *>(endType));
 }
 
 void QUmlAssociationClassObject::setDerived(bool isDerived)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->setDerived(isDerived);
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->setDerived(isDerived);
 }
 
 void QUmlAssociationClassObject::unsetDerived()
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("derived"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("derived"));
 }
 
 void QUmlAssociationClassObject::addMemberEnd(QObject *memberEnd)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addMemberEnd(qmodelingobjectproperty_cast<QUmlProperty *>(memberEnd));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addMemberEnd(qmodelingelementproperty_cast<QUmlProperty *>(memberEnd));
 }
 
 void QUmlAssociationClassObject::removeMemberEnd(QObject *memberEnd)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removeMemberEnd(qmodelingobjectproperty_cast<QUmlProperty *>(memberEnd));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removeMemberEnd(qmodelingelementproperty_cast<QUmlProperty *>(memberEnd));
 }
 
 void QUmlAssociationClassObject::addNavigableOwnedEnd(QObject *navigableOwnedEnd)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addNavigableOwnedEnd(qmodelingobjectproperty_cast<QUmlProperty *>(navigableOwnedEnd));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addNavigableOwnedEnd(qmodelingelementproperty_cast<QUmlProperty *>(navigableOwnedEnd));
 }
 
 void QUmlAssociationClassObject::removeNavigableOwnedEnd(QObject *navigableOwnedEnd)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removeNavigableOwnedEnd(qmodelingobjectproperty_cast<QUmlProperty *>(navigableOwnedEnd));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removeNavigableOwnedEnd(qmodelingelementproperty_cast<QUmlProperty *>(navigableOwnedEnd));
 }
 
 void QUmlAssociationClassObject::addOwnedEnd(QObject *ownedEnd)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->addOwnedEnd(qmodelingobjectproperty_cast<QUmlProperty *>(ownedEnd));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->addOwnedEnd(qmodelingelementproperty_cast<QUmlProperty *>(ownedEnd));
 }
 
 void QUmlAssociationClassObject::removeOwnedEnd(QObject *ownedEnd)
 {
-    qmodelingobjectproperty_cast<QUmlAssociationClass *>(this)->removeOwnedEnd(qmodelingobjectproperty_cast<QUmlProperty *>(ownedEnd));
+    qmodelingelementproperty_cast<QUmlAssociationClass *>(this)->removeOwnedEnd(qmodelingelementproperty_cast<QUmlProperty *>(ownedEnd));
+}
+
+
+void QUmlAssociationClassObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlType");
+    d->groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
+
+    d->propertyGroups << QStringLiteral("QUmlStructuredClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedConnectors"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parts"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("roles"))));
+
+    d->propertyGroups << QStringLiteral("QUmlEncapsulatedClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlEncapsulatedClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedPorts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlBehavioredClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifierBehavior"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interfaceRealizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedBehaviors"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClass");
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extensions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isActive"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedReceptions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superClasses"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAssociation");
+    d->groupProperties.insert(QStringLiteral("QUmlAssociation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("endTypes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAssociation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isDerived"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAssociation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("memberEnds"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAssociation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("navigableOwnedEnds"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAssociation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedEnds"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAssociationClass");
+}
+
+void QUmlAssociationClassObject::setPropertyData()
+{
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlassociationclassobject_p.h b/src/uml/qobjects/qumlassociationclassobject_p.h
index eecbb1ef..8971f957 100644
--- a/src/uml/qobjects/qumlassociationclassobject_p.h
+++ b/src/uml/qobjects/qumlassociationclassobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlAssociationClass;
-class Q_UML_EXPORT QUmlAssociationClassObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlAssociationClassObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlAssociationClassObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -145,7 +148,7 @@ class Q_UML_EXPORT QUmlAssociationClassObject : public QObject
     Q_PROPERTY(QList<QObject *> ownedEnds READ ownedEnds)
 
 public:
-    Q_INVOKABLE explicit QUmlAssociationClassObject(QUmlAssociationClass *qModelingObject);
+    Q_INVOKABLE explicit QUmlAssociationClassObject(QUmlAssociationClass *qModelingElement);
     virtual ~QUmlAssociationClassObject();
 
     // Owned attributes [Element]
@@ -408,6 +411,10 @@ public Q_SLOTS:
     void removeNavigableOwnedEnd(QObject *navigableOwnedEnd);
     void addOwnedEnd(QObject *ownedEnd);
     void removeOwnedEnd(QObject *ownedEnd);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlassociationobject.cpp b/src/uml/qobjects/qumlassociationobject.cpp
index a230a9bc..0fdd454d 100644
--- a/src/uml/qobjects/qumlassociationobject.cpp
+++ b/src/uml/qobjects/qumlassociationobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlassociationobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlAssociation>
 #include <QtUml/QUmlClassifier>
@@ -71,16 +72,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlAssociationObject::QUmlAssociationObject(QUmlAssociation *qModelingObject)
+QUmlAssociationObject::QUmlAssociationObject(QUmlAssociation *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlAssociationObject::~QUmlAssociationObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlAssociation *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlAssociation *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -89,25 +92,25 @@ QUmlAssociationObject::~QUmlAssociationObject()
 const QSet<QObject *> QUmlAssociationObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAssociationObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlAssociationObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAssociation *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlAssociation *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAssociation *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAssociation *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -115,35 +118,35 @@ QObject *QUmlAssociationObject::owner() const
 const QSet<QObject *> QUmlAssociationObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlAssociationObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociation *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlAssociation *>(this)->name();
 }
 
 QObject *QUmlAssociationObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAssociation *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlAssociation *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAssociation *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAssociation *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlAssociationObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAssociation *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlAssociation *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAssociation *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAssociation *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlAssociationObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociation *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlAssociation *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [Namespace]
@@ -151,48 +154,48 @@ QString QUmlAssociationObject::qualifiedName() const
 const QSet<QObject *> QUmlAssociationObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAssociationObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAssociationObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAssociationObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAssociationObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAssociationObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -200,49 +203,49 @@ const QSet<QObject *> QUmlAssociationObject::packageImports() const
 
 QObject *QUmlAssociationObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAssociation *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlAssociation *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAssociation *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAssociation *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlAssociationObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociation *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlAssociation *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Type]
 
 QObject *QUmlAssociationObject::package() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAssociation *>(this)->package())
+    if (!qmodelingelementproperty_cast<QUmlAssociation *>(this)->package())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAssociation *>(this)->package()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAssociation *>(this)->package()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlAssociationObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociation *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlAssociation *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlAssociationObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAssociationObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -251,8 +254,8 @@ const QSet<QObject *> QUmlAssociationObject::redefinitionContexts() const
 const QSet<QObject *> QUmlAssociationObject::templateBindings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTemplateBinding *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->templateBindings())
-        set.insert(element->asQObject());
+    foreach (QUmlTemplateBinding *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->templateBindings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -261,122 +264,122 @@ const QSet<QObject *> QUmlAssociationObject::templateBindings() const
 const QSet<QObject *> QUmlAssociationObject::attributes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->attributes())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->attributes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAssociationObject::collaborationUses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlCollaborationUse *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->collaborationUses())
-        set.insert(element->asQObject());
+    foreach (QUmlCollaborationUse *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->collaborationUses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAssociationObject::features() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->features())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->features())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAssociationObject::generals() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->generals())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->generals())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAssociationObject::generalizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralization *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->generalizations())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralization *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->generalizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAssociationObject::inheritedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->inheritedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->inheritedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlAssociationObject::isAbstract() const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociation *>(this)->isAbstract();
+    return qmodelingelementproperty_cast<QUmlAssociation *>(this)->isAbstract();
 }
 
 bool QUmlAssociationObject::isFinalSpecialization() const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociation *>(this)->isFinalSpecialization();
+    return qmodelingelementproperty_cast<QUmlAssociation *>(this)->isFinalSpecialization();
 }
 
 QObject *QUmlAssociationObject::ownedTemplateSignature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAssociation *>(this)->ownedTemplateSignature())
+    if (!qmodelingelementproperty_cast<QUmlAssociation *>(this)->ownedTemplateSignature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAssociation *>(this)->ownedTemplateSignature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAssociation *>(this)->ownedTemplateSignature()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlAssociationObject::ownedUseCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->ownedUseCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->ownedUseCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAssociationObject::powertypeExtents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralizationSet *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->powertypeExtents())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralizationSet *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->powertypeExtents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlAssociationObject::redefinedClassifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->redefinedClassifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->redefinedClassifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlAssociationObject::representation() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAssociation *>(this)->representation())
+    if (!qmodelingelementproperty_cast<QUmlAssociation *>(this)->representation())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAssociation *>(this)->representation()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAssociation *>(this)->representation()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlAssociationObject::substitutions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlSubstitution *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->substitutions())
-        set.insert(element->asQObject());
+    foreach (QUmlSubstitution *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->substitutions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlAssociationObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlAssociation *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlAssociation *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlAssociation *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlAssociation *>(this)->templateParameter()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlAssociationObject::useCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->useCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->useCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -385,8 +388,8 @@ const QSet<QObject *> QUmlAssociationObject::useCases() const
 const QSet<QObject *> QUmlAssociationObject::relatedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->relatedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->relatedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -395,37 +398,37 @@ const QSet<QObject *> QUmlAssociationObject::relatedElements() const
 const QList<QObject *> QUmlAssociationObject::endTypes() const
 {
     QList<QObject *> list;
-    foreach (QUmlType *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->endTypes())
-        list.append(element->asQObject());
+    foreach (QUmlType *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->endTypes())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlAssociationObject::isDerived() const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociation *>(this)->isDerived();
+    return qmodelingelementproperty_cast<QUmlAssociation *>(this)->isDerived();
 }
 
 const QList<QObject *> QUmlAssociationObject::memberEnds() const
 {
     QList<QObject *> list;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->memberEnds())
-        list.append(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->memberEnds())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QSet<QObject *> QUmlAssociationObject::navigableOwnedEnds() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->navigableOwnedEnds())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->navigableOwnedEnds())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlAssociationObject::ownedEnds() const
 {
     QList<QObject *> list;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->ownedEnds())
-        list.append(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->ownedEnds())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -434,14 +437,14 @@ const QList<QObject *> QUmlAssociationObject::ownedEnds() const
 QSet<QObject *> QUmlAssociationObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlAssociationObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociation *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlAssociation *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -449,27 +452,27 @@ bool QUmlAssociationObject::mustBeOwned() const
 QList<QObject *> QUmlAssociationObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlAssociationObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlAssociationObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociation *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlAssociation *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlAssociationObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociation *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlAssociation *>(this)->separator();
 }
 
 // OPERATIONS [Namespace]
@@ -478,44 +481,44 @@ QSet<QObject *> QUmlAssociationObject::excludeCollisions(QSet<QObject *> imps) c
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlAssociationObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociation *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlAssociation *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlAssociationObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlAssociationObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociation *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlAssociation *>(this)->membersAreDistinguishable();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlAssociationObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociation *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlAssociation *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlAssociationObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociation *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlAssociation *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [Type]
@@ -523,12 +526,12 @@ bool QUmlAssociationObject::isTemplateParameter() const
 
 bool QUmlAssociationObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociation *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlAssociation *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlAssociationObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociation *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlAssociation *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [TemplateableElement]
@@ -536,8 +539,8 @@ bool QUmlAssociationObject::isRedefinitionContextValid(QObject *redefined) const
 QSet<QObject *> QUmlAssociationObject::parameterableElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterableElement *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->parameterableElements())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterableElement *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->parameterableElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -546,63 +549,63 @@ QSet<QObject *> QUmlAssociationObject::parameterableElements() const
 QSet<QObject *> QUmlAssociationObject::allFeatures() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->allFeatures())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->allFeatures())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlAssociationObject::allParents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->allParents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->allParents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlAssociationObject::conformsTo(QObject *other) const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociation *>(this)->conformsTo(qmodelingobjectproperty_cast<QUmlClassifier *>(other));
+    return qmodelingelementproperty_cast<QUmlAssociation *>(this)->conformsTo(qmodelingelementproperty_cast<QUmlClassifier *>(other));
 }
 
 bool QUmlAssociationObject::hasVisibilityOf(QObject *n) const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociation *>(this)->hasVisibilityOf(qmodelingobjectproperty_cast<QUmlNamedElement *>(n));
+    return qmodelingelementproperty_cast<QUmlAssociation *>(this)->hasVisibilityOf(qmodelingelementproperty_cast<QUmlNamedElement *>(n));
 }
 
 QSet<QObject *> QUmlAssociationObject::inherit(QSet<QObject *> inhs) const
 {
     QSet<QUmlNamedElement *> inhsConverted;
     foreach (QObject *object, inhs)
-        inhsConverted.insert(qmodelingobjectproperty_cast<QUmlNamedElement *>(object));
+        inhsConverted.insert(qmodelingelementproperty_cast<QUmlNamedElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->inherit(inhsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->inherit(inhsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlAssociationObject::inheritableMembers(QObject *c) const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->inheritableMembers(qmodelingobjectproperty_cast<QUmlClassifier *>(c)))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->inheritableMembers(qmodelingelementproperty_cast<QUmlClassifier *>(c)))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlAssociationObject::isTemplate() const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociation *>(this)->isTemplate();
+    return qmodelingelementproperty_cast<QUmlAssociation *>(this)->isTemplate();
 }
 
 bool QUmlAssociationObject::maySpecializeType(QObject *c) const
 {
-    return qmodelingobjectproperty_cast<QUmlAssociation *>(this)->maySpecializeType(qmodelingobjectproperty_cast<QUmlClassifier *>(c));
+    return qmodelingelementproperty_cast<QUmlAssociation *>(this)->maySpecializeType(qmodelingelementproperty_cast<QUmlClassifier *>(c));
 }
 
 QSet<QObject *> QUmlAssociationObject::parents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlAssociation *>(this)->parents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlAssociation *>(this)->parents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -610,400 +613,529 @@ QSet<QObject *> QUmlAssociationObject::parents() const
 
 void QUmlAssociationObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlAssociationObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlAssociationObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlAssociationObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlAssociationObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlAssociationObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlAssociationObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlAssociationObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->setName(name);
 }
 
 void QUmlAssociationObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlAssociationObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlAssociationObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlAssociationObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlAssociationObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlAssociationObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlAssociationObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlAssociationObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlAssociationObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlAssociationObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlAssociationObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlAssociationObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlAssociationObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlAssociationObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlAssociationObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlAssociationObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlAssociationObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->setVisibility(visibility);
 }
 
 void QUmlAssociationObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Type]
 
 void QUmlAssociationObject::setPackage(QObject *package)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->setPackage(qmodelingobjectproperty_cast<QUmlPackage *>(package));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->setPackage(qmodelingelementproperty_cast<QUmlPackage *>(package));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlAssociationObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlAssociationObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlAssociationObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlAssociationObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlAssociationObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlAssociationObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateableElement]
 
 void QUmlAssociationObject::addTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->addTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->addTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 void QUmlAssociationObject::removeTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->removeTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->removeTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Classifier]
 
 void QUmlAssociationObject::addAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->addAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->addAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlAssociationObject::removeAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->removeAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->removeAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlAssociationObject::addCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->addCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->addCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlAssociationObject::removeCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->removeCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->removeCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlAssociationObject::addFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->addFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->addFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlAssociationObject::removeFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->removeFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->removeFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlAssociationObject::addGeneral(QObject *general)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->addGeneral(qmodelingobjectproperty_cast<QUmlClassifier *>(general));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->addGeneral(qmodelingelementproperty_cast<QUmlClassifier *>(general));
 }
 
 void QUmlAssociationObject::removeGeneral(QObject *general)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->removeGeneral(qmodelingobjectproperty_cast<QUmlClassifier *>(general));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->removeGeneral(qmodelingelementproperty_cast<QUmlClassifier *>(general));
 }
 
 void QUmlAssociationObject::addGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->addGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->addGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlAssociationObject::removeGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->removeGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->removeGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlAssociationObject::addInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->addInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->addInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlAssociationObject::removeInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->removeInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->removeInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlAssociationObject::setAbstract(bool isAbstract)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->setAbstract(isAbstract);
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->setAbstract(isAbstract);
 }
 
 void QUmlAssociationObject::unsetAbstract()
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("abstract"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
 void QUmlAssociationObject::setFinalSpecialization(bool isFinalSpecialization)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->setFinalSpecialization(isFinalSpecialization);
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->setFinalSpecialization(isFinalSpecialization);
 }
 
 void QUmlAssociationObject::unsetFinalSpecialization()
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("finalSpecialization"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
 void QUmlAssociationObject::setOwnedTemplateSignature(QObject *ownedTemplateSignature)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->setOwnedTemplateSignature(qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->setOwnedTemplateSignature(qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
 }
 
 void QUmlAssociationObject::addOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->addOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->addOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlAssociationObject::removeOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->removeOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->removeOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlAssociationObject::addPowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->addPowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->addPowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlAssociationObject::removePowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->removePowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->removePowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlAssociationObject::addRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->addRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->addRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlAssociationObject::removeRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->removeRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->removeRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlAssociationObject::setRepresentation(QObject *representation)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->setRepresentation(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(representation));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->setRepresentation(qmodelingelementproperty_cast<QUmlCollaborationUse *>(representation));
 }
 
 void QUmlAssociationObject::addSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->addSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->addSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlAssociationObject::removeSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->removeSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->removeSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlAssociationObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
 }
 
 void QUmlAssociationObject::addUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->addUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->addUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 void QUmlAssociationObject::removeUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->removeUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->removeUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Relationship]
 
 void QUmlAssociationObject::addRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->addRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->addRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 void QUmlAssociationObject::removeRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->removeRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->removeRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Association]
 
 void QUmlAssociationObject::addEndType(QObject *endType)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->addEndType(qmodelingobjectproperty_cast<QUmlType *>(endType));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->addEndType(qmodelingelementproperty_cast<QUmlType *>(endType));
 }
 
 void QUmlAssociationObject::removeEndType(QObject *endType)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->removeEndType(qmodelingobjectproperty_cast<QUmlType *>(endType));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->removeEndType(qmodelingelementproperty_cast<QUmlType *>(endType));
 }
 
 void QUmlAssociationObject::setDerived(bool isDerived)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->setDerived(isDerived);
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->setDerived(isDerived);
 }
 
 void QUmlAssociationObject::unsetDerived()
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("derived"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("derived"));
 }
 
 void QUmlAssociationObject::addMemberEnd(QObject *memberEnd)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->addMemberEnd(qmodelingobjectproperty_cast<QUmlProperty *>(memberEnd));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->addMemberEnd(qmodelingelementproperty_cast<QUmlProperty *>(memberEnd));
 }
 
 void QUmlAssociationObject::removeMemberEnd(QObject *memberEnd)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->removeMemberEnd(qmodelingobjectproperty_cast<QUmlProperty *>(memberEnd));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->removeMemberEnd(qmodelingelementproperty_cast<QUmlProperty *>(memberEnd));
 }
 
 void QUmlAssociationObject::addNavigableOwnedEnd(QObject *navigableOwnedEnd)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->addNavigableOwnedEnd(qmodelingobjectproperty_cast<QUmlProperty *>(navigableOwnedEnd));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->addNavigableOwnedEnd(qmodelingelementproperty_cast<QUmlProperty *>(navigableOwnedEnd));
 }
 
 void QUmlAssociationObject::removeNavigableOwnedEnd(QObject *navigableOwnedEnd)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->removeNavigableOwnedEnd(qmodelingobjectproperty_cast<QUmlProperty *>(navigableOwnedEnd));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->removeNavigableOwnedEnd(qmodelingelementproperty_cast<QUmlProperty *>(navigableOwnedEnd));
 }
 
 void QUmlAssociationObject::addOwnedEnd(QObject *ownedEnd)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->addOwnedEnd(qmodelingobjectproperty_cast<QUmlProperty *>(ownedEnd));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->addOwnedEnd(qmodelingelementproperty_cast<QUmlProperty *>(ownedEnd));
 }
 
 void QUmlAssociationObject::removeOwnedEnd(QObject *ownedEnd)
 {
-    qmodelingobjectproperty_cast<QUmlAssociation *>(this)->removeOwnedEnd(qmodelingobjectproperty_cast<QUmlProperty *>(ownedEnd));
+    qmodelingelementproperty_cast<QUmlAssociation *>(this)->removeOwnedEnd(qmodelingelementproperty_cast<QUmlProperty *>(ownedEnd));
+}
+
+
+void QUmlAssociationObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlType");
+    d->groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generals"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAssociation");
+    d->groupProperties.insert(QStringLiteral("QUmlAssociation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("endTypes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAssociation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isDerived"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAssociation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("memberEnds"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAssociation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("navigableOwnedEnds"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAssociation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedEnds"))));
+}
+
+void QUmlAssociationObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, endTypes, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, endTypes, PropertyClassRole, QStringLiteral("QUmlAssociation"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, endTypes, IsDerivedRole, true);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, endTypes, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, endTypes, DocumentationRole, QStringLiteral("References the classifiers that are used as types of the ends of the association."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, endTypes, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, endTypes, SubsettedPropertiesRole, QStringLiteral("Relationship-relatedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, endTypes, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, isDerived, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, isDerived, PropertyClassRole, QStringLiteral("QUmlAssociation"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, isDerived, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, isDerived, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, isDerived, DocumentationRole, QStringLiteral("Specifies whether the association is derived from other model elements such as other associations or constraints."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, isDerived, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, isDerived, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, isDerived, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, memberEnds, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, memberEnds, PropertyClassRole, QStringLiteral("QUmlAssociation"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, memberEnds, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, memberEnds, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, memberEnds, DocumentationRole, QStringLiteral("Each end represents participation of instances of the classifier connected to the end in links of the association."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, memberEnds, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, memberEnds, SubsettedPropertiesRole, QStringLiteral("Namespace-member"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, memberEnds, OppositeEndRole, QStringLiteral("Property-association"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, navigableOwnedEnds, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, navigableOwnedEnds, PropertyClassRole, QStringLiteral("QUmlAssociation"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, navigableOwnedEnds, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, navigableOwnedEnds, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, navigableOwnedEnds, DocumentationRole, QStringLiteral("The navigable ends that are owned by the association itself."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, navigableOwnedEnds, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, navigableOwnedEnds, SubsettedPropertiesRole, QStringLiteral("Association-ownedEnd"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, navigableOwnedEnds, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, ownedEnds, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, ownedEnds, PropertyClassRole, QStringLiteral("QUmlAssociation"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, ownedEnds, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, ownedEnds, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, ownedEnds, DocumentationRole, QStringLiteral("The ends that are owned by the association itself."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, ownedEnds, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, ownedEnds, SubsettedPropertiesRole, QStringLiteral("Association-memberEnd Classifier-feature A_redefinitionContext_redefinableElement-redefinableElement Namespace-ownedMember"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlAssociation, ownedEnds, OppositeEndRole, QStringLiteral("Property-owningAssociation"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlassociationobject_p.h b/src/uml/qobjects/qumlassociationobject_p.h
index 931fc9a0..ee50ec78 100644
--- a/src/uml/qobjects/qumlassociationobject_p.h
+++ b/src/uml/qobjects/qumlassociationobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlAssociation;
-class Q_UML_EXPORT QUmlAssociationObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlAssociationObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlAssociationObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -124,7 +127,7 @@ class Q_UML_EXPORT QUmlAssociationObject : public QObject
     Q_PROPERTY(QList<QObject *> ownedEnds READ ownedEnds)
 
 public:
-    Q_INVOKABLE explicit QUmlAssociationObject(QUmlAssociation *qModelingObject);
+    Q_INVOKABLE explicit QUmlAssociationObject(QUmlAssociation *qModelingElement);
     virtual ~QUmlAssociationObject();
 
     // Owned attributes [Element]
@@ -331,6 +334,10 @@ public Q_SLOTS:
     void removeNavigableOwnedEnd(QObject *navigableOwnedEnd);
     void addOwnedEnd(QObject *ownedEnd);
     void removeOwnedEnd(QObject *ownedEnd);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlbehaviorexecutionspecificationobject.cpp b/src/uml/qobjects/qumlbehaviorexecutionspecificationobject.cpp
index 6a07937d..cb698827 100644
--- a/src/uml/qobjects/qumlbehaviorexecutionspecificationobject.cpp
+++ b/src/uml/qobjects/qumlbehaviorexecutionspecificationobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlbehaviorexecutionspecificationobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlBehaviorExecutionSpecification>
 #include <QtUml/QUmlBehavior>
@@ -57,16 +58,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlBehaviorExecutionSpecificationObject::QUmlBehaviorExecutionSpecificationObject(QUmlBehaviorExecutionSpecification *qModelingObject)
+QUmlBehaviorExecutionSpecificationObject::QUmlBehaviorExecutionSpecificationObject(QUmlBehaviorExecutionSpecification *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlBehaviorExecutionSpecificationObject::~QUmlBehaviorExecutionSpecificationObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -75,25 +78,25 @@ QUmlBehaviorExecutionSpecificationObject::~QUmlBehaviorExecutionSpecificationObj
 const QSet<QObject *> QUmlBehaviorExecutionSpecificationObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlBehaviorExecutionSpecificationObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlBehaviorExecutionSpecificationObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -101,40 +104,40 @@ QObject *QUmlBehaviorExecutionSpecificationObject::owner() const
 const QSet<QObject *> QUmlBehaviorExecutionSpecificationObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlBehaviorExecutionSpecificationObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->name();
 }
 
 QObject *QUmlBehaviorExecutionSpecificationObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlBehaviorExecutionSpecificationObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlBehaviorExecutionSpecificationObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlBehaviorExecutionSpecificationObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [InteractionFragment]
@@ -142,32 +145,32 @@ QtUml::VisibilityKind QUmlBehaviorExecutionSpecificationObject::visibility() con
 const QSet<QObject *> QUmlBehaviorExecutionSpecificationObject::covered() const
 {
     QSet<QObject *> set;
-    foreach (QUmlLifeline *element, qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->covered())
-        set.insert(element->asQObject());
+    foreach (QUmlLifeline *element, qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->covered())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlBehaviorExecutionSpecificationObject::enclosingInteraction() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->enclosingInteraction())
+    if (!qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->enclosingInteraction())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->enclosingInteraction()->asQObject();
+        return qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->enclosingInteraction()->asQModelingObject();
 }
 
 QObject *QUmlBehaviorExecutionSpecificationObject::enclosingOperand() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->enclosingOperand())
+    if (!qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->enclosingOperand())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->enclosingOperand()->asQObject();
+        return qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->enclosingOperand()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlBehaviorExecutionSpecificationObject::generalOrderings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralOrdering *element, qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->generalOrderings())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralOrdering *element, qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->generalOrderings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -175,28 +178,28 @@ const QSet<QObject *> QUmlBehaviorExecutionSpecificationObject::generalOrderings
 
 QObject *QUmlBehaviorExecutionSpecificationObject::finish() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->finish())
+    if (!qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->finish())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->finish()->asQObject();
+        return qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->finish()->asQModelingObject();
 }
 
 QObject *QUmlBehaviorExecutionSpecificationObject::start() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->start())
+    if (!qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->start())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->start()->asQObject();
+        return qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->start()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [BehaviorExecutionSpecification]
 
 QObject *QUmlBehaviorExecutionSpecificationObject::behavior() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->behavior())
+    if (!qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->behavior())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->behavior()->asQObject();
+        return qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->behavior()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -204,14 +207,14 @@ QObject *QUmlBehaviorExecutionSpecificationObject::behavior() const
 QSet<QObject *> QUmlBehaviorExecutionSpecificationObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlBehaviorExecutionSpecificationObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -219,142 +222,191 @@ bool QUmlBehaviorExecutionSpecificationObject::mustBeOwned() const
 QList<QObject *> QUmlBehaviorExecutionSpecificationObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlBehaviorExecutionSpecificationObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlBehaviorExecutionSpecificationObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlBehaviorExecutionSpecificationObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlBehaviorExecutionSpecificationObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlBehaviorExecutionSpecificationObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlBehaviorExecutionSpecificationObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlBehaviorExecutionSpecificationObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlBehaviorExecutionSpecificationObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlBehaviorExecutionSpecificationObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlBehaviorExecutionSpecificationObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlBehaviorExecutionSpecificationObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->setName(name);
 }
 
 void QUmlBehaviorExecutionSpecificationObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlBehaviorExecutionSpecificationObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlBehaviorExecutionSpecificationObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlBehaviorExecutionSpecificationObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [InteractionFragment]
 
 void QUmlBehaviorExecutionSpecificationObject::addCovered(QObject *covered)
 {
-    qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->addCovered(qmodelingobjectproperty_cast<QUmlLifeline *>(covered));
+    qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->addCovered(qmodelingelementproperty_cast<QUmlLifeline *>(covered));
 }
 
 void QUmlBehaviorExecutionSpecificationObject::removeCovered(QObject *covered)
 {
-    qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->removeCovered(qmodelingobjectproperty_cast<QUmlLifeline *>(covered));
+    qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->removeCovered(qmodelingelementproperty_cast<QUmlLifeline *>(covered));
 }
 
 void QUmlBehaviorExecutionSpecificationObject::setEnclosingInteraction(QObject *enclosingInteraction)
 {
-    qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->setEnclosingInteraction(qmodelingobjectproperty_cast<QUmlInteraction *>(enclosingInteraction));
+    qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->setEnclosingInteraction(qmodelingelementproperty_cast<QUmlInteraction *>(enclosingInteraction));
 }
 
 void QUmlBehaviorExecutionSpecificationObject::setEnclosingOperand(QObject *enclosingOperand)
 {
-    qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->setEnclosingOperand(qmodelingobjectproperty_cast<QUmlInteractionOperand *>(enclosingOperand));
+    qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->setEnclosingOperand(qmodelingelementproperty_cast<QUmlInteractionOperand *>(enclosingOperand));
 }
 
 void QUmlBehaviorExecutionSpecificationObject::addGeneralOrdering(QObject *generalOrdering)
 {
-    qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->addGeneralOrdering(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
+    qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->addGeneralOrdering(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
 }
 
 void QUmlBehaviorExecutionSpecificationObject::removeGeneralOrdering(QObject *generalOrdering)
 {
-    qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->removeGeneralOrdering(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
+    qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->removeGeneralOrdering(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutionSpecification]
 
 void QUmlBehaviorExecutionSpecificationObject::setFinish(QObject *finish)
 {
-    qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->setFinish(qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(finish));
+    qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->setFinish(qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(finish));
 }
 
 void QUmlBehaviorExecutionSpecificationObject::setStart(QObject *start)
 {
-    qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->setStart(qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(start));
+    qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->setStart(qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(start));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [BehaviorExecutionSpecification]
 
 void QUmlBehaviorExecutionSpecificationObject::setBehavior(QObject *behavior)
 {
-    qmodelingobjectproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->setBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(behavior));
+    qmodelingelementproperty_cast<QUmlBehaviorExecutionSpecification *>(this)->setBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(behavior));
+}
+
+
+void QUmlBehaviorExecutionSpecificationObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlInteractionFragment");
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("covered"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingInteraction"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingOperand"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalOrderings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutionSpecification");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutionSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("finish"))));
+    d->groupProperties.insert(QStringLiteral("QUmlExecutionSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("start"))));
+
+    d->propertyGroups << QStringLiteral("QUmlBehaviorExecutionSpecification");
+    d->groupProperties.insert(QStringLiteral("QUmlBehaviorExecutionSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("behavior"))));
+}
+
+void QUmlBehaviorExecutionSpecificationObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlBehaviorExecutionSpecification, behavior, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlBehaviorExecutionSpecification, behavior, PropertyClassRole, QStringLiteral("QUmlBehaviorExecutionSpecification"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlBehaviorExecutionSpecification, behavior, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlBehaviorExecutionSpecification, behavior, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlBehaviorExecutionSpecification, behavior, DocumentationRole, QStringLiteral("Behavior whose execution is occurring."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlBehaviorExecutionSpecification, behavior, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlBehaviorExecutionSpecification, behavior, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlBehaviorExecutionSpecification, behavior, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlbehaviorexecutionspecificationobject_p.h b/src/uml/qobjects/qumlbehaviorexecutionspecificationobject_p.h
index 4475f307..8cbea79a 100644
--- a/src/uml/qobjects/qumlbehaviorexecutionspecificationobject_p.h
+++ b/src/uml/qobjects/qumlbehaviorexecutionspecificationobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlBehaviorExecutionSpecification;
-class Q_UML_EXPORT QUmlBehaviorExecutionSpecificationObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlBehaviorExecutionSpecificationObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlBehaviorExecutionSpecificationObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -85,7 +88,7 @@ class Q_UML_EXPORT QUmlBehaviorExecutionSpecificationObject : public QObject
     Q_PROPERTY(QObject * behavior READ behavior WRITE setBehavior)
 
 public:
-    Q_INVOKABLE explicit QUmlBehaviorExecutionSpecificationObject(QUmlBehaviorExecutionSpecification *qModelingObject);
+    Q_INVOKABLE explicit QUmlBehaviorExecutionSpecificationObject(QUmlBehaviorExecutionSpecification *qModelingElement);
     virtual ~QUmlBehaviorExecutionSpecificationObject();
 
     // Owned attributes [Element]
@@ -156,6 +159,10 @@ public Q_SLOTS:
 
     // Slots for owned attributes [BehaviorExecutionSpecification]
     void setBehavior(QObject *behavior = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlbroadcastsignalactionobject.cpp b/src/uml/qobjects/qumlbroadcastsignalactionobject.cpp
index 060466ee..6cd0418b 100644
--- a/src/uml/qobjects/qumlbroadcastsignalactionobject.cpp
+++ b/src/uml/qobjects/qumlbroadcastsignalactionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlbroadcastsignalactionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlBroadcastSignalAction>
 #include <QtUml/QUmlActivity>
@@ -66,16 +67,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlBroadcastSignalActionObject::QUmlBroadcastSignalActionObject(QUmlBroadcastSignalAction *qModelingObject)
+QUmlBroadcastSignalActionObject::QUmlBroadcastSignalActionObject(QUmlBroadcastSignalAction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlBroadcastSignalActionObject::~QUmlBroadcastSignalActionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -84,25 +87,25 @@ QUmlBroadcastSignalActionObject::~QUmlBroadcastSignalActionObject()
 const QSet<QObject *> QUmlBroadcastSignalActionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlBroadcastSignalActionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlBroadcastSignalActionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -110,62 +113,62 @@ QObject *QUmlBroadcastSignalActionObject::owner() const
 const QSet<QObject *> QUmlBroadcastSignalActionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlBroadcastSignalActionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->name();
 }
 
 QObject *QUmlBroadcastSignalActionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlBroadcastSignalActionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlBroadcastSignalActionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlBroadcastSignalActionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlBroadcastSignalActionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlBroadcastSignalActionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlBroadcastSignalActionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -173,65 +176,65 @@ const QSet<QObject *> QUmlBroadcastSignalActionObject::redefinitionContexts() co
 
 QObject *QUmlBroadcastSignalActionObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlBroadcastSignalActionObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlBroadcastSignalActionObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlBroadcastSignalActionObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlBroadcastSignalActionObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlBroadcastSignalActionObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlBroadcastSignalActionObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlBroadcastSignalActionObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -240,8 +243,8 @@ const QSet<QObject *> QUmlBroadcastSignalActionObject::redefinedNodes() const
 const QSet<QObject *> QUmlBroadcastSignalActionObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -249,46 +252,46 @@ const QSet<QObject *> QUmlBroadcastSignalActionObject::handlers() const
 
 QObject *QUmlBroadcastSignalActionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlBroadcastSignalActionObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlBroadcastSignalActionObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlBroadcastSignalActionObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlBroadcastSignalActionObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlBroadcastSignalActionObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -297,27 +300,27 @@ const QList<QObject *> QUmlBroadcastSignalActionObject::outputs() const
 const QList<QObject *> QUmlBroadcastSignalActionObject::arguments() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->arguments())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->arguments())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 QObject *QUmlBroadcastSignalActionObject::onPort() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->onPort())
+    if (!qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->onPort())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->onPort()->asQObject();
+        return qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->onPort()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [BroadcastSignalAction]
 
 QObject *QUmlBroadcastSignalActionObject::signal() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->signal())
+    if (!qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->signal())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->signal()->asQObject();
+        return qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->signal()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -325,14 +328,14 @@ QObject *QUmlBroadcastSignalActionObject::signal() const
 QSet<QObject *> QUmlBroadcastSignalActionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlBroadcastSignalActionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -340,300 +343,371 @@ bool QUmlBroadcastSignalActionObject::mustBeOwned() const
 QList<QObject *> QUmlBroadcastSignalActionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlBroadcastSignalActionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlBroadcastSignalActionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlBroadcastSignalActionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlBroadcastSignalActionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlBroadcastSignalActionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlBroadcastSignalActionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlBroadcastSignalActionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlBroadcastSignalActionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlBroadcastSignalActionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlBroadcastSignalActionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlBroadcastSignalActionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlBroadcastSignalActionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlBroadcastSignalActionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->setName(name);
 }
 
 void QUmlBroadcastSignalActionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlBroadcastSignalActionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlBroadcastSignalActionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlBroadcastSignalActionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlBroadcastSignalActionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlBroadcastSignalActionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlBroadcastSignalActionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlBroadcastSignalActionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlBroadcastSignalActionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlBroadcastSignalActionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlBroadcastSignalActionObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlBroadcastSignalActionObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlBroadcastSignalActionObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlBroadcastSignalActionObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlBroadcastSignalActionObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlBroadcastSignalActionObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlBroadcastSignalActionObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlBroadcastSignalActionObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlBroadcastSignalActionObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlBroadcastSignalActionObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlBroadcastSignalActionObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlBroadcastSignalActionObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlBroadcastSignalActionObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlBroadcastSignalActionObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlBroadcastSignalActionObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlBroadcastSignalActionObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlBroadcastSignalActionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlBroadcastSignalActionObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlBroadcastSignalActionObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlBroadcastSignalActionObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlBroadcastSignalActionObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlBroadcastSignalActionObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlBroadcastSignalActionObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlBroadcastSignalActionObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlBroadcastSignalActionObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlBroadcastSignalActionObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlBroadcastSignalActionObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [InvocationAction]
 
 void QUmlBroadcastSignalActionObject::addArgument(QObject *argument)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->addArgument(qmodelingobjectproperty_cast<QUmlInputPin *>(argument));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->addArgument(qmodelingelementproperty_cast<QUmlInputPin *>(argument));
 }
 
 void QUmlBroadcastSignalActionObject::removeArgument(QObject *argument)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->removeArgument(qmodelingobjectproperty_cast<QUmlInputPin *>(argument));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->removeArgument(qmodelingelementproperty_cast<QUmlInputPin *>(argument));
 }
 
 void QUmlBroadcastSignalActionObject::setOnPort(QObject *onPort)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->setOnPort(qmodelingobjectproperty_cast<QUmlPort *>(onPort));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->setOnPort(qmodelingelementproperty_cast<QUmlPort *>(onPort));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [BroadcastSignalAction]
 
 void QUmlBroadcastSignalActionObject::setSignal(QObject *signal)
 {
-    qmodelingobjectproperty_cast<QUmlBroadcastSignalAction *>(this)->setSignal(qmodelingobjectproperty_cast<QUmlSignal *>(signal));
+    qmodelingelementproperty_cast<QUmlBroadcastSignalAction *>(this)->setSignal(qmodelingelementproperty_cast<QUmlSignal *>(signal));
+}
+
+
+void QUmlBroadcastSignalActionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlInvocationAction");
+    d->groupProperties.insert(QStringLiteral("QUmlInvocationAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("arguments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInvocationAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("onPort"))));
+
+    d->propertyGroups << QStringLiteral("QUmlBroadcastSignalAction");
+    d->groupProperties.insert(QStringLiteral("QUmlBroadcastSignalAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("signal"))));
+}
+
+void QUmlBroadcastSignalActionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlBroadcastSignalAction, signal, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlBroadcastSignalAction, signal, PropertyClassRole, QStringLiteral("QUmlBroadcastSignalAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlBroadcastSignalAction, signal, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlBroadcastSignalAction, signal, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlBroadcastSignalAction, signal, DocumentationRole, QStringLiteral("The specification of signal object transmitted to the target objects."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlBroadcastSignalAction, signal, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlBroadcastSignalAction, signal, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlBroadcastSignalAction, signal, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlbroadcastsignalactionobject_p.h b/src/uml/qobjects/qumlbroadcastsignalactionobject_p.h
index 5867b0ab..0a68fd56 100644
--- a/src/uml/qobjects/qumlbroadcastsignalactionobject_p.h
+++ b/src/uml/qobjects/qumlbroadcastsignalactionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlBroadcastSignalAction;
-class Q_UML_EXPORT QUmlBroadcastSignalActionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlBroadcastSignalActionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlBroadcastSignalActionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -105,7 +108,7 @@ class Q_UML_EXPORT QUmlBroadcastSignalActionObject : public QObject
     Q_PROPERTY(QObject * signal READ signal WRITE setSignal)
 
 public:
-    Q_INVOKABLE explicit QUmlBroadcastSignalActionObject(QUmlBroadcastSignalAction *qModelingObject);
+    Q_INVOKABLE explicit QUmlBroadcastSignalActionObject(QUmlBroadcastSignalAction *qModelingElement);
     virtual ~QUmlBroadcastSignalActionObject();
 
     // Owned attributes [Element]
@@ -234,6 +237,10 @@ public Q_SLOTS:
 
     // Slots for owned attributes [BroadcastSignalAction]
     void setSignal(QObject *signal = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlcallbehavioractionobject.cpp b/src/uml/qobjects/qumlcallbehavioractionobject.cpp
index 41644997..d01a5b4a 100644
--- a/src/uml/qobjects/qumlcallbehavioractionobject.cpp
+++ b/src/uml/qobjects/qumlcallbehavioractionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlcallbehavioractionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlCallBehaviorAction>
 #include <QtUml/QUmlActivity>
@@ -66,16 +67,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlCallBehaviorActionObject::QUmlCallBehaviorActionObject(QUmlCallBehaviorAction *qModelingObject)
+QUmlCallBehaviorActionObject::QUmlCallBehaviorActionObject(QUmlCallBehaviorAction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlCallBehaviorActionObject::~QUmlCallBehaviorActionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -84,25 +87,25 @@ QUmlCallBehaviorActionObject::~QUmlCallBehaviorActionObject()
 const QSet<QObject *> QUmlCallBehaviorActionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCallBehaviorActionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlCallBehaviorActionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -110,62 +113,62 @@ QObject *QUmlCallBehaviorActionObject::owner() const
 const QSet<QObject *> QUmlCallBehaviorActionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlCallBehaviorActionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->name();
 }
 
 QObject *QUmlCallBehaviorActionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlCallBehaviorActionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlCallBehaviorActionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlCallBehaviorActionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlCallBehaviorActionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlCallBehaviorActionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCallBehaviorActionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -173,65 +176,65 @@ const QSet<QObject *> QUmlCallBehaviorActionObject::redefinitionContexts() const
 
 QObject *QUmlCallBehaviorActionObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlCallBehaviorActionObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCallBehaviorActionObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCallBehaviorActionObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlCallBehaviorActionObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlCallBehaviorActionObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCallBehaviorActionObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCallBehaviorActionObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -240,8 +243,8 @@ const QSet<QObject *> QUmlCallBehaviorActionObject::redefinedNodes() const
 const QSet<QObject *> QUmlCallBehaviorActionObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -249,46 +252,46 @@ const QSet<QObject *> QUmlCallBehaviorActionObject::handlers() const
 
 QObject *QUmlCallBehaviorActionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlCallBehaviorActionObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlCallBehaviorActionObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlCallBehaviorActionObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCallBehaviorActionObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlCallBehaviorActionObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -297,31 +300,31 @@ const QList<QObject *> QUmlCallBehaviorActionObject::outputs() const
 const QList<QObject *> QUmlCallBehaviorActionObject::arguments() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->arguments())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->arguments())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 QObject *QUmlCallBehaviorActionObject::onPort() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->onPort())
+    if (!qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->onPort())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->onPort()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->onPort()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [CallAction]
 
 bool QUmlCallBehaviorActionObject::isSynchronous() const
 {
-    return qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->isSynchronous();
+    return qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->isSynchronous();
 }
 
 const QList<QObject *> QUmlCallBehaviorActionObject::results() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->results())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->results())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -329,10 +332,10 @@ const QList<QObject *> QUmlCallBehaviorActionObject::results() const
 
 QObject *QUmlCallBehaviorActionObject::behavior() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->behavior())
+    if (!qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->behavior())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->behavior()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->behavior()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -340,14 +343,14 @@ QObject *QUmlCallBehaviorActionObject::behavior() const
 QSet<QObject *> QUmlCallBehaviorActionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlCallBehaviorActionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -355,322 +358,398 @@ bool QUmlCallBehaviorActionObject::mustBeOwned() const
 QList<QObject *> QUmlCallBehaviorActionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlCallBehaviorActionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlCallBehaviorActionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlCallBehaviorActionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlCallBehaviorActionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlCallBehaviorActionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlCallBehaviorActionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlCallBehaviorActionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlCallBehaviorActionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlCallBehaviorActionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlCallBehaviorActionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlCallBehaviorActionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlCallBehaviorActionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlCallBehaviorActionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->setName(name);
 }
 
 void QUmlCallBehaviorActionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlCallBehaviorActionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlCallBehaviorActionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlCallBehaviorActionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlCallBehaviorActionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlCallBehaviorActionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlCallBehaviorActionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlCallBehaviorActionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlCallBehaviorActionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlCallBehaviorActionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlCallBehaviorActionObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlCallBehaviorActionObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlCallBehaviorActionObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlCallBehaviorActionObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlCallBehaviorActionObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlCallBehaviorActionObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlCallBehaviorActionObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlCallBehaviorActionObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlCallBehaviorActionObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlCallBehaviorActionObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlCallBehaviorActionObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlCallBehaviorActionObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlCallBehaviorActionObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlCallBehaviorActionObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlCallBehaviorActionObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlCallBehaviorActionObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlCallBehaviorActionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlCallBehaviorActionObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlCallBehaviorActionObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlCallBehaviorActionObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlCallBehaviorActionObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlCallBehaviorActionObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlCallBehaviorActionObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlCallBehaviorActionObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlCallBehaviorActionObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlCallBehaviorActionObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlCallBehaviorActionObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [InvocationAction]
 
 void QUmlCallBehaviorActionObject::addArgument(QObject *argument)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->addArgument(qmodelingobjectproperty_cast<QUmlInputPin *>(argument));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->addArgument(qmodelingelementproperty_cast<QUmlInputPin *>(argument));
 }
 
 void QUmlCallBehaviorActionObject::removeArgument(QObject *argument)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->removeArgument(qmodelingobjectproperty_cast<QUmlInputPin *>(argument));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->removeArgument(qmodelingelementproperty_cast<QUmlInputPin *>(argument));
 }
 
 void QUmlCallBehaviorActionObject::setOnPort(QObject *onPort)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->setOnPort(qmodelingobjectproperty_cast<QUmlPort *>(onPort));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->setOnPort(qmodelingelementproperty_cast<QUmlPort *>(onPort));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [CallAction]
 
 void QUmlCallBehaviorActionObject::setSynchronous(bool isSynchronous)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->setSynchronous(isSynchronous);
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->setSynchronous(isSynchronous);
 }
 
 void QUmlCallBehaviorActionObject::unsetSynchronous()
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("synchronous"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("synchronous"));
 }
 
 void QUmlCallBehaviorActionObject::addResult(QObject *result)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->addResult(qmodelingobjectproperty_cast<QUmlOutputPin *>(result));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->addResult(qmodelingelementproperty_cast<QUmlOutputPin *>(result));
 }
 
 void QUmlCallBehaviorActionObject::removeResult(QObject *result)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->removeResult(qmodelingobjectproperty_cast<QUmlOutputPin *>(result));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->removeResult(qmodelingelementproperty_cast<QUmlOutputPin *>(result));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [CallBehaviorAction]
 
 void QUmlCallBehaviorActionObject::setBehavior(QObject *behavior)
 {
-    qmodelingobjectproperty_cast<QUmlCallBehaviorAction *>(this)->setBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(behavior));
+    qmodelingelementproperty_cast<QUmlCallBehaviorAction *>(this)->setBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(behavior));
+}
+
+
+void QUmlCallBehaviorActionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlInvocationAction");
+    d->groupProperties.insert(QStringLiteral("QUmlInvocationAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("arguments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInvocationAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("onPort"))));
+
+    d->propertyGroups << QStringLiteral("QUmlCallAction");
+    d->groupProperties.insert(QStringLiteral("QUmlCallAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isSynchronous"))));
+    d->groupProperties.insert(QStringLiteral("QUmlCallAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("results"))));
+
+    d->propertyGroups << QStringLiteral("QUmlCallBehaviorAction");
+    d->groupProperties.insert(QStringLiteral("QUmlCallBehaviorAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("behavior"))));
+}
+
+void QUmlCallBehaviorActionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCallBehaviorAction, behavior, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCallBehaviorAction, behavior, PropertyClassRole, QStringLiteral("QUmlCallBehaviorAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCallBehaviorAction, behavior, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCallBehaviorAction, behavior, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCallBehaviorAction, behavior, DocumentationRole, QStringLiteral("The invoked behavior. It must be capable of accepting and returning control."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCallBehaviorAction, behavior, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCallBehaviorAction, behavior, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCallBehaviorAction, behavior, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlcallbehavioractionobject_p.h b/src/uml/qobjects/qumlcallbehavioractionobject_p.h
index 2053884a..3322c80c 100644
--- a/src/uml/qobjects/qumlcallbehavioractionobject_p.h
+++ b/src/uml/qobjects/qumlcallbehavioractionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlCallBehaviorAction;
-class Q_UML_EXPORT QUmlCallBehaviorActionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlCallBehaviorActionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlCallBehaviorActionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -109,7 +112,7 @@ class Q_UML_EXPORT QUmlCallBehaviorActionObject : public QObject
     Q_PROPERTY(QObject * behavior READ behavior WRITE setBehavior)
 
 public:
-    Q_INVOKABLE explicit QUmlCallBehaviorActionObject(QUmlCallBehaviorAction *qModelingObject);
+    Q_INVOKABLE explicit QUmlCallBehaviorActionObject(QUmlCallBehaviorAction *qModelingElement);
     virtual ~QUmlCallBehaviorActionObject();
 
     // Owned attributes [Element]
@@ -248,6 +251,10 @@ public Q_SLOTS:
 
     // Slots for owned attributes [CallBehaviorAction]
     void setBehavior(QObject *behavior = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlcalleventobject.cpp b/src/uml/qobjects/qumlcalleventobject.cpp
index ab043aca..b206a502 100644
--- a/src/uml/qobjects/qumlcalleventobject.cpp
+++ b/src/uml/qobjects/qumlcalleventobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlcalleventobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlCallEvent>
 #include <QtUml/QUmlComment>
@@ -54,16 +55,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlCallEventObject::QUmlCallEventObject(QUmlCallEvent *qModelingObject)
+QUmlCallEventObject::QUmlCallEventObject(QUmlCallEvent *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlCallEventObject::~QUmlCallEventObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlCallEvent *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -72,43 +75,43 @@ QUmlCallEventObject::~QUmlCallEventObject()
 const QSet<QObject *> QUmlCallEventObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlCallEvent *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCallEventObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlCallEvent *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlCallEventObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlCallEvent *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCallEvent *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlCallEventObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlCallEvent *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCallEvent *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlCallEventObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlCallEvent *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCallEvent *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -116,52 +119,52 @@ QObject *QUmlCallEventObject::templateParameter() const
 const QSet<QObject *> QUmlCallEventObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlCallEvent *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlCallEventObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlCallEvent *>(this)->name();
 }
 
 QObject *QUmlCallEventObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlCallEvent *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCallEvent *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlCallEventObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlCallEvent *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCallEvent *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlCallEventObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlCallEvent *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlCallEventObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlCallEvent *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [CallEvent]
 
 QObject *QUmlCallEventObject::operation() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->operation())
+    if (!qmodelingelementproperty_cast<QUmlCallEvent *>(this)->operation())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->operation()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCallEvent *>(this)->operation()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -169,26 +172,26 @@ QObject *QUmlCallEventObject::operation() const
 QSet<QObject *> QUmlCallEventObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlCallEvent *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlCallEventObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlCallEvent *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlCallEventObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlCallEvent *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlCallEventObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlCallEvent *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [NamedElement]
@@ -196,116 +199,166 @@ bool QUmlCallEventObject::isTemplateParameter() const
 QList<QObject *> QUmlCallEventObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlCallEvent *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlCallEventObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlCallEvent *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlCallEventObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlCallEvent *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlCallEventObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlCallEvent *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlCallEventObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlCallEvent *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlCallEventObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlCallEvent *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlCallEventObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlCallEvent *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlCallEventObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlCallEvent *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlCallEventObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlCallEvent *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlCallEventObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlCallEvent *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlCallEventObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlCallEvent *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlCallEventObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlCallEvent *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlCallEventObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlCallEvent *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlCallEventObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlCallEvent *>(this)->setName(name);
 }
 
 void QUmlCallEventObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlCallEvent *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlCallEventObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlCallEvent *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlCallEventObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlCallEvent *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlCallEventObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlCallEvent *>(this)->setVisibility(visibility);
 }
 
 void QUmlCallEventObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [CallEvent]
 
 void QUmlCallEventObject::setOperation(QObject *operation)
 {
-    qmodelingobjectproperty_cast<QUmlCallEvent *>(this)->setOperation(qmodelingobjectproperty_cast<QUmlOperation *>(operation));
+    qmodelingelementproperty_cast<QUmlCallEvent *>(this)->setOperation(qmodelingelementproperty_cast<QUmlOperation *>(operation));
+}
+
+
+void QUmlCallEventObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlEvent");
+
+    d->propertyGroups << QStringLiteral("QUmlMessageEvent");
+
+    d->propertyGroups << QStringLiteral("QUmlCallEvent");
+    d->groupProperties.insert(QStringLiteral("QUmlCallEvent"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("operation"))));
+}
+
+void QUmlCallEventObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCallEvent, operation, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCallEvent, operation, PropertyClassRole, QStringLiteral("QUmlCallEvent"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCallEvent, operation, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCallEvent, operation, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCallEvent, operation, DocumentationRole, QStringLiteral("Designates the operation whose invocation raised the call event."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCallEvent, operation, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCallEvent, operation, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCallEvent, operation, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlcalleventobject_p.h b/src/uml/qobjects/qumlcalleventobject_p.h
index 8e8def8b..4cd9a329 100644
--- a/src/uml/qobjects/qumlcalleventobject_p.h
+++ b/src/uml/qobjects/qumlcalleventobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlCallEvent;
-class Q_UML_EXPORT QUmlCallEventObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlCallEventObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlCallEventObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -81,7 +84,7 @@ class Q_UML_EXPORT QUmlCallEventObject : public QObject
     Q_PROPERTY(QObject * operation READ operation WRITE setOperation)
 
 public:
-    Q_INVOKABLE explicit QUmlCallEventObject(QUmlCallEvent *qModelingObject);
+    Q_INVOKABLE explicit QUmlCallEventObject(QUmlCallEvent *qModelingElement);
     virtual ~QUmlCallEventObject();
 
     // Owned attributes [Element]
@@ -147,6 +150,10 @@ public Q_SLOTS:
 
     // Slots for owned attributes [CallEvent]
     void setOperation(QObject *operation = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlcalloperationactionobject.cpp b/src/uml/qobjects/qumlcalloperationactionobject.cpp
index eb6d7476..218cd6a0 100644
--- a/src/uml/qobjects/qumlcalloperationactionobject.cpp
+++ b/src/uml/qobjects/qumlcalloperationactionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlcalloperationactionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlCallOperationAction>
 #include <QtUml/QUmlActivity>
@@ -66,16 +67,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlCallOperationActionObject::QUmlCallOperationActionObject(QUmlCallOperationAction *qModelingObject)
+QUmlCallOperationActionObject::QUmlCallOperationActionObject(QUmlCallOperationAction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlCallOperationActionObject::~QUmlCallOperationActionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -84,25 +87,25 @@ QUmlCallOperationActionObject::~QUmlCallOperationActionObject()
 const QSet<QObject *> QUmlCallOperationActionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCallOperationActionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlCallOperationActionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -110,62 +113,62 @@ QObject *QUmlCallOperationActionObject::owner() const
 const QSet<QObject *> QUmlCallOperationActionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlCallOperationActionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->name();
 }
 
 QObject *QUmlCallOperationActionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlCallOperationActionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlCallOperationActionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlCallOperationActionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlCallOperationActionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlCallOperationActionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCallOperationActionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -173,65 +176,65 @@ const QSet<QObject *> QUmlCallOperationActionObject::redefinitionContexts() cons
 
 QObject *QUmlCallOperationActionObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlCallOperationActionObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCallOperationActionObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCallOperationActionObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlCallOperationActionObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlCallOperationActionObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCallOperationActionObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCallOperationActionObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -240,8 +243,8 @@ const QSet<QObject *> QUmlCallOperationActionObject::redefinedNodes() const
 const QSet<QObject *> QUmlCallOperationActionObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -249,46 +252,46 @@ const QSet<QObject *> QUmlCallOperationActionObject::handlers() const
 
 QObject *QUmlCallOperationActionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlCallOperationActionObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlCallOperationActionObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlCallOperationActionObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCallOperationActionObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlCallOperationActionObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -297,31 +300,31 @@ const QList<QObject *> QUmlCallOperationActionObject::outputs() const
 const QList<QObject *> QUmlCallOperationActionObject::arguments() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->arguments())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->arguments())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 QObject *QUmlCallOperationActionObject::onPort() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->onPort())
+    if (!qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->onPort())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->onPort()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->onPort()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [CallAction]
 
 bool QUmlCallOperationActionObject::isSynchronous() const
 {
-    return qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->isSynchronous();
+    return qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->isSynchronous();
 }
 
 const QList<QObject *> QUmlCallOperationActionObject::results() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->results())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->results())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -329,18 +332,18 @@ const QList<QObject *> QUmlCallOperationActionObject::results() const
 
 QObject *QUmlCallOperationActionObject::operation() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->operation())
+    if (!qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->operation())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->operation()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->operation()->asQModelingObject();
 }
 
 QObject *QUmlCallOperationActionObject::target() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->target())
+    if (!qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->target())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->target()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->target()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -348,14 +351,14 @@ QObject *QUmlCallOperationActionObject::target() const
 QSet<QObject *> QUmlCallOperationActionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlCallOperationActionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -363,327 +366,413 @@ bool QUmlCallOperationActionObject::mustBeOwned() const
 QList<QObject *> QUmlCallOperationActionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlCallOperationActionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlCallOperationActionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlCallOperationActionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlCallOperationActionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlCallOperationActionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlCallOperationActionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlCallOperationActionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlCallOperationActionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlCallOperationActionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlCallOperationActionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlCallOperationActionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlCallOperationActionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlCallOperationActionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->setName(name);
 }
 
 void QUmlCallOperationActionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlCallOperationActionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlCallOperationActionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlCallOperationActionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlCallOperationActionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlCallOperationActionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlCallOperationActionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlCallOperationActionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlCallOperationActionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlCallOperationActionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlCallOperationActionObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlCallOperationActionObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlCallOperationActionObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlCallOperationActionObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlCallOperationActionObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlCallOperationActionObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlCallOperationActionObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlCallOperationActionObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlCallOperationActionObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlCallOperationActionObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlCallOperationActionObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlCallOperationActionObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlCallOperationActionObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlCallOperationActionObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlCallOperationActionObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlCallOperationActionObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlCallOperationActionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlCallOperationActionObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlCallOperationActionObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlCallOperationActionObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlCallOperationActionObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlCallOperationActionObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlCallOperationActionObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlCallOperationActionObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlCallOperationActionObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlCallOperationActionObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlCallOperationActionObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [InvocationAction]
 
 void QUmlCallOperationActionObject::addArgument(QObject *argument)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->addArgument(qmodelingobjectproperty_cast<QUmlInputPin *>(argument));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->addArgument(qmodelingelementproperty_cast<QUmlInputPin *>(argument));
 }
 
 void QUmlCallOperationActionObject::removeArgument(QObject *argument)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->removeArgument(qmodelingobjectproperty_cast<QUmlInputPin *>(argument));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->removeArgument(qmodelingelementproperty_cast<QUmlInputPin *>(argument));
 }
 
 void QUmlCallOperationActionObject::setOnPort(QObject *onPort)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->setOnPort(qmodelingobjectproperty_cast<QUmlPort *>(onPort));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->setOnPort(qmodelingelementproperty_cast<QUmlPort *>(onPort));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [CallAction]
 
 void QUmlCallOperationActionObject::setSynchronous(bool isSynchronous)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->setSynchronous(isSynchronous);
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->setSynchronous(isSynchronous);
 }
 
 void QUmlCallOperationActionObject::unsetSynchronous()
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("synchronous"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("synchronous"));
 }
 
 void QUmlCallOperationActionObject::addResult(QObject *result)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->addResult(qmodelingobjectproperty_cast<QUmlOutputPin *>(result));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->addResult(qmodelingelementproperty_cast<QUmlOutputPin *>(result));
 }
 
 void QUmlCallOperationActionObject::removeResult(QObject *result)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->removeResult(qmodelingobjectproperty_cast<QUmlOutputPin *>(result));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->removeResult(qmodelingelementproperty_cast<QUmlOutputPin *>(result));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [CallOperationAction]
 
 void QUmlCallOperationActionObject::setOperation(QObject *operation)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->setOperation(qmodelingobjectproperty_cast<QUmlOperation *>(operation));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->setOperation(qmodelingelementproperty_cast<QUmlOperation *>(operation));
 }
 
 void QUmlCallOperationActionObject::setTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlCallOperationAction *>(this)->setTarget(qmodelingobjectproperty_cast<QUmlInputPin *>(target));
+    qmodelingelementproperty_cast<QUmlCallOperationAction *>(this)->setTarget(qmodelingelementproperty_cast<QUmlInputPin *>(target));
+}
+
+
+void QUmlCallOperationActionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlInvocationAction");
+    d->groupProperties.insert(QStringLiteral("QUmlInvocationAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("arguments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInvocationAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("onPort"))));
+
+    d->propertyGroups << QStringLiteral("QUmlCallAction");
+    d->groupProperties.insert(QStringLiteral("QUmlCallAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isSynchronous"))));
+    d->groupProperties.insert(QStringLiteral("QUmlCallAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("results"))));
+
+    d->propertyGroups << QStringLiteral("QUmlCallOperationAction");
+    d->groupProperties.insert(QStringLiteral("QUmlCallOperationAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("operation"))));
+    d->groupProperties.insert(QStringLiteral("QUmlCallOperationAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("target"))));
+}
+
+void QUmlCallOperationActionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCallOperationAction, operation, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCallOperationAction, operation, PropertyClassRole, QStringLiteral("QUmlCallOperationAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCallOperationAction, operation, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCallOperationAction, operation, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCallOperationAction, operation, DocumentationRole, QStringLiteral("The operation to be invoked by the action execution."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCallOperationAction, operation, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCallOperationAction, operation, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCallOperationAction, operation, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCallOperationAction, target, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCallOperationAction, target, PropertyClassRole, QStringLiteral("QUmlCallOperationAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCallOperationAction, target, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCallOperationAction, target, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCallOperationAction, target, DocumentationRole, QStringLiteral("The target object to which the request is sent. The classifier of the target object is used to dynamically determine a behavior to invoke. This object constitutes the context of the execution of the operation."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCallOperationAction, target, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCallOperationAction, target, SubsettedPropertiesRole, QStringLiteral("Action-input"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCallOperationAction, target, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlcalloperationactionobject_p.h b/src/uml/qobjects/qumlcalloperationactionobject_p.h
index 5b3e368b..f4870af9 100644
--- a/src/uml/qobjects/qumlcalloperationactionobject_p.h
+++ b/src/uml/qobjects/qumlcalloperationactionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlCallOperationAction;
-class Q_UML_EXPORT QUmlCallOperationActionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlCallOperationActionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlCallOperationActionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -110,7 +113,7 @@ class Q_UML_EXPORT QUmlCallOperationActionObject : public QObject
     Q_PROPERTY(QObject * target READ target WRITE setTarget)
 
 public:
-    Q_INVOKABLE explicit QUmlCallOperationActionObject(QUmlCallOperationAction *qModelingObject);
+    Q_INVOKABLE explicit QUmlCallOperationActionObject(QUmlCallOperationAction *qModelingElement);
     virtual ~QUmlCallOperationActionObject();
 
     // Owned attributes [Element]
@@ -251,6 +254,10 @@ public Q_SLOTS:
     // Slots for owned attributes [CallOperationAction]
     void setOperation(QObject *operation = 0);
     void setTarget(QObject *target = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlcentralbuffernodeobject.cpp b/src/uml/qobjects/qumlcentralbuffernodeobject.cpp
index 2153b0c5..a0629345 100644
--- a/src/uml/qobjects/qumlcentralbuffernodeobject.cpp
+++ b/src/uml/qobjects/qumlcentralbuffernodeobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlcentralbuffernodeobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlCentralBufferNode>
 #include <QtUml/QUmlActivity>
@@ -64,16 +65,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlCentralBufferNodeObject::QUmlCentralBufferNodeObject(QUmlCentralBufferNode *qModelingObject)
+QUmlCentralBufferNodeObject::QUmlCentralBufferNodeObject(QUmlCentralBufferNode *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlCentralBufferNodeObject::~QUmlCentralBufferNodeObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -82,25 +85,25 @@ QUmlCentralBufferNodeObject::~QUmlCentralBufferNodeObject()
 const QSet<QObject *> QUmlCentralBufferNodeObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCentralBufferNodeObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlCentralBufferNodeObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -108,62 +111,62 @@ QObject *QUmlCentralBufferNodeObject::owner() const
 const QSet<QObject *> QUmlCentralBufferNodeObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlCentralBufferNodeObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->name();
 }
 
 QObject *QUmlCentralBufferNodeObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlCentralBufferNodeObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlCentralBufferNodeObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlCentralBufferNodeObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlCentralBufferNodeObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlCentralBufferNodeObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCentralBufferNodeObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -171,65 +174,65 @@ const QSet<QObject *> QUmlCentralBufferNodeObject::redefinitionContexts() const
 
 QObject *QUmlCentralBufferNodeObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlCentralBufferNodeObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCentralBufferNodeObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCentralBufferNodeObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlCentralBufferNodeObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlCentralBufferNodeObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCentralBufferNodeObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCentralBufferNodeObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -237,10 +240,10 @@ const QSet<QObject *> QUmlCentralBufferNodeObject::redefinedNodes() const
 
 QObject *QUmlCentralBufferNodeObject::type() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->type())
+    if (!qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->type())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->type()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->type()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ObjectNode]
@@ -248,35 +251,35 @@ QObject *QUmlCentralBufferNodeObject::type() const
 const QSet<QObject *> QUmlCentralBufferNodeObject::inStates() const
 {
     QSet<QObject *> set;
-    foreach (QUmlState *element, qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->inStates())
-        set.insert(element->asQObject());
+    foreach (QUmlState *element, qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->inStates())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlCentralBufferNodeObject::isControlType() const
 {
-    return qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->isControlType();
+    return qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->isControlType();
 }
 
 QtUml::ObjectNodeOrderingKind QUmlCentralBufferNodeObject::ordering() const
 {
-    return qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->ordering();
+    return qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->ordering();
 }
 
 QObject *QUmlCentralBufferNodeObject::selection() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->selection())
+    if (!qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->selection())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->selection()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->selection()->asQModelingObject();
 }
 
 QObject *QUmlCentralBufferNodeObject::upperBound() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->upperBound())
+    if (!qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->upperBound())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->upperBound()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->upperBound()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -284,14 +287,14 @@ QObject *QUmlCentralBufferNodeObject::upperBound() const
 QSet<QObject *> QUmlCentralBufferNodeObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlCentralBufferNodeObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -299,256 +302,313 @@ bool QUmlCentralBufferNodeObject::mustBeOwned() const
 QList<QObject *> QUmlCentralBufferNodeObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlCentralBufferNodeObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlCentralBufferNodeObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlCentralBufferNodeObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlCentralBufferNodeObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlCentralBufferNodeObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlCentralBufferNodeObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlCentralBufferNodeObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlCentralBufferNodeObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlCentralBufferNodeObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlCentralBufferNodeObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlCentralBufferNodeObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlCentralBufferNodeObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlCentralBufferNodeObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->setName(name);
 }
 
 void QUmlCentralBufferNodeObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlCentralBufferNodeObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlCentralBufferNodeObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlCentralBufferNodeObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlCentralBufferNodeObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlCentralBufferNodeObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlCentralBufferNodeObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlCentralBufferNodeObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlCentralBufferNodeObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlCentralBufferNodeObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlCentralBufferNodeObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlCentralBufferNodeObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlCentralBufferNodeObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlCentralBufferNodeObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlCentralBufferNodeObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlCentralBufferNodeObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlCentralBufferNodeObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlCentralBufferNodeObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlCentralBufferNodeObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlCentralBufferNodeObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlCentralBufferNodeObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlCentralBufferNodeObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlCentralBufferNodeObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlCentralBufferNodeObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TypedElement]
 
 void QUmlCentralBufferNodeObject::setType(QObject *type)
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->setType(qmodelingobjectproperty_cast<QUmlType *>(type));
+    qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->setType(qmodelingelementproperty_cast<QUmlType *>(type));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ObjectNode]
 
 void QUmlCentralBufferNodeObject::addInState(QObject *inState)
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->addInState(qmodelingobjectproperty_cast<QUmlState *>(inState));
+    qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->addInState(qmodelingelementproperty_cast<QUmlState *>(inState));
 }
 
 void QUmlCentralBufferNodeObject::removeInState(QObject *inState)
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->removeInState(qmodelingobjectproperty_cast<QUmlState *>(inState));
+    qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->removeInState(qmodelingelementproperty_cast<QUmlState *>(inState));
 }
 
 void QUmlCentralBufferNodeObject::setControlType(bool isControlType)
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->setControlType(isControlType);
+    qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->setControlType(isControlType);
 }
 
 void QUmlCentralBufferNodeObject::unsetControlType()
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("controlType"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("controlType"));
 }
 
 void QUmlCentralBufferNodeObject::setOrdering(QtUml::ObjectNodeOrderingKind ordering)
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->setOrdering(ordering);
+    qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->setOrdering(ordering);
 }
 
 void QUmlCentralBufferNodeObject::unsetOrdering()
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("ordering"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("ordering"));
 }
 
 void QUmlCentralBufferNodeObject::setSelection(QObject *selection)
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->setSelection(qmodelingobjectproperty_cast<QUmlBehavior *>(selection));
+    qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->setSelection(qmodelingelementproperty_cast<QUmlBehavior *>(selection));
 }
 
 void QUmlCentralBufferNodeObject::setUpperBound(QObject *upperBound)
 {
-    qmodelingobjectproperty_cast<QUmlCentralBufferNode *>(this)->setUpperBound(qmodelingobjectproperty_cast<QUmlValueSpecification *>(upperBound));
+    qmodelingelementproperty_cast<QUmlCentralBufferNode *>(this)->setUpperBound(qmodelingelementproperty_cast<QUmlValueSpecification *>(upperBound));
+}
+
+
+void QUmlCentralBufferNodeObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTypedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
+
+    d->propertyGroups << QStringLiteral("QUmlObjectNode");
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStates"))));
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isControlType"))));
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ordering"))));
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("selection"))));
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperBound"))));
+
+    d->propertyGroups << QStringLiteral("QUmlCentralBufferNode");
+}
+
+void QUmlCentralBufferNodeObject::setPropertyData()
+{
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlcentralbuffernodeobject_p.h b/src/uml/qobjects/qumlcentralbuffernodeobject_p.h
index 2f53ddfc..955f6347 100644
--- a/src/uml/qobjects/qumlcentralbuffernodeobject_p.h
+++ b/src/uml/qobjects/qumlcentralbuffernodeobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlCentralBufferNode;
-class Q_UML_EXPORT QUmlCentralBufferNodeObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlCentralBufferNodeObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlCentralBufferNodeObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -97,7 +100,7 @@ class Q_UML_EXPORT QUmlCentralBufferNodeObject : public QObject
     Q_PROPERTY(QObject * upperBound READ upperBound WRITE setUpperBound)
 
 public:
-    Q_INVOKABLE explicit QUmlCentralBufferNodeObject(QUmlCentralBufferNode *qModelingObject);
+    Q_INVOKABLE explicit QUmlCentralBufferNodeObject(QUmlCentralBufferNode *qModelingElement);
     virtual ~QUmlCentralBufferNodeObject();
 
     // Owned attributes [Element]
@@ -206,6 +209,10 @@ public Q_SLOTS:
     void unsetOrdering();
     void setSelection(QObject *selection = 0);
     void setUpperBound(QObject *upperBound = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlchangeeventobject.cpp b/src/uml/qobjects/qumlchangeeventobject.cpp
index 35c64050..3c636cbf 100644
--- a/src/uml/qobjects/qumlchangeeventobject.cpp
+++ b/src/uml/qobjects/qumlchangeeventobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlchangeeventobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlChangeEvent>
 #include <QtUml/QUmlComment>
@@ -54,16 +55,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlChangeEventObject::QUmlChangeEventObject(QUmlChangeEvent *qModelingObject)
+QUmlChangeEventObject::QUmlChangeEventObject(QUmlChangeEvent *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlChangeEventObject::~QUmlChangeEventObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -72,43 +75,43 @@ QUmlChangeEventObject::~QUmlChangeEventObject()
 const QSet<QObject *> QUmlChangeEventObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlChangeEventObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlChangeEventObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlChangeEventObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlChangeEventObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -116,52 +119,52 @@ QObject *QUmlChangeEventObject::templateParameter() const
 const QSet<QObject *> QUmlChangeEventObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlChangeEventObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->name();
 }
 
 QObject *QUmlChangeEventObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlChangeEventObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlChangeEventObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlChangeEventObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [ChangeEvent]
 
 QObject *QUmlChangeEventObject::changeExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->changeExpression())
+    if (!qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->changeExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->changeExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->changeExpression()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -169,26 +172,26 @@ QObject *QUmlChangeEventObject::changeExpression() const
 QSet<QObject *> QUmlChangeEventObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlChangeEventObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlChangeEventObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlChangeEventObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [NamedElement]
@@ -196,116 +199,164 @@ bool QUmlChangeEventObject::isTemplateParameter() const
 QList<QObject *> QUmlChangeEventObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlChangeEventObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlChangeEventObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlChangeEventObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlChangeEventObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlChangeEventObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlChangeEventObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlChangeEventObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlChangeEventObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlChangeEventObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlChangeEventObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlChangeEventObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlChangeEventObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlChangeEventObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->setName(name);
 }
 
 void QUmlChangeEventObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlChangeEventObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlChangeEventObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlChangeEventObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->setVisibility(visibility);
 }
 
 void QUmlChangeEventObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ChangeEvent]
 
 void QUmlChangeEventObject::setChangeExpression(QObject *changeExpression)
 {
-    qmodelingobjectproperty_cast<QUmlChangeEvent *>(this)->setChangeExpression(qmodelingobjectproperty_cast<QUmlValueSpecification *>(changeExpression));
+    qmodelingelementproperty_cast<QUmlChangeEvent *>(this)->setChangeExpression(qmodelingelementproperty_cast<QUmlValueSpecification *>(changeExpression));
+}
+
+
+void QUmlChangeEventObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlEvent");
+
+    d->propertyGroups << QStringLiteral("QUmlChangeEvent");
+    d->groupProperties.insert(QStringLiteral("QUmlChangeEvent"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("changeExpression"))));
+}
+
+void QUmlChangeEventObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlChangeEvent, changeExpression, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlChangeEvent, changeExpression, PropertyClassRole, QStringLiteral("QUmlChangeEvent"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlChangeEvent, changeExpression, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlChangeEvent, changeExpression, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlChangeEvent, changeExpression, DocumentationRole, QStringLiteral("A Boolean-valued expression that will result in a change event whenever its value changes from false to true."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlChangeEvent, changeExpression, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlChangeEvent, changeExpression, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlChangeEvent, changeExpression, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlchangeeventobject_p.h b/src/uml/qobjects/qumlchangeeventobject_p.h
index 3651291e..d5e71500 100644
--- a/src/uml/qobjects/qumlchangeeventobject_p.h
+++ b/src/uml/qobjects/qumlchangeeventobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlChangeEvent;
-class Q_UML_EXPORT QUmlChangeEventObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlChangeEventObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlChangeEventObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -81,7 +84,7 @@ class Q_UML_EXPORT QUmlChangeEventObject : public QObject
     Q_PROPERTY(QObject * changeExpression READ changeExpression WRITE setChangeExpression)
 
 public:
-    Q_INVOKABLE explicit QUmlChangeEventObject(QUmlChangeEvent *qModelingObject);
+    Q_INVOKABLE explicit QUmlChangeEventObject(QUmlChangeEvent *qModelingElement);
     virtual ~QUmlChangeEventObject();
 
     // Owned attributes [Element]
@@ -147,6 +150,10 @@ public Q_SLOTS:
 
     // Slots for owned attributes [ChangeEvent]
     void setChangeExpression(QObject *changeExpression = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlclassifiertemplateparameterobject.cpp b/src/uml/qobjects/qumlclassifiertemplateparameterobject.cpp
index 651eeadd..deae3d5a 100644
--- a/src/uml/qobjects/qumlclassifiertemplateparameterobject.cpp
+++ b/src/uml/qobjects/qumlclassifiertemplateparameterobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlclassifiertemplateparameterobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlClassifierTemplateParameter>
 #include <QtUml/QUmlClassifier>
@@ -49,16 +50,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlClassifierTemplateParameterObject::QUmlClassifierTemplateParameterObject(QUmlClassifierTemplateParameter *qModelingObject)
+QUmlClassifierTemplateParameterObject::QUmlClassifierTemplateParameterObject(QUmlClassifierTemplateParameter *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlClassifierTemplateParameterObject::~QUmlClassifierTemplateParameterObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -67,82 +70,82 @@ QUmlClassifierTemplateParameterObject::~QUmlClassifierTemplateParameterObject()
 const QSet<QObject *> QUmlClassifierTemplateParameterObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClassifierTemplateParameterObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlClassifierTemplateParameterObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [TemplateParameter]
 
 QObject *QUmlClassifierTemplateParameterObject::default_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(this)->default_())
+    if (!qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(this)->default_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(this)->default_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(this)->default_()->asQModelingObject();
 }
 
 QObject *QUmlClassifierTemplateParameterObject::ownedDefault() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(this)->ownedDefault())
+    if (!qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(this)->ownedDefault())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(this)->ownedDefault()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(this)->ownedDefault()->asQModelingObject();
 }
 
 QObject *QUmlClassifierTemplateParameterObject::ownedParameteredElement() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(this)->ownedParameteredElement())
+    if (!qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(this)->ownedParameteredElement())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(this)->ownedParameteredElement()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(this)->ownedParameteredElement()->asQModelingObject();
 }
 
 QObject *QUmlClassifierTemplateParameterObject::signature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(this)->signature())
+    if (!qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(this)->signature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(this)->signature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(this)->signature()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ClassifierTemplateParameter]
 
 bool QUmlClassifierTemplateParameterObject::allowSubstitutable() const
 {
-    return qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(this)->allowSubstitutable();
+    return qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(this)->allowSubstitutable();
 }
 
 const QSet<QObject *> QUmlClassifierTemplateParameterObject::constrainingClassifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(this)->constrainingClassifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(this)->constrainingClassifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlClassifierTemplateParameterObject::parameteredElement() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(this)->parameteredElement())
+    if (!qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(this)->parameteredElement())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(this)->parameteredElement()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(this)->parameteredElement()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -150,90 +153,148 @@ QObject *QUmlClassifierTemplateParameterObject::parameteredElement() const
 QSet<QObject *> QUmlClassifierTemplateParameterObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlClassifierTemplateParameterObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(this)->mustBeOwned();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlClassifierTemplateParameterObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlClassifierTemplateParameterObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlClassifierTemplateParameterObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlClassifierTemplateParameterObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlClassifierTemplateParameterObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateParameter]
 
 void QUmlClassifierTemplateParameterObject::setDefault(QObject *default_)
 {
-    qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(this)->setDefault(qmodelingobjectproperty_cast<QUmlParameterableElement *>(default_));
+    qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(this)->setDefault(qmodelingelementproperty_cast<QUmlParameterableElement *>(default_));
 }
 
 void QUmlClassifierTemplateParameterObject::setOwnedDefault(QObject *ownedDefault)
 {
-    qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(this)->setOwnedDefault(qmodelingobjectproperty_cast<QUmlParameterableElement *>(ownedDefault));
+    qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(this)->setOwnedDefault(qmodelingelementproperty_cast<QUmlParameterableElement *>(ownedDefault));
 }
 
 void QUmlClassifierTemplateParameterObject::setOwnedParameteredElement(QObject *ownedParameteredElement)
 {
-    qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(this)->setOwnedParameteredElement(qmodelingobjectproperty_cast<QUmlParameterableElement *>(ownedParameteredElement));
+    qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(this)->setOwnedParameteredElement(qmodelingelementproperty_cast<QUmlParameterableElement *>(ownedParameteredElement));
 }
 
 void QUmlClassifierTemplateParameterObject::setSignature(QObject *signature)
 {
-    qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(this)->setSignature(qmodelingobjectproperty_cast<QUmlTemplateSignature *>(signature));
+    qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(this)->setSignature(qmodelingelementproperty_cast<QUmlTemplateSignature *>(signature));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ClassifierTemplateParameter]
 
 void QUmlClassifierTemplateParameterObject::setAllowSubstitutable(bool allowSubstitutable)
 {
-    qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(this)->setAllowSubstitutable(allowSubstitutable);
+    qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(this)->setAllowSubstitutable(allowSubstitutable);
 }
 
 void QUmlClassifierTemplateParameterObject::unsetAllowSubstitutable()
 {
-    qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("allowSubstitutable"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("allowSubstitutable"));
 }
 
 void QUmlClassifierTemplateParameterObject::addConstrainingClassifier(QObject *constrainingClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(this)->addConstrainingClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(constrainingClassifier));
+    qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(this)->addConstrainingClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(constrainingClassifier));
 }
 
 void QUmlClassifierTemplateParameterObject::removeConstrainingClassifier(QObject *constrainingClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(this)->removeConstrainingClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(constrainingClassifier));
+    qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(this)->removeConstrainingClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(constrainingClassifier));
 }
 
 void QUmlClassifierTemplateParameterObject::setParameteredElement(QObject *parameteredElement)
 {
-    qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(this)->setParameteredElement(qmodelingobjectproperty_cast<QUmlClassifier *>(parameteredElement));
+    qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(this)->setParameteredElement(qmodelingelementproperty_cast<QUmlClassifier *>(parameteredElement));
+}
+
+
+void QUmlClassifierTemplateParameterObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateParameter");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("default_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedDefault"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameteredElement"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("signature"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClassifierTemplateParameter");
+    d->groupProperties.insert(QStringLiteral("QUmlClassifierTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("allowSubstitutable"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifierTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("constrainingClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifierTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parameteredElement"))));
+}
+
+void QUmlClassifierTemplateParameterObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClassifierTemplateParameter, allowSubstitutable, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClassifierTemplateParameter, allowSubstitutable, PropertyClassRole, QStringLiteral("QUmlClassifierTemplateParameter"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClassifierTemplateParameter, allowSubstitutable, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClassifierTemplateParameter, allowSubstitutable, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClassifierTemplateParameter, allowSubstitutable, DocumentationRole, QStringLiteral("Constrains the required relationship between an actual parameter and the parameteredElement for this formal parameter."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClassifierTemplateParameter, allowSubstitutable, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClassifierTemplateParameter, allowSubstitutable, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClassifierTemplateParameter, allowSubstitutable, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClassifierTemplateParameter, constrainingClassifiers, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClassifierTemplateParameter, constrainingClassifiers, PropertyClassRole, QStringLiteral("QUmlClassifierTemplateParameter"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClassifierTemplateParameter, constrainingClassifiers, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClassifierTemplateParameter, constrainingClassifiers, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClassifierTemplateParameter, constrainingClassifiers, DocumentationRole, QStringLiteral("The classifiers that constrain the argument that can be used for the parameter. If the allowSubstitutable attribute is true, then any classifier that is compatible with this constraining classifier can be substituted; otherwise, it must be either this classifier or one of its subclasses. If this property is empty, there are no constraints on the classifier that can be used as an argument."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClassifierTemplateParameter, constrainingClassifiers, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClassifierTemplateParameter, constrainingClassifiers, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClassifierTemplateParameter, constrainingClassifiers, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClassifierTemplateParameter, parameteredElement, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClassifierTemplateParameter, parameteredElement, PropertyClassRole, QStringLiteral("QUmlClassifierTemplateParameter"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClassifierTemplateParameter, parameteredElement, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClassifierTemplateParameter, parameteredElement, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClassifierTemplateParameter, parameteredElement, DocumentationRole, QStringLiteral("The parameterable classifier for this template parameter."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClassifierTemplateParameter, parameteredElement, RedefinedPropertiesRole, QStringLiteral("TemplateParameter-parameteredElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClassifierTemplateParameter, parameteredElement, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClassifierTemplateParameter, parameteredElement, OppositeEndRole, QStringLiteral("Classifier-templateParameter"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlclassifiertemplateparameterobject_p.h b/src/uml/qobjects/qumlclassifiertemplateparameterobject_p.h
index 89223e58..bdf28507 100644
--- a/src/uml/qobjects/qumlclassifiertemplateparameterobject_p.h
+++ b/src/uml/qobjects/qumlclassifiertemplateparameterobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 QT_BEGIN_HEADER
 
@@ -52,9 +52,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlClassifierTemplateParameter;
-class Q_UML_EXPORT QUmlClassifierTemplateParameterObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlClassifierTemplateParameterObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlClassifierTemplateParameterObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -73,7 +76,7 @@ class Q_UML_EXPORT QUmlClassifierTemplateParameterObject : public QObject
     Q_PROPERTY(QObject * parameteredElement READ parameteredElement WRITE setParameteredElement)
 
 public:
-    Q_INVOKABLE explicit QUmlClassifierTemplateParameterObject(QUmlClassifierTemplateParameter *qModelingObject);
+    Q_INVOKABLE explicit QUmlClassifierTemplateParameterObject(QUmlClassifierTemplateParameter *qModelingElement);
     virtual ~QUmlClassifierTemplateParameterObject();
 
     // Owned attributes [Element]
@@ -117,6 +120,10 @@ public Q_SLOTS:
     void addConstrainingClassifier(QObject *constrainingClassifier);
     void removeConstrainingClassifier(QObject *constrainingClassifier);
     void setParameteredElement(QObject *parameteredElement = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlclassobject.cpp b/src/uml/qobjects/qumlclassobject.cpp
index 80b2c924..846cd081 100644
--- a/src/uml/qobjects/qumlclassobject.cpp
+++ b/src/uml/qobjects/qumlclassobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlclassobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlClass>
 #include <QtUml/QUmlBehavior>
@@ -79,16 +80,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlClassObject::QUmlClassObject(QUmlClass *qModelingObject)
+QUmlClassObject::QUmlClassObject(QUmlClass *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlClassObject::~QUmlClassObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlClass *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlClass *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -97,25 +100,25 @@ QUmlClassObject::~QUmlClassObject()
 const QSet<QObject *> QUmlClassObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlClass *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClassObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlClass *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlClassObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClass *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlClass *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClass *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClass *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -123,35 +126,35 @@ QObject *QUmlClassObject::owner() const
 const QSet<QObject *> QUmlClassObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlClass *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlClassObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlClass *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlClass *>(this)->name();
 }
 
 QObject *QUmlClassObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClass *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlClass *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClass *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClass *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlClassObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClass *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlClass *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClass *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClass *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlClassObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlClass *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlClass *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [Namespace]
@@ -159,48 +162,48 @@ QString QUmlClassObject::qualifiedName() const
 const QSet<QObject *> QUmlClassObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlClass *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClassObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlClass *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClassObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlClass *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClassObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlClass *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClassObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlClass *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClassObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlClass *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -208,49 +211,49 @@ const QSet<QObject *> QUmlClassObject::packageImports() const
 
 QObject *QUmlClassObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClass *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlClass *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClass *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClass *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlClassObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlClass *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlClass *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Type]
 
 QObject *QUmlClassObject::package() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClass *>(this)->package())
+    if (!qmodelingelementproperty_cast<QUmlClass *>(this)->package())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClass *>(this)->package()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClass *>(this)->package()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlClassObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlClass *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlClass *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlClassObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlClass *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClassObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlClass *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -259,8 +262,8 @@ const QSet<QObject *> QUmlClassObject::redefinitionContexts() const
 const QSet<QObject *> QUmlClassObject::templateBindings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTemplateBinding *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->templateBindings())
-        set.insert(element->asQObject());
+    foreach (QUmlTemplateBinding *element, qmodelingelementproperty_cast<QUmlClass *>(this)->templateBindings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -269,109 +272,109 @@ const QSet<QObject *> QUmlClassObject::templateBindings() const
 const QSet<QObject *> QUmlClassObject::attributes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->attributes())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlClass *>(this)->attributes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClassObject::collaborationUses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlCollaborationUse *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->collaborationUses())
-        set.insert(element->asQObject());
+    foreach (QUmlCollaborationUse *element, qmodelingelementproperty_cast<QUmlClass *>(this)->collaborationUses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClassObject::features() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->features())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlClass *>(this)->features())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClassObject::generalizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralization *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->generalizations())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralization *element, qmodelingelementproperty_cast<QUmlClass *>(this)->generalizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClassObject::inheritedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->inheritedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlClass *>(this)->inheritedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlClassObject::isFinalSpecialization() const
 {
-    return qmodelingobjectproperty_cast<QUmlClass *>(this)->isFinalSpecialization();
+    return qmodelingelementproperty_cast<QUmlClass *>(this)->isFinalSpecialization();
 }
 
 QObject *QUmlClassObject::ownedTemplateSignature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClass *>(this)->ownedTemplateSignature())
+    if (!qmodelingelementproperty_cast<QUmlClass *>(this)->ownedTemplateSignature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClass *>(this)->ownedTemplateSignature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClass *>(this)->ownedTemplateSignature()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlClassObject::ownedUseCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->ownedUseCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlClass *>(this)->ownedUseCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClassObject::powertypeExtents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralizationSet *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->powertypeExtents())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralizationSet *element, qmodelingelementproperty_cast<QUmlClass *>(this)->powertypeExtents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClassObject::redefinedClassifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->redefinedClassifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlClass *>(this)->redefinedClassifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlClassObject::representation() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClass *>(this)->representation())
+    if (!qmodelingelementproperty_cast<QUmlClass *>(this)->representation())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClass *>(this)->representation()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClass *>(this)->representation()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlClassObject::substitutions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlSubstitution *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->substitutions())
-        set.insert(element->asQObject());
+    foreach (QUmlSubstitution *element, qmodelingelementproperty_cast<QUmlClass *>(this)->substitutions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlClassObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClass *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlClass *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClass *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClass *>(this)->templateParameter()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlClassObject::useCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->useCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlClass *>(this)->useCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -380,24 +383,24 @@ const QSet<QObject *> QUmlClassObject::useCases() const
 const QSet<QObject *> QUmlClassObject::ownedConnectors() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConnector *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->ownedConnectors())
-        set.insert(element->asQObject());
+    foreach (QUmlConnector *element, qmodelingelementproperty_cast<QUmlClass *>(this)->ownedConnectors())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClassObject::parts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->parts())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlClass *>(this)->parts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClassObject::roles() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConnectableElement *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->roles())
-        set.insert(element->asQObject());
+    foreach (QUmlConnectableElement *element, qmodelingelementproperty_cast<QUmlClass *>(this)->roles())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -406,8 +409,8 @@ const QSet<QObject *> QUmlClassObject::roles() const
 const QSet<QObject *> QUmlClassObject::ownedPorts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPort *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->ownedPorts())
-        set.insert(element->asQObject());
+    foreach (QUmlPort *element, qmodelingelementproperty_cast<QUmlClass *>(this)->ownedPorts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -415,25 +418,25 @@ const QSet<QObject *> QUmlClassObject::ownedPorts() const
 
 QObject *QUmlClassObject::classifierBehavior() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClass *>(this)->classifierBehavior())
+    if (!qmodelingelementproperty_cast<QUmlClass *>(this)->classifierBehavior())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClass *>(this)->classifierBehavior()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClass *>(this)->classifierBehavior()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlClassObject::interfaceRealizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterfaceRealization *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->interfaceRealizations())
-        set.insert(element->asQObject());
+    foreach (QUmlInterfaceRealization *element, qmodelingelementproperty_cast<QUmlClass *>(this)->interfaceRealizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClassObject::ownedBehaviors() const
 {
     QSet<QObject *> set;
-    foreach (QUmlBehavior *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->ownedBehaviors())
-        set.insert(element->asQObject());
+    foreach (QUmlBehavior *element, qmodelingelementproperty_cast<QUmlClass *>(this)->ownedBehaviors())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -442,58 +445,58 @@ const QSet<QObject *> QUmlClassObject::ownedBehaviors() const
 const QSet<QObject *> QUmlClassObject::extensions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExtension *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->extensions())
-        set.insert(element->asQObject());
+    foreach (QUmlExtension *element, qmodelingelementproperty_cast<QUmlClass *>(this)->extensions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlClassObject::isAbstract() const
 {
-    return qmodelingobjectproperty_cast<QUmlClass *>(this)->isAbstract();
+    return qmodelingelementproperty_cast<QUmlClass *>(this)->isAbstract();
 }
 
 bool QUmlClassObject::isActive() const
 {
-    return qmodelingobjectproperty_cast<QUmlClass *>(this)->isActive();
+    return qmodelingelementproperty_cast<QUmlClass *>(this)->isActive();
 }
 
 const QList<QObject *> QUmlClassObject::nestedClassifiers() const
 {
     QList<QObject *> list;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->nestedClassifiers())
-        list.append(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlClass *>(this)->nestedClassifiers())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QList<QObject *> QUmlClassObject::ownedAttributes() const
 {
     QList<QObject *> list;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->ownedAttributes())
-        list.append(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlClass *>(this)->ownedAttributes())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QList<QObject *> QUmlClassObject::ownedOperations() const
 {
     QList<QObject *> list;
-    foreach (QUmlOperation *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->ownedOperations())
-        list.append(element->asQObject());
+    foreach (QUmlOperation *element, qmodelingelementproperty_cast<QUmlClass *>(this)->ownedOperations())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QSet<QObject *> QUmlClassObject::ownedReceptions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlReception *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->ownedReceptions())
-        set.insert(element->asQObject());
+    foreach (QUmlReception *element, qmodelingelementproperty_cast<QUmlClass *>(this)->ownedReceptions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClassObject::superClasses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClass *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->superClasses())
-        set.insert(element->asQObject());
+    foreach (QUmlClass *element, qmodelingelementproperty_cast<QUmlClass *>(this)->superClasses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -502,14 +505,14 @@ const QSet<QObject *> QUmlClassObject::superClasses() const
 QSet<QObject *> QUmlClassObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlClass *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlClassObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlClass *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlClass *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -517,27 +520,27 @@ bool QUmlClassObject::mustBeOwned() const
 QList<QObject *> QUmlClassObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlClass *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlClassObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlClass *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlClassObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlClass *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlClass *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlClassObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlClass *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlClass *>(this)->separator();
 }
 
 // OPERATIONS [Namespace]
@@ -546,44 +549,44 @@ QSet<QObject *> QUmlClassObject::excludeCollisions(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlClass *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlClassObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlClass *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlClass *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlClassObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlClass *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlClassObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlClass *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlClass *>(this)->membersAreDistinguishable();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlClassObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlClass *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlClass *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlClassObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlClass *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlClass *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [Type]
@@ -591,12 +594,12 @@ bool QUmlClassObject::isTemplateParameter() const
 
 bool QUmlClassObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlClass *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlClass *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlClassObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlClass *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlClass *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [TemplateableElement]
@@ -604,8 +607,8 @@ bool QUmlClassObject::isRedefinitionContextValid(QObject *redefined) const
 QSet<QObject *> QUmlClassObject::parameterableElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterableElement *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->parameterableElements())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterableElement *element, qmodelingelementproperty_cast<QUmlClass *>(this)->parameterableElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -614,52 +617,52 @@ QSet<QObject *> QUmlClassObject::parameterableElements() const
 QSet<QObject *> QUmlClassObject::allFeatures() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->allFeatures())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlClass *>(this)->allFeatures())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlClassObject::allParents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->allParents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlClass *>(this)->allParents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlClassObject::conformsTo(QObject *other) const
 {
-    return qmodelingobjectproperty_cast<QUmlClass *>(this)->conformsTo(qmodelingobjectproperty_cast<QUmlClassifier *>(other));
+    return qmodelingelementproperty_cast<QUmlClass *>(this)->conformsTo(qmodelingelementproperty_cast<QUmlClassifier *>(other));
 }
 
 bool QUmlClassObject::hasVisibilityOf(QObject *n) const
 {
-    return qmodelingobjectproperty_cast<QUmlClass *>(this)->hasVisibilityOf(qmodelingobjectproperty_cast<QUmlNamedElement *>(n));
+    return qmodelingelementproperty_cast<QUmlClass *>(this)->hasVisibilityOf(qmodelingelementproperty_cast<QUmlNamedElement *>(n));
 }
 
 QSet<QObject *> QUmlClassObject::inheritableMembers(QObject *c) const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->inheritableMembers(qmodelingobjectproperty_cast<QUmlClassifier *>(c)))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlClass *>(this)->inheritableMembers(qmodelingelementproperty_cast<QUmlClassifier *>(c)))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlClassObject::isTemplate() const
 {
-    return qmodelingobjectproperty_cast<QUmlClass *>(this)->isTemplate();
+    return qmodelingelementproperty_cast<QUmlClass *>(this)->isTemplate();
 }
 
 bool QUmlClassObject::maySpecializeType(QObject *c) const
 {
-    return qmodelingobjectproperty_cast<QUmlClass *>(this)->maySpecializeType(qmodelingobjectproperty_cast<QUmlClassifier *>(c));
+    return qmodelingelementproperty_cast<QUmlClass *>(this)->maySpecializeType(qmodelingelementproperty_cast<QUmlClassifier *>(c));
 }
 
 QSet<QObject *> QUmlClassObject::parents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->parents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlClass *>(this)->parents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -669,10 +672,10 @@ QSet<QObject *> QUmlClassObject::inherit(QSet<QObject *> inhs) const
 {
     QSet<QUmlNamedElement *> inhsConverted;
     foreach (QObject *object, inhs)
-        inhsConverted.insert(qmodelingobjectproperty_cast<QUmlNamedElement *>(object));
+        inhsConverted.insert(qmodelingelementproperty_cast<QUmlNamedElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlClass *>(this)->inherit(inhsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlClass *>(this)->inherit(inhsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -680,469 +683,636 @@ QSet<QObject *> QUmlClassObject::inherit(QSet<QObject *> inhs) const
 
 void QUmlClassObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlClassObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlClassObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlClassObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlClassObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlClassObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlClassObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlClassObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlClass *>(this)->setName(name);
 }
 
 void QUmlClassObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlClassObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlClassObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlClass *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlClassObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlClassObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlClassObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlClassObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlClassObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlClassObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlClassObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlClassObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlClassObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlClassObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlClassObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlClassObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlClassObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlClassObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlClass *>(this)->setVisibility(visibility);
 }
 
 void QUmlClassObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Type]
 
 void QUmlClassObject::setPackage(QObject *package)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->setPackage(qmodelingobjectproperty_cast<QUmlPackage *>(package));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->setPackage(qmodelingelementproperty_cast<QUmlPackage *>(package));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlClassObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlClass *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlClassObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlClassObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlClassObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlClassObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlClassObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateableElement]
 
 void QUmlClassObject::addTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->addTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->addTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 void QUmlClassObject::removeTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->removeTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->removeTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Classifier]
 
 void QUmlClassObject::addAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->addAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->addAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlClassObject::removeAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->removeAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->removeAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlClassObject::addCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->addCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->addCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlClassObject::removeCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->removeCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->removeCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlClassObject::addFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->addFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->addFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlClassObject::removeFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->removeFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->removeFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlClassObject::addGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->addGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->addGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlClassObject::removeGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->removeGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->removeGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlClassObject::addInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->addInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->addInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlClassObject::removeInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->removeInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->removeInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlClassObject::setFinalSpecialization(bool isFinalSpecialization)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->setFinalSpecialization(isFinalSpecialization);
+    qmodelingelementproperty_cast<QUmlClass *>(this)->setFinalSpecialization(isFinalSpecialization);
 }
 
 void QUmlClassObject::unsetFinalSpecialization()
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("finalSpecialization"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
 void QUmlClassObject::setOwnedTemplateSignature(QObject *ownedTemplateSignature)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->setOwnedTemplateSignature(qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->setOwnedTemplateSignature(qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
 }
 
 void QUmlClassObject::addOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->addOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->addOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlClassObject::removeOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->removeOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->removeOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlClassObject::addPowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->addPowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->addPowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlClassObject::removePowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->removePowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->removePowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlClassObject::addRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->addRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->addRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlClassObject::removeRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->removeRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->removeRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlClassObject::setRepresentation(QObject *representation)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->setRepresentation(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(representation));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->setRepresentation(qmodelingelementproperty_cast<QUmlCollaborationUse *>(representation));
 }
 
 void QUmlClassObject::addSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->addSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->addSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlClassObject::removeSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->removeSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->removeSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlClassObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
 }
 
 void QUmlClassObject::addUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->addUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->addUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 void QUmlClassObject::removeUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->removeUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->removeUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [StructuredClassifier]
 
 void QUmlClassObject::addOwnedConnector(QObject *ownedConnector)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->addOwnedConnector(qmodelingobjectproperty_cast<QUmlConnector *>(ownedConnector));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->addOwnedConnector(qmodelingelementproperty_cast<QUmlConnector *>(ownedConnector));
 }
 
 void QUmlClassObject::removeOwnedConnector(QObject *ownedConnector)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->removeOwnedConnector(qmodelingobjectproperty_cast<QUmlConnector *>(ownedConnector));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->removeOwnedConnector(qmodelingelementproperty_cast<QUmlConnector *>(ownedConnector));
 }
 
 void QUmlClassObject::addPart(QObject *part)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->addPart(qmodelingobjectproperty_cast<QUmlProperty *>(part));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->addPart(qmodelingelementproperty_cast<QUmlProperty *>(part));
 }
 
 void QUmlClassObject::removePart(QObject *part)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->removePart(qmodelingobjectproperty_cast<QUmlProperty *>(part));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->removePart(qmodelingelementproperty_cast<QUmlProperty *>(part));
 }
 
 void QUmlClassObject::addRole(QObject *role)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->addRole(qmodelingobjectproperty_cast<QUmlConnectableElement *>(role));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->addRole(qmodelingelementproperty_cast<QUmlConnectableElement *>(role));
 }
 
 void QUmlClassObject::removeRole(QObject *role)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->removeRole(qmodelingobjectproperty_cast<QUmlConnectableElement *>(role));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->removeRole(qmodelingelementproperty_cast<QUmlConnectableElement *>(role));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [EncapsulatedClassifier]
 
 void QUmlClassObject::addOwnedPort(QObject *ownedPort)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->addOwnedPort(qmodelingobjectproperty_cast<QUmlPort *>(ownedPort));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->addOwnedPort(qmodelingelementproperty_cast<QUmlPort *>(ownedPort));
 }
 
 void QUmlClassObject::removeOwnedPort(QObject *ownedPort)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->removeOwnedPort(qmodelingobjectproperty_cast<QUmlPort *>(ownedPort));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->removeOwnedPort(qmodelingelementproperty_cast<QUmlPort *>(ownedPort));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [BehavioredClassifier]
 
 void QUmlClassObject::setClassifierBehavior(QObject *classifierBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->setClassifierBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(classifierBehavior));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->setClassifierBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(classifierBehavior));
 }
 
 void QUmlClassObject::addInterfaceRealization(QObject *interfaceRealization)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->addInterfaceRealization(qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->addInterfaceRealization(qmodelingelementproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
 }
 
 void QUmlClassObject::removeInterfaceRealization(QObject *interfaceRealization)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->removeInterfaceRealization(qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->removeInterfaceRealization(qmodelingelementproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
 }
 
 void QUmlClassObject::addOwnedBehavior(QObject *ownedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->addOwnedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(ownedBehavior));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->addOwnedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(ownedBehavior));
 }
 
 void QUmlClassObject::removeOwnedBehavior(QObject *ownedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->removeOwnedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(ownedBehavior));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->removeOwnedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(ownedBehavior));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Class]
 
 void QUmlClassObject::addExtension(QObject *extension)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->addExtension(qmodelingobjectproperty_cast<QUmlExtension *>(extension));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->addExtension(qmodelingelementproperty_cast<QUmlExtension *>(extension));
 }
 
 void QUmlClassObject::removeExtension(QObject *extension)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->removeExtension(qmodelingobjectproperty_cast<QUmlExtension *>(extension));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->removeExtension(qmodelingelementproperty_cast<QUmlExtension *>(extension));
 }
 
 void QUmlClassObject::setAbstract(bool isAbstract)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->setAbstract(isAbstract);
+    qmodelingelementproperty_cast<QUmlClass *>(this)->setAbstract(isAbstract);
 }
 
 void QUmlClassObject::unsetAbstract()
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("abstract"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
 void QUmlClassObject::setActive(bool isActive)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->setActive(isActive);
+    qmodelingelementproperty_cast<QUmlClass *>(this)->setActive(isActive);
 }
 
 void QUmlClassObject::unsetActive()
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("active"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("active"));
 }
 
 void QUmlClassObject::addNestedClassifier(QObject *nestedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->addNestedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(nestedClassifier));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->addNestedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(nestedClassifier));
 }
 
 void QUmlClassObject::removeNestedClassifier(QObject *nestedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->removeNestedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(nestedClassifier));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->removeNestedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(nestedClassifier));
 }
 
 void QUmlClassObject::addOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->addOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->addOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlClassObject::removeOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->removeOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->removeOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlClassObject::addOwnedOperation(QObject *ownedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->addOwnedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(ownedOperation));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->addOwnedOperation(qmodelingelementproperty_cast<QUmlOperation *>(ownedOperation));
 }
 
 void QUmlClassObject::removeOwnedOperation(QObject *ownedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->removeOwnedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(ownedOperation));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->removeOwnedOperation(qmodelingelementproperty_cast<QUmlOperation *>(ownedOperation));
 }
 
 void QUmlClassObject::addOwnedReception(QObject *ownedReception)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->addOwnedReception(qmodelingobjectproperty_cast<QUmlReception *>(ownedReception));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->addOwnedReception(qmodelingelementproperty_cast<QUmlReception *>(ownedReception));
 }
 
 void QUmlClassObject::removeOwnedReception(QObject *ownedReception)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->removeOwnedReception(qmodelingobjectproperty_cast<QUmlReception *>(ownedReception));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->removeOwnedReception(qmodelingelementproperty_cast<QUmlReception *>(ownedReception));
 }
 
 void QUmlClassObject::addSuperClass(QObject *superClass)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->addSuperClass(qmodelingobjectproperty_cast<QUmlClass *>(superClass));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->addSuperClass(qmodelingelementproperty_cast<QUmlClass *>(superClass));
 }
 
 void QUmlClassObject::removeSuperClass(QObject *superClass)
 {
-    qmodelingobjectproperty_cast<QUmlClass *>(this)->removeSuperClass(qmodelingobjectproperty_cast<QUmlClass *>(superClass));
+    qmodelingelementproperty_cast<QUmlClass *>(this)->removeSuperClass(qmodelingelementproperty_cast<QUmlClass *>(superClass));
+}
+
+
+void QUmlClassObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlType");
+    d->groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
+
+    d->propertyGroups << QStringLiteral("QUmlStructuredClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedConnectors"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parts"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("roles"))));
+
+    d->propertyGroups << QStringLiteral("QUmlEncapsulatedClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlEncapsulatedClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedPorts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlBehavioredClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifierBehavior"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interfaceRealizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedBehaviors"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClass");
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extensions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isActive"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedReceptions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superClasses"))));
+}
+
+void QUmlClassObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, extensions, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, extensions, PropertyClassRole, QStringLiteral("QUmlClass"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, extensions, IsDerivedRole, true);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, extensions, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, extensions, DocumentationRole, QStringLiteral("References the Extensions that specify additional properties of the metaclass. The property is derived from the extensions whose memberEnds are typed by the Class."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, extensions, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, extensions, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, extensions, OppositeEndRole, QStringLiteral("Extension-metaclass"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, isAbstract, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, isAbstract, PropertyClassRole, QStringLiteral("QUmlClass"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, isAbstract, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, isAbstract, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, isAbstract, DocumentationRole, QStringLiteral("If true, the Classifier does not provide a complete declaration and can typically not be instantiated. An abstract classifier is intended to be used by other classifiers e.g. as the target of general metarelationships or generalization relationships.True when a class is abstract."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, isAbstract, RedefinedPropertiesRole, QStringLiteral("Classifier-isAbstract"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, isAbstract, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, isAbstract, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, isActive, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, isActive, PropertyClassRole, QStringLiteral("QUmlClass"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, isActive, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, isActive, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, isActive, DocumentationRole, QStringLiteral("Determines whether an object specified by this class is active or not. If true, then the owning class is referred to as an active class. If false, then such a class is referred to as a passive class."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, isActive, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, isActive, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, isActive, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, nestedClassifiers, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, nestedClassifiers, PropertyClassRole, QStringLiteral("QUmlClass"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, nestedClassifiers, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, nestedClassifiers, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, nestedClassifiers, DocumentationRole, QStringLiteral("References all the Classifiers that are defined (nested) within the Class."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, nestedClassifiers, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, nestedClassifiers, SubsettedPropertiesRole, QStringLiteral("A_redefinitionContext_redefinableElement-redefinableElement Namespace-ownedMember"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, nestedClassifiers, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, ownedAttributes, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, ownedAttributes, PropertyClassRole, QStringLiteral("QUmlClass"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, ownedAttributes, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, ownedAttributes, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, ownedAttributes, DocumentationRole, QStringLiteral("The attributes (i.e. the properties) owned by the class."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, ownedAttributes, RedefinedPropertiesRole, QStringLiteral("StructuredClassifier-ownedAttribute"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, ownedAttributes, SubsettedPropertiesRole, QStringLiteral("Namespace-ownedMember Classifier-attribute"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, ownedAttributes, OppositeEndRole, QStringLiteral("Property-class"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, ownedOperations, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, ownedOperations, PropertyClassRole, QStringLiteral("QUmlClass"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, ownedOperations, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, ownedOperations, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, ownedOperations, DocumentationRole, QStringLiteral("The operations owned by the class."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, ownedOperations, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, ownedOperations, SubsettedPropertiesRole, QStringLiteral("Classifier-feature A_redefinitionContext_redefinableElement-redefinableElement Namespace-ownedMember"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, ownedOperations, OppositeEndRole, QStringLiteral("Operation-class"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, ownedReceptions, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, ownedReceptions, PropertyClassRole, QStringLiteral("QUmlClass"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, ownedReceptions, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, ownedReceptions, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, ownedReceptions, DocumentationRole, QStringLiteral("Receptions that objects of this class are willing to accept."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, ownedReceptions, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, ownedReceptions, SubsettedPropertiesRole, QStringLiteral("Classifier-feature Namespace-ownedMember"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, ownedReceptions, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, superClasses, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, superClasses, PropertyClassRole, QStringLiteral("QUmlClass"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, superClasses, IsDerivedRole, true);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, superClasses, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, superClasses, DocumentationRole, QStringLiteral("This gives the superclasses of a class."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, superClasses, RedefinedPropertiesRole, QStringLiteral("Classifier-general"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, superClasses, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClass, superClasses, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlclassobject_p.h b/src/uml/qobjects/qumlclassobject_p.h
index 37b972a7..5b8a5416 100644
--- a/src/uml/qobjects/qumlclassobject_p.h
+++ b/src/uml/qobjects/qumlclassobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlClass;
-class Q_UML_EXPORT QUmlClassObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlClassObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlClassObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -135,7 +138,7 @@ class Q_UML_EXPORT QUmlClassObject : public QObject
     Q_PROPERTY(QSet<QObject *> superClasses READ superClasses STORED false)
 
 public:
-    Q_INVOKABLE explicit QUmlClassObject(QUmlClass *qModelingObject);
+    Q_INVOKABLE explicit QUmlClassObject(QUmlClass *qModelingElement);
     virtual ~QUmlClassObject();
 
     // Owned attributes [Element]
@@ -372,6 +375,10 @@ public Q_SLOTS:
     void removeOwnedReception(QObject *ownedReception);
     void addSuperClass(QObject *superClass);
     void removeSuperClass(QObject *superClass);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlclauseobject.cpp b/src/uml/qobjects/qumlclauseobject.cpp
index 90c96e11..24aab9b0 100644
--- a/src/uml/qobjects/qumlclauseobject.cpp
+++ b/src/uml/qobjects/qumlclauseobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlclauseobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlClause>
 #include <QtUml/QUmlComment>
@@ -48,16 +49,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlClauseObject::QUmlClauseObject(QUmlClause *qModelingObject)
+QUmlClauseObject::QUmlClauseObject(QUmlClause *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlClauseObject::~QUmlClauseObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlClause *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlClause *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -66,25 +69,25 @@ QUmlClauseObject::~QUmlClauseObject()
 const QSet<QObject *> QUmlClauseObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlClause *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlClause *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClauseObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlClause *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlClause *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlClauseObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClause *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlClause *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClause *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClause *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [Clause]
@@ -92,48 +95,48 @@ QObject *QUmlClauseObject::owner() const
 const QSet<QObject *> QUmlClauseObject::bodies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExecutableNode *element, qmodelingobjectproperty_cast<QUmlClause *>(this)->bodies())
-        set.insert(element->asQObject());
+    foreach (QUmlExecutableNode *element, qmodelingelementproperty_cast<QUmlClause *>(this)->bodies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlClauseObject::bodyOutputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlClause *>(this)->bodyOutputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlClause *>(this)->bodyOutputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 QObject *QUmlClauseObject::decider() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClause *>(this)->decider())
+    if (!qmodelingelementproperty_cast<QUmlClause *>(this)->decider())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClause *>(this)->decider()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClause *>(this)->decider()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlClauseObject::predecessorClauses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClause *element, qmodelingobjectproperty_cast<QUmlClause *>(this)->predecessorClauses())
-        set.insert(element->asQObject());
+    foreach (QUmlClause *element, qmodelingelementproperty_cast<QUmlClause *>(this)->predecessorClauses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClauseObject::successorClauses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClause *element, qmodelingobjectproperty_cast<QUmlClause *>(this)->successorClauses())
-        set.insert(element->asQObject());
+    foreach (QUmlClause *element, qmodelingelementproperty_cast<QUmlClause *>(this)->successorClauses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClauseObject::tests() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExecutableNode *element, qmodelingobjectproperty_cast<QUmlClause *>(this)->tests())
-        set.insert(element->asQObject());
+    foreach (QUmlExecutableNode *element, qmodelingelementproperty_cast<QUmlClause *>(this)->tests())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -142,98 +145,179 @@ const QSet<QObject *> QUmlClauseObject::tests() const
 QSet<QObject *> QUmlClauseObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlClause *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlClause *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlClauseObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlClause *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlClause *>(this)->mustBeOwned();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlClauseObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlClause *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlClause *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlClauseObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlClause *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlClause *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlClauseObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlClause *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlClause *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlClauseObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlClause *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlClause *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlClauseObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlClause *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlClause *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Clause]
 
 void QUmlClauseObject::addBody(QObject *body)
 {
-    qmodelingobjectproperty_cast<QUmlClause *>(this)->addBody(qmodelingobjectproperty_cast<QUmlExecutableNode *>(body));
+    qmodelingelementproperty_cast<QUmlClause *>(this)->addBody(qmodelingelementproperty_cast<QUmlExecutableNode *>(body));
 }
 
 void QUmlClauseObject::removeBody(QObject *body)
 {
-    qmodelingobjectproperty_cast<QUmlClause *>(this)->removeBody(qmodelingobjectproperty_cast<QUmlExecutableNode *>(body));
+    qmodelingelementproperty_cast<QUmlClause *>(this)->removeBody(qmodelingelementproperty_cast<QUmlExecutableNode *>(body));
 }
 
 void QUmlClauseObject::addBodyOutput(QObject *bodyOutput)
 {
-    qmodelingobjectproperty_cast<QUmlClause *>(this)->addBodyOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(bodyOutput));
+    qmodelingelementproperty_cast<QUmlClause *>(this)->addBodyOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(bodyOutput));
 }
 
 void QUmlClauseObject::removeBodyOutput(QObject *bodyOutput)
 {
-    qmodelingobjectproperty_cast<QUmlClause *>(this)->removeBodyOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(bodyOutput));
+    qmodelingelementproperty_cast<QUmlClause *>(this)->removeBodyOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(bodyOutput));
 }
 
 void QUmlClauseObject::setDecider(QObject *decider)
 {
-    qmodelingobjectproperty_cast<QUmlClause *>(this)->setDecider(qmodelingobjectproperty_cast<QUmlOutputPin *>(decider));
+    qmodelingelementproperty_cast<QUmlClause *>(this)->setDecider(qmodelingelementproperty_cast<QUmlOutputPin *>(decider));
 }
 
 void QUmlClauseObject::addPredecessorClause(QObject *predecessorClause)
 {
-    qmodelingobjectproperty_cast<QUmlClause *>(this)->addPredecessorClause(qmodelingobjectproperty_cast<QUmlClause *>(predecessorClause));
+    qmodelingelementproperty_cast<QUmlClause *>(this)->addPredecessorClause(qmodelingelementproperty_cast<QUmlClause *>(predecessorClause));
 }
 
 void QUmlClauseObject::removePredecessorClause(QObject *predecessorClause)
 {
-    qmodelingobjectproperty_cast<QUmlClause *>(this)->removePredecessorClause(qmodelingobjectproperty_cast<QUmlClause *>(predecessorClause));
+    qmodelingelementproperty_cast<QUmlClause *>(this)->removePredecessorClause(qmodelingelementproperty_cast<QUmlClause *>(predecessorClause));
 }
 
 void QUmlClauseObject::addSuccessorClause(QObject *successorClause)
 {
-    qmodelingobjectproperty_cast<QUmlClause *>(this)->addSuccessorClause(qmodelingobjectproperty_cast<QUmlClause *>(successorClause));
+    qmodelingelementproperty_cast<QUmlClause *>(this)->addSuccessorClause(qmodelingelementproperty_cast<QUmlClause *>(successorClause));
 }
 
 void QUmlClauseObject::removeSuccessorClause(QObject *successorClause)
 {
-    qmodelingobjectproperty_cast<QUmlClause *>(this)->removeSuccessorClause(qmodelingobjectproperty_cast<QUmlClause *>(successorClause));
+    qmodelingelementproperty_cast<QUmlClause *>(this)->removeSuccessorClause(qmodelingelementproperty_cast<QUmlClause *>(successorClause));
 }
 
 void QUmlClauseObject::addTest(QObject *test)
 {
-    qmodelingobjectproperty_cast<QUmlClause *>(this)->addTest(qmodelingobjectproperty_cast<QUmlExecutableNode *>(test));
+    qmodelingelementproperty_cast<QUmlClause *>(this)->addTest(qmodelingelementproperty_cast<QUmlExecutableNode *>(test));
 }
 
 void QUmlClauseObject::removeTest(QObject *test)
 {
-    qmodelingobjectproperty_cast<QUmlClause *>(this)->removeTest(qmodelingobjectproperty_cast<QUmlExecutableNode *>(test));
+    qmodelingelementproperty_cast<QUmlClause *>(this)->removeTest(qmodelingelementproperty_cast<QUmlExecutableNode *>(test));
+}
+
+
+void QUmlClauseObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClause");
+    d->groupProperties.insert(QStringLiteral("QUmlClause"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("bodies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClause"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("bodyOutputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClause"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("decider"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClause"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("predecessorClauses"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClause"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("successorClauses"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClause"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("tests"))));
+}
+
+void QUmlClauseObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, bodies, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, bodies, PropertyClassRole, QStringLiteral("QUmlClause"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, bodies, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, bodies, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, bodies, DocumentationRole, QStringLiteral("A nested activity fragment that is executed if the test evaluates to true and the clause is chosen over any concurrent clauses that also evaluate to true."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, bodies, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, bodies, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, bodies, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, bodyOutputs, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, bodyOutputs, PropertyClassRole, QStringLiteral("QUmlClause"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, bodyOutputs, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, bodyOutputs, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, bodyOutputs, DocumentationRole, QStringLiteral("A list of output pins within the body fragment whose values are moved to the result pins of the containing conditional node after execution of the clause body."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, bodyOutputs, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, bodyOutputs, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, bodyOutputs, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, decider, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, decider, PropertyClassRole, QStringLiteral("QUmlClause"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, decider, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, decider, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, decider, DocumentationRole, QStringLiteral("An output pin within the test fragment the value of which is examined after execution of the test to determine whether the body should be executed."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, decider, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, decider, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, decider, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, predecessorClauses, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, predecessorClauses, PropertyClassRole, QStringLiteral("QUmlClause"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, predecessorClauses, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, predecessorClauses, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, predecessorClauses, DocumentationRole, QStringLiteral("A set of clauses whose tests must all evaluate false before the current clause can be tested."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, predecessorClauses, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, predecessorClauses, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, predecessorClauses, OppositeEndRole, QStringLiteral("Clause-successorClause"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, successorClauses, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, successorClauses, PropertyClassRole, QStringLiteral("QUmlClause"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, successorClauses, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, successorClauses, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, successorClauses, DocumentationRole, QStringLiteral("A set of clauses which may not be tested unless the current clause tests false."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, successorClauses, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, successorClauses, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, successorClauses, OppositeEndRole, QStringLiteral("Clause-predecessorClause"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, tests, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, tests, PropertyClassRole, QStringLiteral("QUmlClause"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, tests, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, tests, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, tests, DocumentationRole, QStringLiteral("A nested activity fragment with a designated output pin that specifies the result of the test."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, tests, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, tests, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClause, tests, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlclauseobject_p.h b/src/uml/qobjects/qumlclauseobject_p.h
index 9afbc25c..e43336ec 100644
--- a/src/uml/qobjects/qumlclauseobject_p.h
+++ b/src/uml/qobjects/qumlclauseobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 QT_BEGIN_HEADER
 
@@ -52,9 +52,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlClause;
-class Q_UML_EXPORT QUmlClauseObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlClauseObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlClauseObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -70,7 +73,7 @@ class Q_UML_EXPORT QUmlClauseObject : public QObject
     Q_PROPERTY(QSet<QObject *> tests READ tests)
 
 public:
-    Q_INVOKABLE explicit QUmlClauseObject(QUmlClause *qModelingObject);
+    Q_INVOKABLE explicit QUmlClauseObject(QUmlClause *qModelingElement);
     virtual ~QUmlClauseObject();
 
     // Owned attributes [Element]
@@ -111,6 +114,10 @@ public Q_SLOTS:
     void removeSuccessorClause(QObject *successorClause);
     void addTest(QObject *test);
     void removeTest(QObject *test);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlclearassociationactionobject.cpp b/src/uml/qobjects/qumlclearassociationactionobject.cpp
index 0731e607..954f2c3c 100644
--- a/src/uml/qobjects/qumlclearassociationactionobject.cpp
+++ b/src/uml/qobjects/qumlclearassociationactionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlclearassociationactionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlClearAssociationAction>
 #include <QtUml/QUmlActivity>
@@ -65,16 +66,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlClearAssociationActionObject::QUmlClearAssociationActionObject(QUmlClearAssociationAction *qModelingObject)
+QUmlClearAssociationActionObject::QUmlClearAssociationActionObject(QUmlClearAssociationAction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlClearAssociationActionObject::~QUmlClearAssociationActionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -83,25 +86,25 @@ QUmlClearAssociationActionObject::~QUmlClearAssociationActionObject()
 const QSet<QObject *> QUmlClearAssociationActionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClearAssociationActionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlClearAssociationActionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -109,62 +112,62 @@ QObject *QUmlClearAssociationActionObject::owner() const
 const QSet<QObject *> QUmlClearAssociationActionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlClearAssociationActionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->name();
 }
 
 QObject *QUmlClearAssociationActionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlClearAssociationActionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlClearAssociationActionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlClearAssociationActionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlClearAssociationActionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlClearAssociationActionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClearAssociationActionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -172,65 +175,65 @@ const QSet<QObject *> QUmlClearAssociationActionObject::redefinitionContexts() c
 
 QObject *QUmlClearAssociationActionObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlClearAssociationActionObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClearAssociationActionObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClearAssociationActionObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlClearAssociationActionObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlClearAssociationActionObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClearAssociationActionObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClearAssociationActionObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -239,8 +242,8 @@ const QSet<QObject *> QUmlClearAssociationActionObject::redefinedNodes() const
 const QSet<QObject *> QUmlClearAssociationActionObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -248,46 +251,46 @@ const QSet<QObject *> QUmlClearAssociationActionObject::handlers() const
 
 QObject *QUmlClearAssociationActionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlClearAssociationActionObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlClearAssociationActionObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlClearAssociationActionObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClearAssociationActionObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlClearAssociationActionObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -295,18 +298,18 @@ const QList<QObject *> QUmlClearAssociationActionObject::outputs() const
 
 QObject *QUmlClearAssociationActionObject::association() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->association())
+    if (!qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->association())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->association()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->association()->asQModelingObject();
 }
 
 QObject *QUmlClearAssociationActionObject::object() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->object())
+    if (!qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->object())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->object()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->object()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -314,14 +317,14 @@ QObject *QUmlClearAssociationActionObject::object() const
 QSet<QObject *> QUmlClearAssociationActionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlClearAssociationActionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -329,288 +332,365 @@ bool QUmlClearAssociationActionObject::mustBeOwned() const
 QList<QObject *> QUmlClearAssociationActionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlClearAssociationActionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlClearAssociationActionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlClearAssociationActionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlClearAssociationActionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlClearAssociationActionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlClearAssociationActionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlClearAssociationActionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlClearAssociationActionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlClearAssociationActionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlClearAssociationActionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlClearAssociationActionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlClearAssociationActionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlClearAssociationActionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->setName(name);
 }
 
 void QUmlClearAssociationActionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlClearAssociationActionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlClearAssociationActionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlClearAssociationActionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlClearAssociationActionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlClearAssociationActionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlClearAssociationActionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlClearAssociationActionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlClearAssociationActionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlClearAssociationActionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlClearAssociationActionObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlClearAssociationActionObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlClearAssociationActionObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlClearAssociationActionObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlClearAssociationActionObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlClearAssociationActionObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlClearAssociationActionObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlClearAssociationActionObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlClearAssociationActionObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlClearAssociationActionObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlClearAssociationActionObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlClearAssociationActionObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlClearAssociationActionObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlClearAssociationActionObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlClearAssociationActionObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlClearAssociationActionObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlClearAssociationActionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlClearAssociationActionObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlClearAssociationActionObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlClearAssociationActionObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlClearAssociationActionObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlClearAssociationActionObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlClearAssociationActionObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlClearAssociationActionObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlClearAssociationActionObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlClearAssociationActionObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlClearAssociationActionObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ClearAssociationAction]
 
 void QUmlClearAssociationActionObject::setAssociation(QObject *association)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->setAssociation(qmodelingobjectproperty_cast<QUmlAssociation *>(association));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->setAssociation(qmodelingelementproperty_cast<QUmlAssociation *>(association));
 }
 
 void QUmlClearAssociationActionObject::setObject(QObject *object)
 {
-    qmodelingobjectproperty_cast<QUmlClearAssociationAction *>(this)->setObject(qmodelingobjectproperty_cast<QUmlInputPin *>(object));
+    qmodelingelementproperty_cast<QUmlClearAssociationAction *>(this)->setObject(qmodelingelementproperty_cast<QUmlInputPin *>(object));
+}
+
+
+void QUmlClearAssociationActionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClearAssociationAction");
+    d->groupProperties.insert(QStringLiteral("QUmlClearAssociationAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("association"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClearAssociationAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("object"))));
+}
+
+void QUmlClearAssociationActionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClearAssociationAction, association, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClearAssociationAction, association, PropertyClassRole, QStringLiteral("QUmlClearAssociationAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClearAssociationAction, association, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClearAssociationAction, association, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClearAssociationAction, association, DocumentationRole, QStringLiteral("Association to be cleared."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClearAssociationAction, association, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClearAssociationAction, association, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClearAssociationAction, association, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClearAssociationAction, object, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClearAssociationAction, object, PropertyClassRole, QStringLiteral("QUmlClearAssociationAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClearAssociationAction, object, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClearAssociationAction, object, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClearAssociationAction, object, DocumentationRole, QStringLiteral("Gives the input pin from which is obtained the object whose participation in the association is to be cleared."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClearAssociationAction, object, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClearAssociationAction, object, SubsettedPropertiesRole, QStringLiteral("Action-input"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClearAssociationAction, object, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlclearassociationactionobject_p.h b/src/uml/qobjects/qumlclearassociationactionobject_p.h
index 7fcb337e..aa63e4f2 100644
--- a/src/uml/qobjects/qumlclearassociationactionobject_p.h
+++ b/src/uml/qobjects/qumlclearassociationactionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlClearAssociationAction;
-class Q_UML_EXPORT QUmlClearAssociationActionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlClearAssociationActionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlClearAssociationActionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -102,7 +105,7 @@ class Q_UML_EXPORT QUmlClearAssociationActionObject : public QObject
     Q_PROPERTY(QObject * object READ object WRITE setObject)
 
 public:
-    Q_INVOKABLE explicit QUmlClearAssociationActionObject(QUmlClearAssociationAction *qModelingObject);
+    Q_INVOKABLE explicit QUmlClearAssociationActionObject(QUmlClearAssociationAction *qModelingElement);
     virtual ~QUmlClearAssociationActionObject();
 
     // Owned attributes [Element]
@@ -224,6 +227,10 @@ public Q_SLOTS:
     // Slots for owned attributes [ClearAssociationAction]
     void setAssociation(QObject *association = 0);
     void setObject(QObject *object = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlclearstructuralfeatureactionobject.cpp b/src/uml/qobjects/qumlclearstructuralfeatureactionobject.cpp
index dab7694b..1294ca9c 100644
--- a/src/uml/qobjects/qumlclearstructuralfeatureactionobject.cpp
+++ b/src/uml/qobjects/qumlclearstructuralfeatureactionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlclearstructuralfeatureactionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlClearStructuralFeatureAction>
 #include <QtUml/QUmlActivity>
@@ -65,16 +66,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlClearStructuralFeatureActionObject::QUmlClearStructuralFeatureActionObject(QUmlClearStructuralFeatureAction *qModelingObject)
+QUmlClearStructuralFeatureActionObject::QUmlClearStructuralFeatureActionObject(QUmlClearStructuralFeatureAction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlClearStructuralFeatureActionObject::~QUmlClearStructuralFeatureActionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -83,25 +86,25 @@ QUmlClearStructuralFeatureActionObject::~QUmlClearStructuralFeatureActionObject(
 const QSet<QObject *> QUmlClearStructuralFeatureActionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClearStructuralFeatureActionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlClearStructuralFeatureActionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -109,62 +112,62 @@ QObject *QUmlClearStructuralFeatureActionObject::owner() const
 const QSet<QObject *> QUmlClearStructuralFeatureActionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlClearStructuralFeatureActionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->name();
 }
 
 QObject *QUmlClearStructuralFeatureActionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlClearStructuralFeatureActionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlClearStructuralFeatureActionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlClearStructuralFeatureActionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlClearStructuralFeatureActionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlClearStructuralFeatureActionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClearStructuralFeatureActionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -172,65 +175,65 @@ const QSet<QObject *> QUmlClearStructuralFeatureActionObject::redefinitionContex
 
 QObject *QUmlClearStructuralFeatureActionObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlClearStructuralFeatureActionObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClearStructuralFeatureActionObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClearStructuralFeatureActionObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlClearStructuralFeatureActionObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlClearStructuralFeatureActionObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClearStructuralFeatureActionObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClearStructuralFeatureActionObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -239,8 +242,8 @@ const QSet<QObject *> QUmlClearStructuralFeatureActionObject::redefinedNodes() c
 const QSet<QObject *> QUmlClearStructuralFeatureActionObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -248,46 +251,46 @@ const QSet<QObject *> QUmlClearStructuralFeatureActionObject::handlers() const
 
 QObject *QUmlClearStructuralFeatureActionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlClearStructuralFeatureActionObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlClearStructuralFeatureActionObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlClearStructuralFeatureActionObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClearStructuralFeatureActionObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlClearStructuralFeatureActionObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -295,28 +298,28 @@ const QList<QObject *> QUmlClearStructuralFeatureActionObject::outputs() const
 
 QObject *QUmlClearStructuralFeatureActionObject::object() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->object())
+    if (!qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->object())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->object()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->object()->asQModelingObject();
 }
 
 QObject *QUmlClearStructuralFeatureActionObject::structuralFeature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->structuralFeature())
+    if (!qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->structuralFeature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->structuralFeature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->structuralFeature()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ClearStructuralFeatureAction]
 
 QObject *QUmlClearStructuralFeatureActionObject::result() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->result())
+    if (!qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->result())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->result()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->result()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -324,14 +327,14 @@ QObject *QUmlClearStructuralFeatureActionObject::result() const
 QSet<QObject *> QUmlClearStructuralFeatureActionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlClearStructuralFeatureActionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -339,295 +342,366 @@ bool QUmlClearStructuralFeatureActionObject::mustBeOwned() const
 QList<QObject *> QUmlClearStructuralFeatureActionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlClearStructuralFeatureActionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlClearStructuralFeatureActionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlClearStructuralFeatureActionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlClearStructuralFeatureActionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlClearStructuralFeatureActionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlClearStructuralFeatureActionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlClearStructuralFeatureActionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlClearStructuralFeatureActionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlClearStructuralFeatureActionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlClearStructuralFeatureActionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlClearStructuralFeatureActionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlClearStructuralFeatureActionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlClearStructuralFeatureActionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->setName(name);
 }
 
 void QUmlClearStructuralFeatureActionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlClearStructuralFeatureActionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlClearStructuralFeatureActionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlClearStructuralFeatureActionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlClearStructuralFeatureActionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlClearStructuralFeatureActionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlClearStructuralFeatureActionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlClearStructuralFeatureActionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlClearStructuralFeatureActionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlClearStructuralFeatureActionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlClearStructuralFeatureActionObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlClearStructuralFeatureActionObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlClearStructuralFeatureActionObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlClearStructuralFeatureActionObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlClearStructuralFeatureActionObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlClearStructuralFeatureActionObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlClearStructuralFeatureActionObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlClearStructuralFeatureActionObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlClearStructuralFeatureActionObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlClearStructuralFeatureActionObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlClearStructuralFeatureActionObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlClearStructuralFeatureActionObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlClearStructuralFeatureActionObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlClearStructuralFeatureActionObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlClearStructuralFeatureActionObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlClearStructuralFeatureActionObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlClearStructuralFeatureActionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlClearStructuralFeatureActionObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlClearStructuralFeatureActionObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlClearStructuralFeatureActionObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlClearStructuralFeatureActionObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlClearStructuralFeatureActionObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlClearStructuralFeatureActionObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlClearStructuralFeatureActionObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlClearStructuralFeatureActionObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlClearStructuralFeatureActionObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlClearStructuralFeatureActionObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [StructuralFeatureAction]
 
 void QUmlClearStructuralFeatureActionObject::setObject(QObject *object)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->setObject(qmodelingobjectproperty_cast<QUmlInputPin *>(object));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->setObject(qmodelingelementproperty_cast<QUmlInputPin *>(object));
 }
 
 void QUmlClearStructuralFeatureActionObject::setStructuralFeature(QObject *structuralFeature)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->setStructuralFeature(qmodelingobjectproperty_cast<QUmlStructuralFeature *>(structuralFeature));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->setStructuralFeature(qmodelingelementproperty_cast<QUmlStructuralFeature *>(structuralFeature));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ClearStructuralFeatureAction]
 
 void QUmlClearStructuralFeatureActionObject::setResult(QObject *result)
 {
-    qmodelingobjectproperty_cast<QUmlClearStructuralFeatureAction *>(this)->setResult(qmodelingobjectproperty_cast<QUmlOutputPin *>(result));
+    qmodelingelementproperty_cast<QUmlClearStructuralFeatureAction *>(this)->setResult(qmodelingelementproperty_cast<QUmlOutputPin *>(result));
+}
+
+
+void QUmlClearStructuralFeatureActionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlStructuralFeatureAction");
+    d->groupProperties.insert(QStringLiteral("QUmlStructuralFeatureAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("object"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuralFeatureAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("structuralFeature"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClearStructuralFeatureAction");
+    d->groupProperties.insert(QStringLiteral("QUmlClearStructuralFeatureAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("result"))));
+}
+
+void QUmlClearStructuralFeatureActionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClearStructuralFeatureAction, result, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClearStructuralFeatureAction, result, PropertyClassRole, QStringLiteral("QUmlClearStructuralFeatureAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClearStructuralFeatureAction, result, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClearStructuralFeatureAction, result, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClearStructuralFeatureAction, result, DocumentationRole, QStringLiteral("Gives the output pin on which the result is put."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClearStructuralFeatureAction, result, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClearStructuralFeatureAction, result, SubsettedPropertiesRole, QStringLiteral("Action-output"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlClearStructuralFeatureAction, result, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlclearstructuralfeatureactionobject_p.h b/src/uml/qobjects/qumlclearstructuralfeatureactionobject_p.h
index 5ab43ee6..701abb79 100644
--- a/src/uml/qobjects/qumlclearstructuralfeatureactionobject_p.h
+++ b/src/uml/qobjects/qumlclearstructuralfeatureactionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlClearStructuralFeatureAction;
-class Q_UML_EXPORT QUmlClearStructuralFeatureActionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlClearStructuralFeatureActionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlClearStructuralFeatureActionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -105,7 +108,7 @@ class Q_UML_EXPORT QUmlClearStructuralFeatureActionObject : public QObject
     Q_PROPERTY(QObject * result READ result WRITE setResult)
 
 public:
-    Q_INVOKABLE explicit QUmlClearStructuralFeatureActionObject(QUmlClearStructuralFeatureAction *qModelingObject);
+    Q_INVOKABLE explicit QUmlClearStructuralFeatureActionObject(QUmlClearStructuralFeatureAction *qModelingElement);
     virtual ~QUmlClearStructuralFeatureActionObject();
 
     // Owned attributes [Element]
@@ -233,6 +236,10 @@ public Q_SLOTS:
 
     // Slots for owned attributes [ClearStructuralFeatureAction]
     void setResult(QObject *result = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlclearvariableactionobject.cpp b/src/uml/qobjects/qumlclearvariableactionobject.cpp
index d9b0e615..d7b2b6d8 100644
--- a/src/uml/qobjects/qumlclearvariableactionobject.cpp
+++ b/src/uml/qobjects/qumlclearvariableactionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlclearvariableactionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlClearVariableAction>
 #include <QtUml/QUmlActivity>
@@ -65,16 +66,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlClearVariableActionObject::QUmlClearVariableActionObject(QUmlClearVariableAction *qModelingObject)
+QUmlClearVariableActionObject::QUmlClearVariableActionObject(QUmlClearVariableAction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlClearVariableActionObject::~QUmlClearVariableActionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -83,25 +86,25 @@ QUmlClearVariableActionObject::~QUmlClearVariableActionObject()
 const QSet<QObject *> QUmlClearVariableActionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClearVariableActionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlClearVariableActionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -109,62 +112,62 @@ QObject *QUmlClearVariableActionObject::owner() const
 const QSet<QObject *> QUmlClearVariableActionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlClearVariableActionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->name();
 }
 
 QObject *QUmlClearVariableActionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlClearVariableActionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlClearVariableActionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlClearVariableActionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlClearVariableActionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlClearVariableActionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClearVariableActionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -172,65 +175,65 @@ const QSet<QObject *> QUmlClearVariableActionObject::redefinitionContexts() cons
 
 QObject *QUmlClearVariableActionObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlClearVariableActionObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClearVariableActionObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClearVariableActionObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlClearVariableActionObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlClearVariableActionObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClearVariableActionObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClearVariableActionObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -239,8 +242,8 @@ const QSet<QObject *> QUmlClearVariableActionObject::redefinedNodes() const
 const QSet<QObject *> QUmlClearVariableActionObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -248,46 +251,46 @@ const QSet<QObject *> QUmlClearVariableActionObject::handlers() const
 
 QObject *QUmlClearVariableActionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlClearVariableActionObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlClearVariableActionObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlClearVariableActionObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlClearVariableActionObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlClearVariableActionObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -295,10 +298,10 @@ const QList<QObject *> QUmlClearVariableActionObject::outputs() const
 
 QObject *QUmlClearVariableActionObject::variable() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->variable())
+    if (!qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->variable())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->variable()->asQObject();
+        return qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->variable()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -306,14 +309,14 @@ QObject *QUmlClearVariableActionObject::variable() const
 QSet<QObject *> QUmlClearVariableActionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlClearVariableActionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -321,283 +324,343 @@ bool QUmlClearVariableActionObject::mustBeOwned() const
 QList<QObject *> QUmlClearVariableActionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlClearVariableActionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlClearVariableActionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlClearVariableActionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlClearVariableActionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlClearVariableActionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlClearVariableActionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlClearVariableActionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlClearVariableActionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlClearVariableActionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlClearVariableActionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlClearVariableActionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlClearVariableActionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlClearVariableActionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->setName(name);
 }
 
 void QUmlClearVariableActionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlClearVariableActionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlClearVariableActionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlClearVariableActionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlClearVariableActionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlClearVariableActionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlClearVariableActionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlClearVariableActionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlClearVariableActionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlClearVariableActionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlClearVariableActionObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlClearVariableActionObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlClearVariableActionObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlClearVariableActionObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlClearVariableActionObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlClearVariableActionObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlClearVariableActionObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlClearVariableActionObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlClearVariableActionObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlClearVariableActionObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlClearVariableActionObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlClearVariableActionObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlClearVariableActionObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlClearVariableActionObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlClearVariableActionObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlClearVariableActionObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlClearVariableActionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlClearVariableActionObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlClearVariableActionObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlClearVariableActionObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlClearVariableActionObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlClearVariableActionObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlClearVariableActionObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlClearVariableActionObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlClearVariableActionObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlClearVariableActionObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlClearVariableActionObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [VariableAction]
 
 void QUmlClearVariableActionObject::setVariable(QObject *variable)
 {
-    qmodelingobjectproperty_cast<QUmlClearVariableAction *>(this)->setVariable(qmodelingobjectproperty_cast<QUmlVariable *>(variable));
+    qmodelingelementproperty_cast<QUmlClearVariableAction *>(this)->setVariable(qmodelingelementproperty_cast<QUmlVariable *>(variable));
+}
+
+
+void QUmlClearVariableActionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlVariableAction");
+    d->groupProperties.insert(QStringLiteral("QUmlVariableAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("variable"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClearVariableAction");
+}
+
+void QUmlClearVariableActionObject::setPropertyData()
+{
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlclearvariableactionobject_p.h b/src/uml/qobjects/qumlclearvariableactionobject_p.h
index f7abd586..a3fa7065 100644
--- a/src/uml/qobjects/qumlclearvariableactionobject_p.h
+++ b/src/uml/qobjects/qumlclearvariableactionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlClearVariableAction;
-class Q_UML_EXPORT QUmlClearVariableActionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlClearVariableActionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlClearVariableActionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -101,7 +104,7 @@ class Q_UML_EXPORT QUmlClearVariableActionObject : public QObject
     Q_PROPERTY(QObject * variable READ variable WRITE setVariable)
 
 public:
-    Q_INVOKABLE explicit QUmlClearVariableActionObject(QUmlClearVariableAction *qModelingObject);
+    Q_INVOKABLE explicit QUmlClearVariableActionObject(QUmlClearVariableAction *qModelingElement);
     virtual ~QUmlClearVariableActionObject();
 
     // Owned attributes [Element]
@@ -221,6 +224,10 @@ public Q_SLOTS:
 
     // Slots for owned attributes [VariableAction]
     void setVariable(QObject *variable = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlcollaborationobject.cpp b/src/uml/qobjects/qumlcollaborationobject.cpp
index 2567e53a..3372d8af 100644
--- a/src/uml/qobjects/qumlcollaborationobject.cpp
+++ b/src/uml/qobjects/qumlcollaborationobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlcollaborationobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlCollaboration>
 #include <QtUml/QUmlBehavior>
@@ -75,16 +76,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlCollaborationObject::QUmlCollaborationObject(QUmlCollaboration *qModelingObject)
+QUmlCollaborationObject::QUmlCollaborationObject(QUmlCollaboration *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlCollaborationObject::~QUmlCollaborationObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlCollaboration *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -93,25 +96,25 @@ QUmlCollaborationObject::~QUmlCollaborationObject()
 const QSet<QObject *> QUmlCollaborationObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCollaborationObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlCollaborationObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlCollaboration *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCollaboration *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -119,35 +122,35 @@ QObject *QUmlCollaborationObject::owner() const
 const QSet<QObject *> QUmlCollaborationObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlCollaborationObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlCollaboration *>(this)->name();
 }
 
 QObject *QUmlCollaborationObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlCollaboration *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCollaboration *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlCollaborationObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlCollaboration *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCollaboration *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlCollaborationObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlCollaboration *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [Namespace]
@@ -155,48 +158,48 @@ QString QUmlCollaborationObject::qualifiedName() const
 const QSet<QObject *> QUmlCollaborationObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCollaborationObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCollaborationObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCollaborationObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCollaborationObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCollaborationObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -204,49 +207,49 @@ const QSet<QObject *> QUmlCollaborationObject::packageImports() const
 
 QObject *QUmlCollaborationObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlCollaboration *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCollaboration *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlCollaborationObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlCollaboration *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Type]
 
 QObject *QUmlCollaborationObject::package() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->package())
+    if (!qmodelingelementproperty_cast<QUmlCollaboration *>(this)->package())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->package()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCollaboration *>(this)->package()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlCollaborationObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlCollaboration *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlCollaborationObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCollaborationObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -255,8 +258,8 @@ const QSet<QObject *> QUmlCollaborationObject::redefinitionContexts() const
 const QSet<QObject *> QUmlCollaborationObject::templateBindings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTemplateBinding *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->templateBindings())
-        set.insert(element->asQObject());
+    foreach (QUmlTemplateBinding *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->templateBindings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -265,122 +268,122 @@ const QSet<QObject *> QUmlCollaborationObject::templateBindings() const
 const QSet<QObject *> QUmlCollaborationObject::attributes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->attributes())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->attributes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCollaborationObject::collaborationUses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlCollaborationUse *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->collaborationUses())
-        set.insert(element->asQObject());
+    foreach (QUmlCollaborationUse *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->collaborationUses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCollaborationObject::features() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->features())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->features())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCollaborationObject::generals() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->generals())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->generals())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCollaborationObject::generalizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralization *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->generalizations())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralization *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->generalizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCollaborationObject::inheritedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->inheritedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->inheritedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlCollaborationObject::isAbstract() const
 {
-    return qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->isAbstract();
+    return qmodelingelementproperty_cast<QUmlCollaboration *>(this)->isAbstract();
 }
 
 bool QUmlCollaborationObject::isFinalSpecialization() const
 {
-    return qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->isFinalSpecialization();
+    return qmodelingelementproperty_cast<QUmlCollaboration *>(this)->isFinalSpecialization();
 }
 
 QObject *QUmlCollaborationObject::ownedTemplateSignature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->ownedTemplateSignature())
+    if (!qmodelingelementproperty_cast<QUmlCollaboration *>(this)->ownedTemplateSignature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->ownedTemplateSignature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCollaboration *>(this)->ownedTemplateSignature()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlCollaborationObject::ownedUseCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->ownedUseCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->ownedUseCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCollaborationObject::powertypeExtents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralizationSet *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->powertypeExtents())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralizationSet *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->powertypeExtents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCollaborationObject::redefinedClassifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->redefinedClassifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->redefinedClassifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlCollaborationObject::representation() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->representation())
+    if (!qmodelingelementproperty_cast<QUmlCollaboration *>(this)->representation())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->representation()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCollaboration *>(this)->representation()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlCollaborationObject::substitutions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlSubstitution *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->substitutions())
-        set.insert(element->asQObject());
+    foreach (QUmlSubstitution *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->substitutions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlCollaborationObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlCollaboration *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCollaboration *>(this)->templateParameter()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlCollaborationObject::useCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->useCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->useCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -389,32 +392,32 @@ const QSet<QObject *> QUmlCollaborationObject::useCases() const
 const QList<QObject *> QUmlCollaborationObject::ownedAttributes() const
 {
     QList<QObject *> list;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->ownedAttributes())
-        list.append(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->ownedAttributes())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QSet<QObject *> QUmlCollaborationObject::ownedConnectors() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConnector *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->ownedConnectors())
-        set.insert(element->asQObject());
+    foreach (QUmlConnector *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->ownedConnectors())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCollaborationObject::parts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->parts())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->parts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCollaborationObject::roles() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConnectableElement *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->roles())
-        set.insert(element->asQObject());
+    foreach (QUmlConnectableElement *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->roles())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -422,25 +425,25 @@ const QSet<QObject *> QUmlCollaborationObject::roles() const
 
 QObject *QUmlCollaborationObject::classifierBehavior() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->classifierBehavior())
+    if (!qmodelingelementproperty_cast<QUmlCollaboration *>(this)->classifierBehavior())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->classifierBehavior()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCollaboration *>(this)->classifierBehavior()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlCollaborationObject::interfaceRealizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterfaceRealization *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->interfaceRealizations())
-        set.insert(element->asQObject());
+    foreach (QUmlInterfaceRealization *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->interfaceRealizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCollaborationObject::ownedBehaviors() const
 {
     QSet<QObject *> set;
-    foreach (QUmlBehavior *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->ownedBehaviors())
-        set.insert(element->asQObject());
+    foreach (QUmlBehavior *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->ownedBehaviors())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -449,8 +452,8 @@ const QSet<QObject *> QUmlCollaborationObject::ownedBehaviors() const
 const QSet<QObject *> QUmlCollaborationObject::collaborationRoles() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConnectableElement *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->collaborationRoles())
-        set.insert(element->asQObject());
+    foreach (QUmlConnectableElement *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->collaborationRoles())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -459,14 +462,14 @@ const QSet<QObject *> QUmlCollaborationObject::collaborationRoles() const
 QSet<QObject *> QUmlCollaborationObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlCollaborationObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlCollaboration *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -474,27 +477,27 @@ bool QUmlCollaborationObject::mustBeOwned() const
 QList<QObject *> QUmlCollaborationObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlCollaborationObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlCollaborationObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlCollaboration *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlCollaborationObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlCollaboration *>(this)->separator();
 }
 
 // OPERATIONS [Namespace]
@@ -503,44 +506,44 @@ QSet<QObject *> QUmlCollaborationObject::excludeCollisions(QSet<QObject *> imps)
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlCollaborationObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlCollaboration *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlCollaborationObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlCollaborationObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlCollaboration *>(this)->membersAreDistinguishable();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlCollaborationObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlCollaboration *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlCollaborationObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlCollaboration *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [Type]
@@ -548,12 +551,12 @@ bool QUmlCollaborationObject::isTemplateParameter() const
 
 bool QUmlCollaborationObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlCollaboration *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlCollaborationObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlCollaboration *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [TemplateableElement]
@@ -561,8 +564,8 @@ bool QUmlCollaborationObject::isRedefinitionContextValid(QObject *redefined) con
 QSet<QObject *> QUmlCollaborationObject::parameterableElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterableElement *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->parameterableElements())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterableElement *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->parameterableElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -571,63 +574,63 @@ QSet<QObject *> QUmlCollaborationObject::parameterableElements() const
 QSet<QObject *> QUmlCollaborationObject::allFeatures() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->allFeatures())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->allFeatures())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlCollaborationObject::allParents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->allParents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->allParents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlCollaborationObject::conformsTo(QObject *other) const
 {
-    return qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->conformsTo(qmodelingobjectproperty_cast<QUmlClassifier *>(other));
+    return qmodelingelementproperty_cast<QUmlCollaboration *>(this)->conformsTo(qmodelingelementproperty_cast<QUmlClassifier *>(other));
 }
 
 bool QUmlCollaborationObject::hasVisibilityOf(QObject *n) const
 {
-    return qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->hasVisibilityOf(qmodelingobjectproperty_cast<QUmlNamedElement *>(n));
+    return qmodelingelementproperty_cast<QUmlCollaboration *>(this)->hasVisibilityOf(qmodelingelementproperty_cast<QUmlNamedElement *>(n));
 }
 
 QSet<QObject *> QUmlCollaborationObject::inherit(QSet<QObject *> inhs) const
 {
     QSet<QUmlNamedElement *> inhsConverted;
     foreach (QObject *object, inhs)
-        inhsConverted.insert(qmodelingobjectproperty_cast<QUmlNamedElement *>(object));
+        inhsConverted.insert(qmodelingelementproperty_cast<QUmlNamedElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->inherit(inhsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->inherit(inhsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlCollaborationObject::inheritableMembers(QObject *c) const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->inheritableMembers(qmodelingobjectproperty_cast<QUmlClassifier *>(c)))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->inheritableMembers(qmodelingelementproperty_cast<QUmlClassifier *>(c)))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlCollaborationObject::isTemplate() const
 {
-    return qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->isTemplate();
+    return qmodelingelementproperty_cast<QUmlCollaboration *>(this)->isTemplate();
 }
 
 bool QUmlCollaborationObject::maySpecializeType(QObject *c) const
 {
-    return qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->maySpecializeType(qmodelingobjectproperty_cast<QUmlClassifier *>(c));
+    return qmodelingelementproperty_cast<QUmlCollaboration *>(this)->maySpecializeType(qmodelingelementproperty_cast<QUmlClassifier *>(c));
 }
 
 QSet<QObject *> QUmlCollaborationObject::parents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->parents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlCollaboration *>(this)->parents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -635,417 +638,513 @@ QSet<QObject *> QUmlCollaborationObject::parents() const
 
 void QUmlCollaborationObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlCollaborationObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlCollaborationObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlCollaborationObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlCollaborationObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlCollaborationObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlCollaborationObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlCollaborationObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->setName(name);
 }
 
 void QUmlCollaborationObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlCollaborationObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlCollaborationObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlCollaborationObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlCollaborationObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlCollaborationObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlCollaborationObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlCollaborationObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlCollaborationObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlCollaborationObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlCollaborationObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlCollaborationObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlCollaborationObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlCollaborationObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlCollaborationObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlCollaborationObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlCollaborationObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->setVisibility(visibility);
 }
 
 void QUmlCollaborationObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Type]
 
 void QUmlCollaborationObject::setPackage(QObject *package)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->setPackage(qmodelingobjectproperty_cast<QUmlPackage *>(package));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->setPackage(qmodelingelementproperty_cast<QUmlPackage *>(package));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlCollaborationObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlCollaborationObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlCollaborationObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlCollaborationObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlCollaborationObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlCollaborationObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateableElement]
 
 void QUmlCollaborationObject::addTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->addTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->addTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 void QUmlCollaborationObject::removeTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->removeTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->removeTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Classifier]
 
 void QUmlCollaborationObject::addAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->addAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->addAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlCollaborationObject::removeAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->removeAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->removeAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlCollaborationObject::addCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->addCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->addCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlCollaborationObject::removeCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->removeCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->removeCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlCollaborationObject::addFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->addFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->addFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlCollaborationObject::removeFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->removeFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->removeFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlCollaborationObject::addGeneral(QObject *general)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->addGeneral(qmodelingobjectproperty_cast<QUmlClassifier *>(general));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->addGeneral(qmodelingelementproperty_cast<QUmlClassifier *>(general));
 }
 
 void QUmlCollaborationObject::removeGeneral(QObject *general)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->removeGeneral(qmodelingobjectproperty_cast<QUmlClassifier *>(general));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->removeGeneral(qmodelingelementproperty_cast<QUmlClassifier *>(general));
 }
 
 void QUmlCollaborationObject::addGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->addGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->addGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlCollaborationObject::removeGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->removeGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->removeGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlCollaborationObject::addInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->addInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->addInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlCollaborationObject::removeInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->removeInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->removeInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlCollaborationObject::setAbstract(bool isAbstract)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->setAbstract(isAbstract);
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->setAbstract(isAbstract);
 }
 
 void QUmlCollaborationObject::unsetAbstract()
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("abstract"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
 void QUmlCollaborationObject::setFinalSpecialization(bool isFinalSpecialization)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->setFinalSpecialization(isFinalSpecialization);
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->setFinalSpecialization(isFinalSpecialization);
 }
 
 void QUmlCollaborationObject::unsetFinalSpecialization()
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("finalSpecialization"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
 void QUmlCollaborationObject::setOwnedTemplateSignature(QObject *ownedTemplateSignature)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->setOwnedTemplateSignature(qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->setOwnedTemplateSignature(qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
 }
 
 void QUmlCollaborationObject::addOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->addOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->addOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlCollaborationObject::removeOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->removeOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->removeOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlCollaborationObject::addPowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->addPowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->addPowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlCollaborationObject::removePowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->removePowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->removePowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlCollaborationObject::addRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->addRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->addRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlCollaborationObject::removeRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->removeRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->removeRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlCollaborationObject::setRepresentation(QObject *representation)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->setRepresentation(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(representation));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->setRepresentation(qmodelingelementproperty_cast<QUmlCollaborationUse *>(representation));
 }
 
 void QUmlCollaborationObject::addSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->addSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->addSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlCollaborationObject::removeSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->removeSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->removeSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlCollaborationObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
 }
 
 void QUmlCollaborationObject::addUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->addUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->addUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 void QUmlCollaborationObject::removeUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->removeUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->removeUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [StructuredClassifier]
 
 void QUmlCollaborationObject::addOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->addOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->addOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlCollaborationObject::removeOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->removeOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->removeOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlCollaborationObject::addOwnedConnector(QObject *ownedConnector)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->addOwnedConnector(qmodelingobjectproperty_cast<QUmlConnector *>(ownedConnector));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->addOwnedConnector(qmodelingelementproperty_cast<QUmlConnector *>(ownedConnector));
 }
 
 void QUmlCollaborationObject::removeOwnedConnector(QObject *ownedConnector)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->removeOwnedConnector(qmodelingobjectproperty_cast<QUmlConnector *>(ownedConnector));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->removeOwnedConnector(qmodelingelementproperty_cast<QUmlConnector *>(ownedConnector));
 }
 
 void QUmlCollaborationObject::addPart(QObject *part)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->addPart(qmodelingobjectproperty_cast<QUmlProperty *>(part));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->addPart(qmodelingelementproperty_cast<QUmlProperty *>(part));
 }
 
 void QUmlCollaborationObject::removePart(QObject *part)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->removePart(qmodelingobjectproperty_cast<QUmlProperty *>(part));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->removePart(qmodelingelementproperty_cast<QUmlProperty *>(part));
 }
 
 void QUmlCollaborationObject::addRole(QObject *role)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->addRole(qmodelingobjectproperty_cast<QUmlConnectableElement *>(role));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->addRole(qmodelingelementproperty_cast<QUmlConnectableElement *>(role));
 }
 
 void QUmlCollaborationObject::removeRole(QObject *role)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->removeRole(qmodelingobjectproperty_cast<QUmlConnectableElement *>(role));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->removeRole(qmodelingelementproperty_cast<QUmlConnectableElement *>(role));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [BehavioredClassifier]
 
 void QUmlCollaborationObject::setClassifierBehavior(QObject *classifierBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->setClassifierBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(classifierBehavior));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->setClassifierBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(classifierBehavior));
 }
 
 void QUmlCollaborationObject::addInterfaceRealization(QObject *interfaceRealization)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->addInterfaceRealization(qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->addInterfaceRealization(qmodelingelementproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
 }
 
 void QUmlCollaborationObject::removeInterfaceRealization(QObject *interfaceRealization)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->removeInterfaceRealization(qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->removeInterfaceRealization(qmodelingelementproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
 }
 
 void QUmlCollaborationObject::addOwnedBehavior(QObject *ownedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->addOwnedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(ownedBehavior));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->addOwnedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(ownedBehavior));
 }
 
 void QUmlCollaborationObject::removeOwnedBehavior(QObject *ownedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->removeOwnedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(ownedBehavior));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->removeOwnedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(ownedBehavior));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Collaboration]
 
 void QUmlCollaborationObject::addCollaborationRole(QObject *collaborationRole)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->addCollaborationRole(qmodelingobjectproperty_cast<QUmlConnectableElement *>(collaborationRole));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->addCollaborationRole(qmodelingelementproperty_cast<QUmlConnectableElement *>(collaborationRole));
 }
 
 void QUmlCollaborationObject::removeCollaborationRole(QObject *collaborationRole)
 {
-    qmodelingobjectproperty_cast<QUmlCollaboration *>(this)->removeCollaborationRole(qmodelingobjectproperty_cast<QUmlConnectableElement *>(collaborationRole));
+    qmodelingelementproperty_cast<QUmlCollaboration *>(this)->removeCollaborationRole(qmodelingelementproperty_cast<QUmlConnectableElement *>(collaborationRole));
+}
+
+
+void QUmlCollaborationObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlType");
+    d->groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generals"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
+
+    d->propertyGroups << QStringLiteral("QUmlStructuredClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedConnectors"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parts"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("roles"))));
+
+    d->propertyGroups << QStringLiteral("QUmlBehavioredClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifierBehavior"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interfaceRealizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedBehaviors"))));
+
+    d->propertyGroups << QStringLiteral("QUmlCollaboration");
+    d->groupProperties.insert(QStringLiteral("QUmlCollaboration"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationRoles"))));
+}
+
+void QUmlCollaborationObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCollaboration, collaborationRoles, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCollaboration, collaborationRoles, PropertyClassRole, QStringLiteral("QUmlCollaboration"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCollaboration, collaborationRoles, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCollaboration, collaborationRoles, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCollaboration, collaborationRoles, DocumentationRole, QStringLiteral("References connectable elements (possibly owned by other classifiers) which represent roles that instances may play in this collaboration."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCollaboration, collaborationRoles, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCollaboration, collaborationRoles, SubsettedPropertiesRole, QStringLiteral("StructuredClassifier-role"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCollaboration, collaborationRoles, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlcollaborationobject_p.h b/src/uml/qobjects/qumlcollaborationobject_p.h
index 921d2cfe..48ad5ac1 100644
--- a/src/uml/qobjects/qumlcollaborationobject_p.h
+++ b/src/uml/qobjects/qumlcollaborationobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlCollaboration;
-class Q_UML_EXPORT QUmlCollaborationObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlCollaborationObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlCollaborationObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -128,7 +131,7 @@ class Q_UML_EXPORT QUmlCollaborationObject : public QObject
     Q_PROPERTY(QSet<QObject *> collaborationRoles READ collaborationRoles)
 
 public:
-    Q_INVOKABLE explicit QUmlCollaborationObject(QUmlCollaboration *qModelingObject);
+    Q_INVOKABLE explicit QUmlCollaborationObject(QUmlCollaboration *qModelingElement);
     virtual ~QUmlCollaborationObject();
 
     // Owned attributes [Element]
@@ -344,6 +347,10 @@ public Q_SLOTS:
     // Slots for owned attributes [Collaboration]
     void addCollaborationRole(QObject *collaborationRole);
     void removeCollaborationRole(QObject *collaborationRole);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlcollaborationuseobject.cpp b/src/uml/qobjects/qumlcollaborationuseobject.cpp
index 87f39e0b..cd9c8841 100644
--- a/src/uml/qobjects/qumlcollaborationuseobject.cpp
+++ b/src/uml/qobjects/qumlcollaborationuseobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlcollaborationuseobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlCollaborationUse>
 #include <QtUml/QUmlCollaboration>
@@ -52,16 +53,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlCollaborationUseObject::QUmlCollaborationUseObject(QUmlCollaborationUse *qModelingObject)
+QUmlCollaborationUseObject::QUmlCollaborationUseObject(QUmlCollaborationUse *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlCollaborationUseObject::~QUmlCollaborationUseObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlCollaborationUse *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlCollaborationUse *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -70,25 +73,25 @@ QUmlCollaborationUseObject::~QUmlCollaborationUseObject()
 const QSet<QObject *> QUmlCollaborationUseObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlCollaborationUse *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlCollaborationUse *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCollaborationUseObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlCollaborationUse *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlCollaborationUse *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlCollaborationUseObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCollaborationUse *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlCollaborationUse *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCollaborationUse *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCollaborationUse *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -96,40 +99,40 @@ QObject *QUmlCollaborationUseObject::owner() const
 const QSet<QObject *> QUmlCollaborationUseObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlCollaborationUse *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlCollaborationUse *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlCollaborationUseObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlCollaborationUse *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlCollaborationUse *>(this)->name();
 }
 
 QObject *QUmlCollaborationUseObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCollaborationUse *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlCollaborationUse *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCollaborationUse *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCollaborationUse *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlCollaborationUseObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCollaborationUse *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlCollaborationUse *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCollaborationUse *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCollaborationUse *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlCollaborationUseObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlCollaborationUse *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlCollaborationUse *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlCollaborationUseObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlCollaborationUse *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlCollaborationUse *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [CollaborationUse]
@@ -137,17 +140,17 @@ QtUml::VisibilityKind QUmlCollaborationUseObject::visibility() const
 const QSet<QObject *> QUmlCollaborationUseObject::roleBindings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlCollaborationUse *>(this)->roleBindings())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlCollaborationUse *>(this)->roleBindings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlCollaborationUseObject::type() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCollaborationUse *>(this)->type())
+    if (!qmodelingelementproperty_cast<QUmlCollaborationUse *>(this)->type())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCollaborationUse *>(this)->type()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCollaborationUse *>(this)->type()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -155,14 +158,14 @@ QObject *QUmlCollaborationUseObject::type() const
 QSet<QObject *> QUmlCollaborationUseObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlCollaborationUse *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlCollaborationUse *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlCollaborationUseObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlCollaborationUse *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlCollaborationUse *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -170,108 +173,157 @@ bool QUmlCollaborationUseObject::mustBeOwned() const
 QList<QObject *> QUmlCollaborationUseObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlCollaborationUse *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlCollaborationUse *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlCollaborationUseObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlCollaborationUse *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlCollaborationUse *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlCollaborationUseObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlCollaborationUse *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlCollaborationUse *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlCollaborationUseObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlCollaborationUse *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlCollaborationUse *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlCollaborationUseObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlCollaborationUse *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlCollaborationUse *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlCollaborationUseObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlCollaborationUse *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlCollaborationUse *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlCollaborationUseObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCollaborationUse *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlCollaborationUse *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlCollaborationUseObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCollaborationUse *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlCollaborationUse *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlCollaborationUseObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlCollaborationUse *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlCollaborationUse *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlCollaborationUseObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlCollaborationUse *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlCollaborationUse *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlCollaborationUseObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlCollaborationUse *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlCollaborationUse *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlCollaborationUseObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlCollaborationUse *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlCollaborationUse *>(this)->setName(name);
 }
 
 void QUmlCollaborationUseObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlCollaborationUse *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlCollaborationUse *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlCollaborationUseObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlCollaborationUse *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlCollaborationUse *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlCollaborationUseObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlCollaborationUse *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlCollaborationUse *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlCollaborationUseObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlCollaborationUse *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlCollaborationUse *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [CollaborationUse]
 
 void QUmlCollaborationUseObject::addRoleBinding(QObject *roleBinding)
 {
-    qmodelingobjectproperty_cast<QUmlCollaborationUse *>(this)->addRoleBinding(qmodelingobjectproperty_cast<QUmlDependency *>(roleBinding));
+    qmodelingelementproperty_cast<QUmlCollaborationUse *>(this)->addRoleBinding(qmodelingelementproperty_cast<QUmlDependency *>(roleBinding));
 }
 
 void QUmlCollaborationUseObject::removeRoleBinding(QObject *roleBinding)
 {
-    qmodelingobjectproperty_cast<QUmlCollaborationUse *>(this)->removeRoleBinding(qmodelingobjectproperty_cast<QUmlDependency *>(roleBinding));
+    qmodelingelementproperty_cast<QUmlCollaborationUse *>(this)->removeRoleBinding(qmodelingelementproperty_cast<QUmlDependency *>(roleBinding));
 }
 
 void QUmlCollaborationUseObject::setType(QObject *type)
 {
-    qmodelingobjectproperty_cast<QUmlCollaborationUse *>(this)->setType(qmodelingobjectproperty_cast<QUmlCollaboration *>(type));
+    qmodelingelementproperty_cast<QUmlCollaborationUse *>(this)->setType(qmodelingelementproperty_cast<QUmlCollaboration *>(type));
+}
+
+
+void QUmlCollaborationUseObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlCollaborationUse");
+    d->groupProperties.insert(QStringLiteral("QUmlCollaborationUse"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("roleBindings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlCollaborationUse"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
+}
+
+void QUmlCollaborationUseObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCollaborationUse, roleBindings, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCollaborationUse, roleBindings, PropertyClassRole, QStringLiteral("QUmlCollaborationUse"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCollaborationUse, roleBindings, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCollaborationUse, roleBindings, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCollaborationUse, roleBindings, DocumentationRole, QStringLiteral("A mapping between features of the collaboration type and features of the owning classifier. This mapping indicates which connectable element of the classifier plays which role(s) in the collaboration. A connectable element may be bound to multiple roles in the same collaboration use (that is, it may play multiple roles)."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCollaborationUse, roleBindings, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCollaborationUse, roleBindings, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCollaborationUse, roleBindings, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCollaborationUse, type, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCollaborationUse, type, PropertyClassRole, QStringLiteral("QUmlCollaborationUse"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCollaborationUse, type, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCollaborationUse, type, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCollaborationUse, type, DocumentationRole, QStringLiteral("The collaboration which is used in this occurrence. The collaboration defines the cooperation between its roles which are mapped to properties of the classifier owning the collaboration use."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCollaborationUse, type, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCollaborationUse, type, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCollaborationUse, type, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlcollaborationuseobject_p.h b/src/uml/qobjects/qumlcollaborationuseobject_p.h
index 6d13d290..71bf26bb 100644
--- a/src/uml/qobjects/qumlcollaborationuseobject_p.h
+++ b/src/uml/qobjects/qumlcollaborationuseobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlCollaborationUse;
-class Q_UML_EXPORT QUmlCollaborationUseObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlCollaborationUseObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlCollaborationUseObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -76,7 +79,7 @@ class Q_UML_EXPORT QUmlCollaborationUseObject : public QObject
     Q_PROPERTY(QObject * type READ type WRITE setType)
 
 public:
-    Q_INVOKABLE explicit QUmlCollaborationUseObject(QUmlCollaborationUse *qModelingObject);
+    Q_INVOKABLE explicit QUmlCollaborationUseObject(QUmlCollaborationUse *qModelingElement);
     virtual ~QUmlCollaborationUseObject();
 
     // Owned attributes [Element]
@@ -128,6 +131,10 @@ public Q_SLOTS:
     void addRoleBinding(QObject *roleBinding);
     void removeRoleBinding(QObject *roleBinding);
     void setType(QObject *type = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlcombinedfragmentobject.cpp b/src/uml/qobjects/qumlcombinedfragmentobject.cpp
index 3f9e076b..116e192d 100644
--- a/src/uml/qobjects/qumlcombinedfragmentobject.cpp
+++ b/src/uml/qobjects/qumlcombinedfragmentobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlcombinedfragmentobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlCombinedFragment>
 #include <QtUml/QUmlComment>
@@ -56,16 +57,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlCombinedFragmentObject::QUmlCombinedFragmentObject(QUmlCombinedFragment *qModelingObject)
+QUmlCombinedFragmentObject::QUmlCombinedFragmentObject(QUmlCombinedFragment *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlCombinedFragmentObject::~QUmlCombinedFragmentObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -74,25 +77,25 @@ QUmlCombinedFragmentObject::~QUmlCombinedFragmentObject()
 const QSet<QObject *> QUmlCombinedFragmentObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCombinedFragmentObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlCombinedFragmentObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -100,40 +103,40 @@ QObject *QUmlCombinedFragmentObject::owner() const
 const QSet<QObject *> QUmlCombinedFragmentObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlCombinedFragmentObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->name();
 }
 
 QObject *QUmlCombinedFragmentObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlCombinedFragmentObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlCombinedFragmentObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlCombinedFragmentObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [InteractionFragment]
@@ -141,32 +144,32 @@ QtUml::VisibilityKind QUmlCombinedFragmentObject::visibility() const
 const QSet<QObject *> QUmlCombinedFragmentObject::covered() const
 {
     QSet<QObject *> set;
-    foreach (QUmlLifeline *element, qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->covered())
-        set.insert(element->asQObject());
+    foreach (QUmlLifeline *element, qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->covered())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlCombinedFragmentObject::enclosingInteraction() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->enclosingInteraction())
+    if (!qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->enclosingInteraction())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->enclosingInteraction()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->enclosingInteraction()->asQModelingObject();
 }
 
 QObject *QUmlCombinedFragmentObject::enclosingOperand() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->enclosingOperand())
+    if (!qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->enclosingOperand())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->enclosingOperand()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->enclosingOperand()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlCombinedFragmentObject::generalOrderings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralOrdering *element, qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->generalOrderings())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralOrdering *element, qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->generalOrderings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -175,21 +178,21 @@ const QSet<QObject *> QUmlCombinedFragmentObject::generalOrderings() const
 const QSet<QObject *> QUmlCombinedFragmentObject::cfragmentGates() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGate *element, qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->cfragmentGates())
-        set.insert(element->asQObject());
+    foreach (QUmlGate *element, qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->cfragmentGates())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QtUml::InteractionOperatorKind QUmlCombinedFragmentObject::interactionOperator() const
 {
-    return qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->interactionOperator();
+    return qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->interactionOperator();
 }
 
 const QList<QObject *> QUmlCombinedFragmentObject::operands() const
 {
     QList<QObject *> list;
-    foreach (QUmlInteractionOperand *element, qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->operands())
-        list.append(element->asQObject());
+    foreach (QUmlInteractionOperand *element, qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->operands())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -198,14 +201,14 @@ const QList<QObject *> QUmlCombinedFragmentObject::operands() const
 QSet<QObject *> QUmlCombinedFragmentObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlCombinedFragmentObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -213,155 +216,221 @@ bool QUmlCombinedFragmentObject::mustBeOwned() const
 QList<QObject *> QUmlCombinedFragmentObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlCombinedFragmentObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlCombinedFragmentObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlCombinedFragmentObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlCombinedFragmentObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlCombinedFragmentObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlCombinedFragmentObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlCombinedFragmentObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlCombinedFragmentObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlCombinedFragmentObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlCombinedFragmentObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlCombinedFragmentObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->setName(name);
 }
 
 void QUmlCombinedFragmentObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlCombinedFragmentObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlCombinedFragmentObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlCombinedFragmentObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [InteractionFragment]
 
 void QUmlCombinedFragmentObject::addCovered(QObject *covered)
 {
-    qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->addCovered(qmodelingobjectproperty_cast<QUmlLifeline *>(covered));
+    qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->addCovered(qmodelingelementproperty_cast<QUmlLifeline *>(covered));
 }
 
 void QUmlCombinedFragmentObject::removeCovered(QObject *covered)
 {
-    qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->removeCovered(qmodelingobjectproperty_cast<QUmlLifeline *>(covered));
+    qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->removeCovered(qmodelingelementproperty_cast<QUmlLifeline *>(covered));
 }
 
 void QUmlCombinedFragmentObject::setEnclosingInteraction(QObject *enclosingInteraction)
 {
-    qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->setEnclosingInteraction(qmodelingobjectproperty_cast<QUmlInteraction *>(enclosingInteraction));
+    qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->setEnclosingInteraction(qmodelingelementproperty_cast<QUmlInteraction *>(enclosingInteraction));
 }
 
 void QUmlCombinedFragmentObject::setEnclosingOperand(QObject *enclosingOperand)
 {
-    qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->setEnclosingOperand(qmodelingobjectproperty_cast<QUmlInteractionOperand *>(enclosingOperand));
+    qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->setEnclosingOperand(qmodelingelementproperty_cast<QUmlInteractionOperand *>(enclosingOperand));
 }
 
 void QUmlCombinedFragmentObject::addGeneralOrdering(QObject *generalOrdering)
 {
-    qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->addGeneralOrdering(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
+    qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->addGeneralOrdering(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
 }
 
 void QUmlCombinedFragmentObject::removeGeneralOrdering(QObject *generalOrdering)
 {
-    qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->removeGeneralOrdering(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
+    qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->removeGeneralOrdering(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [CombinedFragment]
 
 void QUmlCombinedFragmentObject::addCfragmentGate(QObject *cfragmentGate)
 {
-    qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->addCfragmentGate(qmodelingobjectproperty_cast<QUmlGate *>(cfragmentGate));
+    qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->addCfragmentGate(qmodelingelementproperty_cast<QUmlGate *>(cfragmentGate));
 }
 
 void QUmlCombinedFragmentObject::removeCfragmentGate(QObject *cfragmentGate)
 {
-    qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->removeCfragmentGate(qmodelingobjectproperty_cast<QUmlGate *>(cfragmentGate));
+    qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->removeCfragmentGate(qmodelingelementproperty_cast<QUmlGate *>(cfragmentGate));
 }
 
 void QUmlCombinedFragmentObject::setInteractionOperator(QtUml::InteractionOperatorKind interactionOperator)
 {
-    qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->setInteractionOperator(interactionOperator);
+    qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->setInteractionOperator(interactionOperator);
 }
 
 void QUmlCombinedFragmentObject::unsetInteractionOperator()
 {
-    qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("interactionOperator"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("interactionOperator"));
 }
 
 void QUmlCombinedFragmentObject::addOperand(QObject *operand)
 {
-    qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->addOperand(qmodelingobjectproperty_cast<QUmlInteractionOperand *>(operand));
+    qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->addOperand(qmodelingelementproperty_cast<QUmlInteractionOperand *>(operand));
 }
 
 void QUmlCombinedFragmentObject::removeOperand(QObject *operand)
 {
-    qmodelingobjectproperty_cast<QUmlCombinedFragment *>(this)->removeOperand(qmodelingobjectproperty_cast<QUmlInteractionOperand *>(operand));
+    qmodelingelementproperty_cast<QUmlCombinedFragment *>(this)->removeOperand(qmodelingelementproperty_cast<QUmlInteractionOperand *>(operand));
+}
+
+
+void QUmlCombinedFragmentObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlInteractionFragment");
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("covered"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingInteraction"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingOperand"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalOrderings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlCombinedFragment");
+    d->groupProperties.insert(QStringLiteral("QUmlCombinedFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("cfragmentGates"))));
+    d->groupProperties.insert(QStringLiteral("QUmlCombinedFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interactionOperator"))));
+    d->groupProperties.insert(QStringLiteral("QUmlCombinedFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("operands"))));
+}
+
+void QUmlCombinedFragmentObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCombinedFragment, cfragmentGates, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCombinedFragment, cfragmentGates, PropertyClassRole, QStringLiteral("QUmlCombinedFragment"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCombinedFragment, cfragmentGates, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCombinedFragment, cfragmentGates, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCombinedFragment, cfragmentGates, DocumentationRole, QStringLiteral("Specifies the gates that form the interface between this CombinedFragment and its surroundings"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCombinedFragment, cfragmentGates, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCombinedFragment, cfragmentGates, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCombinedFragment, cfragmentGates, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCombinedFragment, interactionOperator, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCombinedFragment, interactionOperator, PropertyClassRole, QStringLiteral("QUmlCombinedFragment"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCombinedFragment, interactionOperator, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCombinedFragment, interactionOperator, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCombinedFragment, interactionOperator, DocumentationRole, QStringLiteral("Specifies the operation which defines the semantics of this combination of InteractionFragments."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCombinedFragment, interactionOperator, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCombinedFragment, interactionOperator, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCombinedFragment, interactionOperator, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCombinedFragment, operands, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCombinedFragment, operands, PropertyClassRole, QStringLiteral("QUmlCombinedFragment"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCombinedFragment, operands, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCombinedFragment, operands, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCombinedFragment, operands, DocumentationRole, QStringLiteral("The set of operands of the combined fragment."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCombinedFragment, operands, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCombinedFragment, operands, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCombinedFragment, operands, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlcombinedfragmentobject_p.h b/src/uml/qobjects/qumlcombinedfragmentobject_p.h
index 997b7a6b..28278734 100644
--- a/src/uml/qobjects/qumlcombinedfragmentobject_p.h
+++ b/src/uml/qobjects/qumlcombinedfragmentobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlCombinedFragment;
-class Q_UML_EXPORT QUmlCombinedFragmentObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlCombinedFragmentObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlCombinedFragmentObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -83,7 +86,7 @@ class Q_UML_EXPORT QUmlCombinedFragmentObject : public QObject
     Q_PROPERTY(QList<QObject *> operands READ operands)
 
 public:
-    Q_INVOKABLE explicit QUmlCombinedFragmentObject(QUmlCombinedFragment *qModelingObject);
+    Q_INVOKABLE explicit QUmlCombinedFragmentObject(QUmlCombinedFragment *qModelingElement);
     virtual ~QUmlCombinedFragmentObject();
 
     // Owned attributes [Element]
@@ -153,6 +156,10 @@ public Q_SLOTS:
     void unsetInteractionOperator();
     void addOperand(QObject *operand);
     void removeOperand(QObject *operand);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlcommentobject.cpp b/src/uml/qobjects/qumlcommentobject.cpp
index 51d9413f..3f6e09fd 100644
--- a/src/uml/qobjects/qumlcommentobject.cpp
+++ b/src/uml/qobjects/qumlcommentobject.cpp
@@ -39,22 +39,25 @@
 **
 ****************************************************************************/
 #include "qumlcommentobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlComment>
 #include <QtUml/QUmlElement>
 
 QT_BEGIN_NAMESPACE
 
-QUmlCommentObject::QUmlCommentObject(QUmlComment *qModelingObject)
+QUmlCommentObject::QUmlCommentObject(QUmlComment *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlCommentObject::~QUmlCommentObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlComment *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlComment *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -63,25 +66,25 @@ QUmlCommentObject::~QUmlCommentObject()
 const QSet<QObject *> QUmlCommentObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlComment *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlComment *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCommentObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlComment *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlComment *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlCommentObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlComment *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlComment *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlComment *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlComment *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [Comment]
@@ -89,14 +92,14 @@ QObject *QUmlCommentObject::owner() const
 const QSet<QObject *> QUmlCommentObject::annotatedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlComment *>(this)->annotatedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlComment *>(this)->annotatedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlCommentObject::body() const
 {
-    return qmodelingobjectproperty_cast<QUmlComment *>(this)->body();
+    return qmodelingelementproperty_cast<QUmlComment *>(this)->body();
 }
 
 // OPERATIONS [Element]
@@ -104,58 +107,101 @@ QString QUmlCommentObject::body() const
 QSet<QObject *> QUmlCommentObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlComment *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlComment *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlCommentObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlComment *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlComment *>(this)->mustBeOwned();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlCommentObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlComment *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlComment *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlCommentObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlComment *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlComment *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlCommentObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlComment *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlComment *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlCommentObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlComment *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlComment *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlCommentObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlComment *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlComment *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Comment]
 
 void QUmlCommentObject::addAnnotatedElement(QObject *annotatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlComment *>(this)->addAnnotatedElement(qmodelingobjectproperty_cast<QUmlElement *>(annotatedElement));
+    qmodelingelementproperty_cast<QUmlComment *>(this)->addAnnotatedElement(qmodelingelementproperty_cast<QUmlElement *>(annotatedElement));
 }
 
 void QUmlCommentObject::removeAnnotatedElement(QObject *annotatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlComment *>(this)->removeAnnotatedElement(qmodelingobjectproperty_cast<QUmlElement *>(annotatedElement));
+    qmodelingelementproperty_cast<QUmlComment *>(this)->removeAnnotatedElement(qmodelingelementproperty_cast<QUmlElement *>(annotatedElement));
 }
 
 void QUmlCommentObject::setBody(QString body)
 {
-    qmodelingobjectproperty_cast<QUmlComment *>(this)->setBody(body);
+    qmodelingelementproperty_cast<QUmlComment *>(this)->setBody(body);
+}
+
+
+void QUmlCommentObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    QStringList propertyGroups;
+    propertyGroups << QStringLiteral("QObject");
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlComment");
+    d->groupProperties.insert(QStringLiteral("QUmlComment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("annotatedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlComment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("body"))));
+}
+
+void QUmlCommentObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComment, annotatedElements, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComment, annotatedElements, PropertyClassRole, QStringLiteral("QUmlComment"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComment, annotatedElements, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComment, annotatedElements, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComment, annotatedElements, DocumentationRole, QStringLiteral("References the Element(s) being commented."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComment, annotatedElements, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComment, annotatedElements, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComment, annotatedElements, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComment, body, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComment, body, PropertyClassRole, QStringLiteral("QUmlComment"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComment, body, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComment, body, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComment, body, DocumentationRole, QStringLiteral("Specifies a string that is the comment."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComment, body, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComment, body, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComment, body, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlcommentobject_p.h b/src/uml/qobjects/qumlcommentobject_p.h
index f1a0114a..ee7c2e17 100644
--- a/src/uml/qobjects/qumlcommentobject_p.h
+++ b/src/uml/qobjects/qumlcommentobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 QT_BEGIN_HEADER
 
@@ -52,9 +52,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlComment;
-class Q_UML_EXPORT QUmlCommentObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlCommentObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlCommentObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -66,7 +69,7 @@ class Q_UML_EXPORT QUmlCommentObject : public QObject
     Q_PROPERTY(QString body READ body WRITE setBody)
 
 public:
-    Q_INVOKABLE explicit QUmlCommentObject(QUmlComment *qModelingObject);
+    Q_INVOKABLE explicit QUmlCommentObject(QUmlComment *qModelingElement);
     virtual ~QUmlCommentObject();
 
     // Owned attributes [Element]
@@ -95,6 +98,10 @@ public Q_SLOTS:
     void addAnnotatedElement(QObject *annotatedElement);
     void removeAnnotatedElement(QObject *annotatedElement);
     void setBody(QString body);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlcommunicationpathobject.cpp b/src/uml/qobjects/qumlcommunicationpathobject.cpp
index a2a0201e..3d1fa8b8 100644
--- a/src/uml/qobjects/qumlcommunicationpathobject.cpp
+++ b/src/uml/qobjects/qumlcommunicationpathobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlcommunicationpathobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlCommunicationPath>
 #include <QtUml/QUmlClassifier>
@@ -71,16 +72,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlCommunicationPathObject::QUmlCommunicationPathObject(QUmlCommunicationPath *qModelingObject)
+QUmlCommunicationPathObject::QUmlCommunicationPathObject(QUmlCommunicationPath *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlCommunicationPathObject::~QUmlCommunicationPathObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -89,25 +92,25 @@ QUmlCommunicationPathObject::~QUmlCommunicationPathObject()
 const QSet<QObject *> QUmlCommunicationPathObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCommunicationPathObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlCommunicationPathObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -115,35 +118,35 @@ QObject *QUmlCommunicationPathObject::owner() const
 const QSet<QObject *> QUmlCommunicationPathObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlCommunicationPathObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->name();
 }
 
 QObject *QUmlCommunicationPathObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlCommunicationPathObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlCommunicationPathObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [Namespace]
@@ -151,48 +154,48 @@ QString QUmlCommunicationPathObject::qualifiedName() const
 const QSet<QObject *> QUmlCommunicationPathObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCommunicationPathObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCommunicationPathObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCommunicationPathObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCommunicationPathObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCommunicationPathObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -200,49 +203,49 @@ const QSet<QObject *> QUmlCommunicationPathObject::packageImports() const
 
 QObject *QUmlCommunicationPathObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlCommunicationPathObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Type]
 
 QObject *QUmlCommunicationPathObject::package() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->package())
+    if (!qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->package())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->package()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->package()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlCommunicationPathObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlCommunicationPathObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCommunicationPathObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -251,8 +254,8 @@ const QSet<QObject *> QUmlCommunicationPathObject::redefinitionContexts() const
 const QSet<QObject *> QUmlCommunicationPathObject::templateBindings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTemplateBinding *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->templateBindings())
-        set.insert(element->asQObject());
+    foreach (QUmlTemplateBinding *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->templateBindings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -261,122 +264,122 @@ const QSet<QObject *> QUmlCommunicationPathObject::templateBindings() const
 const QSet<QObject *> QUmlCommunicationPathObject::attributes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->attributes())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->attributes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCommunicationPathObject::collaborationUses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlCollaborationUse *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->collaborationUses())
-        set.insert(element->asQObject());
+    foreach (QUmlCollaborationUse *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->collaborationUses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCommunicationPathObject::features() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->features())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->features())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCommunicationPathObject::generals() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->generals())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->generals())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCommunicationPathObject::generalizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralization *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->generalizations())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralization *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->generalizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCommunicationPathObject::inheritedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->inheritedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->inheritedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlCommunicationPathObject::isAbstract() const
 {
-    return qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->isAbstract();
+    return qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->isAbstract();
 }
 
 bool QUmlCommunicationPathObject::isFinalSpecialization() const
 {
-    return qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->isFinalSpecialization();
+    return qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->isFinalSpecialization();
 }
 
 QObject *QUmlCommunicationPathObject::ownedTemplateSignature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->ownedTemplateSignature())
+    if (!qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->ownedTemplateSignature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->ownedTemplateSignature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->ownedTemplateSignature()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlCommunicationPathObject::ownedUseCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->ownedUseCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->ownedUseCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCommunicationPathObject::powertypeExtents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralizationSet *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->powertypeExtents())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralizationSet *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->powertypeExtents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCommunicationPathObject::redefinedClassifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->redefinedClassifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->redefinedClassifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlCommunicationPathObject::representation() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->representation())
+    if (!qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->representation())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->representation()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->representation()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlCommunicationPathObject::substitutions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlSubstitution *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->substitutions())
-        set.insert(element->asQObject());
+    foreach (QUmlSubstitution *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->substitutions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlCommunicationPathObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->templateParameter()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlCommunicationPathObject::useCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->useCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->useCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -385,8 +388,8 @@ const QSet<QObject *> QUmlCommunicationPathObject::useCases() const
 const QSet<QObject *> QUmlCommunicationPathObject::relatedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->relatedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->relatedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -395,37 +398,37 @@ const QSet<QObject *> QUmlCommunicationPathObject::relatedElements() const
 const QList<QObject *> QUmlCommunicationPathObject::endTypes() const
 {
     QList<QObject *> list;
-    foreach (QUmlType *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->endTypes())
-        list.append(element->asQObject());
+    foreach (QUmlType *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->endTypes())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlCommunicationPathObject::isDerived() const
 {
-    return qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->isDerived();
+    return qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->isDerived();
 }
 
 const QList<QObject *> QUmlCommunicationPathObject::memberEnds() const
 {
     QList<QObject *> list;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->memberEnds())
-        list.append(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->memberEnds())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QSet<QObject *> QUmlCommunicationPathObject::navigableOwnedEnds() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->navigableOwnedEnds())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->navigableOwnedEnds())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlCommunicationPathObject::ownedEnds() const
 {
     QList<QObject *> list;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->ownedEnds())
-        list.append(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->ownedEnds())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -434,14 +437,14 @@ const QList<QObject *> QUmlCommunicationPathObject::ownedEnds() const
 QSet<QObject *> QUmlCommunicationPathObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlCommunicationPathObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -449,27 +452,27 @@ bool QUmlCommunicationPathObject::mustBeOwned() const
 QList<QObject *> QUmlCommunicationPathObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlCommunicationPathObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlCommunicationPathObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlCommunicationPathObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->separator();
 }
 
 // OPERATIONS [Namespace]
@@ -478,44 +481,44 @@ QSet<QObject *> QUmlCommunicationPathObject::excludeCollisions(QSet<QObject *> i
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlCommunicationPathObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlCommunicationPathObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlCommunicationPathObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->membersAreDistinguishable();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlCommunicationPathObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlCommunicationPathObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [Type]
@@ -523,12 +526,12 @@ bool QUmlCommunicationPathObject::isTemplateParameter() const
 
 bool QUmlCommunicationPathObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlCommunicationPathObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [TemplateableElement]
@@ -536,8 +539,8 @@ bool QUmlCommunicationPathObject::isRedefinitionContextValid(QObject *redefined)
 QSet<QObject *> QUmlCommunicationPathObject::parameterableElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterableElement *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->parameterableElements())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterableElement *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->parameterableElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -546,63 +549,63 @@ QSet<QObject *> QUmlCommunicationPathObject::parameterableElements() const
 QSet<QObject *> QUmlCommunicationPathObject::allFeatures() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->allFeatures())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->allFeatures())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlCommunicationPathObject::allParents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->allParents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->allParents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlCommunicationPathObject::conformsTo(QObject *other) const
 {
-    return qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->conformsTo(qmodelingobjectproperty_cast<QUmlClassifier *>(other));
+    return qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->conformsTo(qmodelingelementproperty_cast<QUmlClassifier *>(other));
 }
 
 bool QUmlCommunicationPathObject::hasVisibilityOf(QObject *n) const
 {
-    return qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->hasVisibilityOf(qmodelingobjectproperty_cast<QUmlNamedElement *>(n));
+    return qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->hasVisibilityOf(qmodelingelementproperty_cast<QUmlNamedElement *>(n));
 }
 
 QSet<QObject *> QUmlCommunicationPathObject::inherit(QSet<QObject *> inhs) const
 {
     QSet<QUmlNamedElement *> inhsConverted;
     foreach (QObject *object, inhs)
-        inhsConverted.insert(qmodelingobjectproperty_cast<QUmlNamedElement *>(object));
+        inhsConverted.insert(qmodelingelementproperty_cast<QUmlNamedElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->inherit(inhsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->inherit(inhsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlCommunicationPathObject::inheritableMembers(QObject *c) const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->inheritableMembers(qmodelingobjectproperty_cast<QUmlClassifier *>(c)))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->inheritableMembers(qmodelingelementproperty_cast<QUmlClassifier *>(c)))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlCommunicationPathObject::isTemplate() const
 {
-    return qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->isTemplate();
+    return qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->isTemplate();
 }
 
 bool QUmlCommunicationPathObject::maySpecializeType(QObject *c) const
 {
-    return qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->maySpecializeType(qmodelingobjectproperty_cast<QUmlClassifier *>(c));
+    return qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->maySpecializeType(qmodelingelementproperty_cast<QUmlClassifier *>(c));
 }
 
 QSet<QObject *> QUmlCommunicationPathObject::parents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->parents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->parents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -610,400 +613,486 @@ QSet<QObject *> QUmlCommunicationPathObject::parents() const
 
 void QUmlCommunicationPathObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlCommunicationPathObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlCommunicationPathObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlCommunicationPathObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlCommunicationPathObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlCommunicationPathObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlCommunicationPathObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlCommunicationPathObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->setName(name);
 }
 
 void QUmlCommunicationPathObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlCommunicationPathObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlCommunicationPathObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlCommunicationPathObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlCommunicationPathObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlCommunicationPathObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlCommunicationPathObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlCommunicationPathObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlCommunicationPathObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlCommunicationPathObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlCommunicationPathObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlCommunicationPathObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlCommunicationPathObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlCommunicationPathObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlCommunicationPathObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlCommunicationPathObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlCommunicationPathObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->setVisibility(visibility);
 }
 
 void QUmlCommunicationPathObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Type]
 
 void QUmlCommunicationPathObject::setPackage(QObject *package)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->setPackage(qmodelingobjectproperty_cast<QUmlPackage *>(package));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->setPackage(qmodelingelementproperty_cast<QUmlPackage *>(package));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlCommunicationPathObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlCommunicationPathObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlCommunicationPathObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlCommunicationPathObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlCommunicationPathObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlCommunicationPathObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateableElement]
 
 void QUmlCommunicationPathObject::addTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->addTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->addTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 void QUmlCommunicationPathObject::removeTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->removeTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->removeTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Classifier]
 
 void QUmlCommunicationPathObject::addAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->addAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->addAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlCommunicationPathObject::removeAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->removeAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->removeAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlCommunicationPathObject::addCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->addCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->addCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlCommunicationPathObject::removeCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->removeCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->removeCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlCommunicationPathObject::addFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->addFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->addFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlCommunicationPathObject::removeFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->removeFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->removeFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlCommunicationPathObject::addGeneral(QObject *general)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->addGeneral(qmodelingobjectproperty_cast<QUmlClassifier *>(general));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->addGeneral(qmodelingelementproperty_cast<QUmlClassifier *>(general));
 }
 
 void QUmlCommunicationPathObject::removeGeneral(QObject *general)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->removeGeneral(qmodelingobjectproperty_cast<QUmlClassifier *>(general));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->removeGeneral(qmodelingelementproperty_cast<QUmlClassifier *>(general));
 }
 
 void QUmlCommunicationPathObject::addGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->addGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->addGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlCommunicationPathObject::removeGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->removeGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->removeGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlCommunicationPathObject::addInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->addInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->addInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlCommunicationPathObject::removeInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->removeInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->removeInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlCommunicationPathObject::setAbstract(bool isAbstract)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->setAbstract(isAbstract);
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->setAbstract(isAbstract);
 }
 
 void QUmlCommunicationPathObject::unsetAbstract()
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("abstract"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
 void QUmlCommunicationPathObject::setFinalSpecialization(bool isFinalSpecialization)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->setFinalSpecialization(isFinalSpecialization);
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->setFinalSpecialization(isFinalSpecialization);
 }
 
 void QUmlCommunicationPathObject::unsetFinalSpecialization()
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("finalSpecialization"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
 void QUmlCommunicationPathObject::setOwnedTemplateSignature(QObject *ownedTemplateSignature)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->setOwnedTemplateSignature(qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->setOwnedTemplateSignature(qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
 }
 
 void QUmlCommunicationPathObject::addOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->addOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->addOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlCommunicationPathObject::removeOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->removeOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->removeOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlCommunicationPathObject::addPowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->addPowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->addPowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlCommunicationPathObject::removePowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->removePowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->removePowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlCommunicationPathObject::addRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->addRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->addRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlCommunicationPathObject::removeRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->removeRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->removeRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlCommunicationPathObject::setRepresentation(QObject *representation)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->setRepresentation(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(representation));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->setRepresentation(qmodelingelementproperty_cast<QUmlCollaborationUse *>(representation));
 }
 
 void QUmlCommunicationPathObject::addSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->addSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->addSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlCommunicationPathObject::removeSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->removeSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->removeSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlCommunicationPathObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
 }
 
 void QUmlCommunicationPathObject::addUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->addUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->addUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 void QUmlCommunicationPathObject::removeUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->removeUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->removeUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Relationship]
 
 void QUmlCommunicationPathObject::addRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->addRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->addRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 void QUmlCommunicationPathObject::removeRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->removeRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->removeRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Association]
 
 void QUmlCommunicationPathObject::addEndType(QObject *endType)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->addEndType(qmodelingobjectproperty_cast<QUmlType *>(endType));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->addEndType(qmodelingelementproperty_cast<QUmlType *>(endType));
 }
 
 void QUmlCommunicationPathObject::removeEndType(QObject *endType)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->removeEndType(qmodelingobjectproperty_cast<QUmlType *>(endType));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->removeEndType(qmodelingelementproperty_cast<QUmlType *>(endType));
 }
 
 void QUmlCommunicationPathObject::setDerived(bool isDerived)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->setDerived(isDerived);
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->setDerived(isDerived);
 }
 
 void QUmlCommunicationPathObject::unsetDerived()
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("derived"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("derived"));
 }
 
 void QUmlCommunicationPathObject::addMemberEnd(QObject *memberEnd)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->addMemberEnd(qmodelingobjectproperty_cast<QUmlProperty *>(memberEnd));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->addMemberEnd(qmodelingelementproperty_cast<QUmlProperty *>(memberEnd));
 }
 
 void QUmlCommunicationPathObject::removeMemberEnd(QObject *memberEnd)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->removeMemberEnd(qmodelingobjectproperty_cast<QUmlProperty *>(memberEnd));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->removeMemberEnd(qmodelingelementproperty_cast<QUmlProperty *>(memberEnd));
 }
 
 void QUmlCommunicationPathObject::addNavigableOwnedEnd(QObject *navigableOwnedEnd)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->addNavigableOwnedEnd(qmodelingobjectproperty_cast<QUmlProperty *>(navigableOwnedEnd));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->addNavigableOwnedEnd(qmodelingelementproperty_cast<QUmlProperty *>(navigableOwnedEnd));
 }
 
 void QUmlCommunicationPathObject::removeNavigableOwnedEnd(QObject *navigableOwnedEnd)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->removeNavigableOwnedEnd(qmodelingobjectproperty_cast<QUmlProperty *>(navigableOwnedEnd));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->removeNavigableOwnedEnd(qmodelingelementproperty_cast<QUmlProperty *>(navigableOwnedEnd));
 }
 
 void QUmlCommunicationPathObject::addOwnedEnd(QObject *ownedEnd)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->addOwnedEnd(qmodelingobjectproperty_cast<QUmlProperty *>(ownedEnd));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->addOwnedEnd(qmodelingelementproperty_cast<QUmlProperty *>(ownedEnd));
 }
 
 void QUmlCommunicationPathObject::removeOwnedEnd(QObject *ownedEnd)
 {
-    qmodelingobjectproperty_cast<QUmlCommunicationPath *>(this)->removeOwnedEnd(qmodelingobjectproperty_cast<QUmlProperty *>(ownedEnd));
+    qmodelingelementproperty_cast<QUmlCommunicationPath *>(this)->removeOwnedEnd(qmodelingelementproperty_cast<QUmlProperty *>(ownedEnd));
+}
+
+
+void QUmlCommunicationPathObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlType");
+    d->groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generals"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAssociation");
+    d->groupProperties.insert(QStringLiteral("QUmlAssociation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("endTypes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAssociation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isDerived"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAssociation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("memberEnds"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAssociation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("navigableOwnedEnds"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAssociation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedEnds"))));
+
+    d->propertyGroups << QStringLiteral("QUmlCommunicationPath");
+}
+
+void QUmlCommunicationPathObject::setPropertyData()
+{
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlcommunicationpathobject_p.h b/src/uml/qobjects/qumlcommunicationpathobject_p.h
index f3d893b4..dfdfd024 100644
--- a/src/uml/qobjects/qumlcommunicationpathobject_p.h
+++ b/src/uml/qobjects/qumlcommunicationpathobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlCommunicationPath;
-class Q_UML_EXPORT QUmlCommunicationPathObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlCommunicationPathObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlCommunicationPathObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -124,7 +127,7 @@ class Q_UML_EXPORT QUmlCommunicationPathObject : public QObject
     Q_PROPERTY(QList<QObject *> ownedEnds READ ownedEnds)
 
 public:
-    Q_INVOKABLE explicit QUmlCommunicationPathObject(QUmlCommunicationPath *qModelingObject);
+    Q_INVOKABLE explicit QUmlCommunicationPathObject(QUmlCommunicationPath *qModelingElement);
     virtual ~QUmlCommunicationPathObject();
 
     // Owned attributes [Element]
@@ -331,6 +334,10 @@ public Q_SLOTS:
     void removeNavigableOwnedEnd(QObject *navigableOwnedEnd);
     void addOwnedEnd(QObject *ownedEnd);
     void removeOwnedEnd(QObject *ownedEnd);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlcomponentobject.cpp b/src/uml/qobjects/qumlcomponentobject.cpp
index aefd9117..2ae8692b 100644
--- a/src/uml/qobjects/qumlcomponentobject.cpp
+++ b/src/uml/qobjects/qumlcomponentobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlcomponentobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlComponent>
 #include <QtUml/QUmlBehavior>
@@ -82,16 +83,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlComponentObject::QUmlComponentObject(QUmlComponent *qModelingObject)
+QUmlComponentObject::QUmlComponentObject(QUmlComponent *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlComponentObject::~QUmlComponentObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlComponent *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlComponent *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -100,25 +103,25 @@ QUmlComponentObject::~QUmlComponentObject()
 const QSet<QObject *> QUmlComponentObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlComponentObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlComponentObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlComponent *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlComponent *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlComponent *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlComponent *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -126,35 +129,35 @@ QObject *QUmlComponentObject::owner() const
 const QSet<QObject *> QUmlComponentObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlComponentObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlComponent *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlComponent *>(this)->name();
 }
 
 QObject *QUmlComponentObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlComponent *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlComponent *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlComponent *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlComponent *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlComponentObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlComponent *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlComponent *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlComponent *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlComponent *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlComponentObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlComponent *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlComponent *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [Namespace]
@@ -162,48 +165,48 @@ QString QUmlComponentObject::qualifiedName() const
 const QSet<QObject *> QUmlComponentObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlComponentObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlComponentObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlComponentObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlComponentObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlComponentObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -211,49 +214,49 @@ const QSet<QObject *> QUmlComponentObject::packageImports() const
 
 QObject *QUmlComponentObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlComponent *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlComponent *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlComponent *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlComponent *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlComponentObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlComponent *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlComponent *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Type]
 
 QObject *QUmlComponentObject::package() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlComponent *>(this)->package())
+    if (!qmodelingelementproperty_cast<QUmlComponent *>(this)->package())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlComponent *>(this)->package()->asQObject();
+        return qmodelingelementproperty_cast<QUmlComponent *>(this)->package()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlComponentObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlComponent *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlComponent *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlComponentObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlComponentObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -262,8 +265,8 @@ const QSet<QObject *> QUmlComponentObject::redefinitionContexts() const
 const QSet<QObject *> QUmlComponentObject::templateBindings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTemplateBinding *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->templateBindings())
-        set.insert(element->asQObject());
+    foreach (QUmlTemplateBinding *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->templateBindings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -272,109 +275,109 @@ const QSet<QObject *> QUmlComponentObject::templateBindings() const
 const QSet<QObject *> QUmlComponentObject::attributes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->attributes())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->attributes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlComponentObject::collaborationUses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlCollaborationUse *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->collaborationUses())
-        set.insert(element->asQObject());
+    foreach (QUmlCollaborationUse *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->collaborationUses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlComponentObject::features() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->features())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->features())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlComponentObject::generalizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralization *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->generalizations())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralization *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->generalizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlComponentObject::inheritedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->inheritedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->inheritedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlComponentObject::isFinalSpecialization() const
 {
-    return qmodelingobjectproperty_cast<QUmlComponent *>(this)->isFinalSpecialization();
+    return qmodelingelementproperty_cast<QUmlComponent *>(this)->isFinalSpecialization();
 }
 
 QObject *QUmlComponentObject::ownedTemplateSignature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlComponent *>(this)->ownedTemplateSignature())
+    if (!qmodelingelementproperty_cast<QUmlComponent *>(this)->ownedTemplateSignature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlComponent *>(this)->ownedTemplateSignature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlComponent *>(this)->ownedTemplateSignature()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlComponentObject::ownedUseCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->ownedUseCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->ownedUseCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlComponentObject::powertypeExtents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralizationSet *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->powertypeExtents())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralizationSet *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->powertypeExtents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlComponentObject::redefinedClassifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->redefinedClassifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->redefinedClassifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlComponentObject::representation() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlComponent *>(this)->representation())
+    if (!qmodelingelementproperty_cast<QUmlComponent *>(this)->representation())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlComponent *>(this)->representation()->asQObject();
+        return qmodelingelementproperty_cast<QUmlComponent *>(this)->representation()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlComponentObject::substitutions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlSubstitution *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->substitutions())
-        set.insert(element->asQObject());
+    foreach (QUmlSubstitution *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->substitutions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlComponentObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlComponent *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlComponent *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlComponent *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlComponent *>(this)->templateParameter()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlComponentObject::useCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->useCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->useCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -383,24 +386,24 @@ const QSet<QObject *> QUmlComponentObject::useCases() const
 const QSet<QObject *> QUmlComponentObject::ownedConnectors() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConnector *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->ownedConnectors())
-        set.insert(element->asQObject());
+    foreach (QUmlConnector *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->ownedConnectors())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlComponentObject::parts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->parts())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->parts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlComponentObject::roles() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConnectableElement *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->roles())
-        set.insert(element->asQObject());
+    foreach (QUmlConnectableElement *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->roles())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -409,8 +412,8 @@ const QSet<QObject *> QUmlComponentObject::roles() const
 const QSet<QObject *> QUmlComponentObject::ownedPorts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPort *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->ownedPorts())
-        set.insert(element->asQObject());
+    foreach (QUmlPort *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->ownedPorts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -418,25 +421,25 @@ const QSet<QObject *> QUmlComponentObject::ownedPorts() const
 
 QObject *QUmlComponentObject::classifierBehavior() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlComponent *>(this)->classifierBehavior())
+    if (!qmodelingelementproperty_cast<QUmlComponent *>(this)->classifierBehavior())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlComponent *>(this)->classifierBehavior()->asQObject();
+        return qmodelingelementproperty_cast<QUmlComponent *>(this)->classifierBehavior()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlComponentObject::interfaceRealizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterfaceRealization *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->interfaceRealizations())
-        set.insert(element->asQObject());
+    foreach (QUmlInterfaceRealization *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->interfaceRealizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlComponentObject::ownedBehaviors() const
 {
     QSet<QObject *> set;
-    foreach (QUmlBehavior *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->ownedBehaviors())
-        set.insert(element->asQObject());
+    foreach (QUmlBehavior *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->ownedBehaviors())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -445,58 +448,58 @@ const QSet<QObject *> QUmlComponentObject::ownedBehaviors() const
 const QSet<QObject *> QUmlComponentObject::extensions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExtension *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->extensions())
-        set.insert(element->asQObject());
+    foreach (QUmlExtension *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->extensions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlComponentObject::isAbstract() const
 {
-    return qmodelingobjectproperty_cast<QUmlComponent *>(this)->isAbstract();
+    return qmodelingelementproperty_cast<QUmlComponent *>(this)->isAbstract();
 }
 
 bool QUmlComponentObject::isActive() const
 {
-    return qmodelingobjectproperty_cast<QUmlComponent *>(this)->isActive();
+    return qmodelingelementproperty_cast<QUmlComponent *>(this)->isActive();
 }
 
 const QList<QObject *> QUmlComponentObject::nestedClassifiers() const
 {
     QList<QObject *> list;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->nestedClassifiers())
-        list.append(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->nestedClassifiers())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QList<QObject *> QUmlComponentObject::ownedAttributes() const
 {
     QList<QObject *> list;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->ownedAttributes())
-        list.append(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->ownedAttributes())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QList<QObject *> QUmlComponentObject::ownedOperations() const
 {
     QList<QObject *> list;
-    foreach (QUmlOperation *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->ownedOperations())
-        list.append(element->asQObject());
+    foreach (QUmlOperation *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->ownedOperations())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QSet<QObject *> QUmlComponentObject::ownedReceptions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlReception *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->ownedReceptions())
-        set.insert(element->asQObject());
+    foreach (QUmlReception *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->ownedReceptions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlComponentObject::superClasses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClass *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->superClasses())
-        set.insert(element->asQObject());
+    foreach (QUmlClass *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->superClasses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -504,38 +507,38 @@ const QSet<QObject *> QUmlComponentObject::superClasses() const
 
 bool QUmlComponentObject::isIndirectlyInstantiated() const
 {
-    return qmodelingobjectproperty_cast<QUmlComponent *>(this)->isIndirectlyInstantiated();
+    return qmodelingelementproperty_cast<QUmlComponent *>(this)->isIndirectlyInstantiated();
 }
 
 const QSet<QObject *> QUmlComponentObject::packagedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->packagedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->packagedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlComponentObject::provided() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterface *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->provided())
-        set.insert(element->asQObject());
+    foreach (QUmlInterface *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->provided())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlComponentObject::realizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComponentRealization *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->realizations())
-        set.insert(element->asQObject());
+    foreach (QUmlComponentRealization *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->realizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlComponentObject::required() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterface *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->required())
-        set.insert(element->asQObject());
+    foreach (QUmlInterface *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->required())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -544,14 +547,14 @@ const QSet<QObject *> QUmlComponentObject::required() const
 QSet<QObject *> QUmlComponentObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlComponentObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlComponent *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlComponent *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -559,27 +562,27 @@ bool QUmlComponentObject::mustBeOwned() const
 QList<QObject *> QUmlComponentObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlComponentObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlComponentObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlComponent *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlComponent *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlComponentObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlComponent *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlComponent *>(this)->separator();
 }
 
 // OPERATIONS [Namespace]
@@ -588,44 +591,44 @@ QSet<QObject *> QUmlComponentObject::excludeCollisions(QSet<QObject *> imps) con
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlComponentObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlComponent *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlComponent *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlComponentObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlComponentObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlComponent *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlComponent *>(this)->membersAreDistinguishable();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlComponentObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlComponent *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlComponent *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlComponentObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlComponent *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlComponent *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [Type]
@@ -633,12 +636,12 @@ bool QUmlComponentObject::isTemplateParameter() const
 
 bool QUmlComponentObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlComponent *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlComponent *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlComponentObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlComponent *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlComponent *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [TemplateableElement]
@@ -646,8 +649,8 @@ bool QUmlComponentObject::isRedefinitionContextValid(QObject *redefined) const
 QSet<QObject *> QUmlComponentObject::parameterableElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterableElement *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->parameterableElements())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterableElement *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->parameterableElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -656,52 +659,52 @@ QSet<QObject *> QUmlComponentObject::parameterableElements() const
 QSet<QObject *> QUmlComponentObject::allFeatures() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->allFeatures())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->allFeatures())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlComponentObject::allParents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->allParents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->allParents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlComponentObject::conformsTo(QObject *other) const
 {
-    return qmodelingobjectproperty_cast<QUmlComponent *>(this)->conformsTo(qmodelingobjectproperty_cast<QUmlClassifier *>(other));
+    return qmodelingelementproperty_cast<QUmlComponent *>(this)->conformsTo(qmodelingelementproperty_cast<QUmlClassifier *>(other));
 }
 
 bool QUmlComponentObject::hasVisibilityOf(QObject *n) const
 {
-    return qmodelingobjectproperty_cast<QUmlComponent *>(this)->hasVisibilityOf(qmodelingobjectproperty_cast<QUmlNamedElement *>(n));
+    return qmodelingelementproperty_cast<QUmlComponent *>(this)->hasVisibilityOf(qmodelingelementproperty_cast<QUmlNamedElement *>(n));
 }
 
 QSet<QObject *> QUmlComponentObject::inheritableMembers(QObject *c) const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->inheritableMembers(qmodelingobjectproperty_cast<QUmlClassifier *>(c)))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->inheritableMembers(qmodelingelementproperty_cast<QUmlClassifier *>(c)))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlComponentObject::isTemplate() const
 {
-    return qmodelingobjectproperty_cast<QUmlComponent *>(this)->isTemplate();
+    return qmodelingelementproperty_cast<QUmlComponent *>(this)->isTemplate();
 }
 
 bool QUmlComponentObject::maySpecializeType(QObject *c) const
 {
-    return qmodelingobjectproperty_cast<QUmlComponent *>(this)->maySpecializeType(qmodelingobjectproperty_cast<QUmlClassifier *>(c));
+    return qmodelingelementproperty_cast<QUmlComponent *>(this)->maySpecializeType(qmodelingelementproperty_cast<QUmlClassifier *>(c));
 }
 
 QSet<QObject *> QUmlComponentObject::parents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->parents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->parents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -711,10 +714,10 @@ QSet<QObject *> QUmlComponentObject::inherit(QSet<QObject *> inhs) const
 {
     QSet<QUmlNamedElement *> inhsConverted;
     foreach (QObject *object, inhs)
-        inhsConverted.insert(qmodelingobjectproperty_cast<QUmlNamedElement *>(object));
+        inhsConverted.insert(qmodelingelementproperty_cast<QUmlNamedElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->inherit(inhsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->inherit(inhsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -723,16 +726,16 @@ QSet<QObject *> QUmlComponentObject::inherit(QSet<QObject *> inhs) const
 QSet<QObject *> QUmlComponentObject::realizedInterfaces(QObject *classifier) const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterface *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->realizedInterfaces(qmodelingobjectproperty_cast<QUmlClassifier *>(classifier)))
-        set.insert(element->asQObject());
+    foreach (QUmlInterface *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->realizedInterfaces(qmodelingelementproperty_cast<QUmlClassifier *>(classifier)))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlComponentObject::usedInterfaces(QObject *classifier) const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterface *element, qmodelingobjectproperty_cast<QUmlComponent *>(this)->usedInterfaces(qmodelingobjectproperty_cast<QUmlClassifier *>(classifier)))
-        set.insert(element->asQObject());
+    foreach (QUmlInterface *element, qmodelingelementproperty_cast<QUmlComponent *>(this)->usedInterfaces(qmodelingelementproperty_cast<QUmlClassifier *>(classifier)))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -740,521 +743,669 @@ QSet<QObject *> QUmlComponentObject::usedInterfaces(QObject *classifier) const
 
 void QUmlComponentObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlComponentObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlComponentObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlComponentObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlComponentObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlComponentObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlComponentObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlComponentObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->setName(name);
 }
 
 void QUmlComponentObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlComponentObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlComponentObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlComponentObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlComponentObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlComponentObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlComponentObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlComponentObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlComponentObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlComponentObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlComponentObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlComponentObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlComponentObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlComponentObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlComponentObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlComponentObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlComponentObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->setVisibility(visibility);
 }
 
 void QUmlComponentObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Type]
 
 void QUmlComponentObject::setPackage(QObject *package)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->setPackage(qmodelingobjectproperty_cast<QUmlPackage *>(package));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->setPackage(qmodelingelementproperty_cast<QUmlPackage *>(package));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlComponentObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlComponentObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlComponentObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlComponentObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlComponentObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlComponentObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateableElement]
 
 void QUmlComponentObject::addTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->addTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->addTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 void QUmlComponentObject::removeTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->removeTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->removeTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Classifier]
 
 void QUmlComponentObject::addAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->addAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->addAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlComponentObject::removeAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->removeAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->removeAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlComponentObject::addCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->addCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->addCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlComponentObject::removeCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->removeCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->removeCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlComponentObject::addFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->addFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->addFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlComponentObject::removeFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->removeFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->removeFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlComponentObject::addGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->addGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->addGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlComponentObject::removeGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->removeGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->removeGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlComponentObject::addInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->addInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->addInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlComponentObject::removeInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->removeInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->removeInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlComponentObject::setFinalSpecialization(bool isFinalSpecialization)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->setFinalSpecialization(isFinalSpecialization);
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->setFinalSpecialization(isFinalSpecialization);
 }
 
 void QUmlComponentObject::unsetFinalSpecialization()
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("finalSpecialization"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
 void QUmlComponentObject::setOwnedTemplateSignature(QObject *ownedTemplateSignature)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->setOwnedTemplateSignature(qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->setOwnedTemplateSignature(qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
 }
 
 void QUmlComponentObject::addOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->addOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->addOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlComponentObject::removeOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->removeOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->removeOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlComponentObject::addPowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->addPowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->addPowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlComponentObject::removePowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->removePowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->removePowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlComponentObject::addRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->addRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->addRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlComponentObject::removeRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->removeRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->removeRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlComponentObject::setRepresentation(QObject *representation)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->setRepresentation(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(representation));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->setRepresentation(qmodelingelementproperty_cast<QUmlCollaborationUse *>(representation));
 }
 
 void QUmlComponentObject::addSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->addSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->addSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlComponentObject::removeSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->removeSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->removeSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlComponentObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
 }
 
 void QUmlComponentObject::addUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->addUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->addUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 void QUmlComponentObject::removeUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->removeUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->removeUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [StructuredClassifier]
 
 void QUmlComponentObject::addOwnedConnector(QObject *ownedConnector)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->addOwnedConnector(qmodelingobjectproperty_cast<QUmlConnector *>(ownedConnector));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->addOwnedConnector(qmodelingelementproperty_cast<QUmlConnector *>(ownedConnector));
 }
 
 void QUmlComponentObject::removeOwnedConnector(QObject *ownedConnector)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->removeOwnedConnector(qmodelingobjectproperty_cast<QUmlConnector *>(ownedConnector));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->removeOwnedConnector(qmodelingelementproperty_cast<QUmlConnector *>(ownedConnector));
 }
 
 void QUmlComponentObject::addPart(QObject *part)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->addPart(qmodelingobjectproperty_cast<QUmlProperty *>(part));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->addPart(qmodelingelementproperty_cast<QUmlProperty *>(part));
 }
 
 void QUmlComponentObject::removePart(QObject *part)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->removePart(qmodelingobjectproperty_cast<QUmlProperty *>(part));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->removePart(qmodelingelementproperty_cast<QUmlProperty *>(part));
 }
 
 void QUmlComponentObject::addRole(QObject *role)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->addRole(qmodelingobjectproperty_cast<QUmlConnectableElement *>(role));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->addRole(qmodelingelementproperty_cast<QUmlConnectableElement *>(role));
 }
 
 void QUmlComponentObject::removeRole(QObject *role)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->removeRole(qmodelingobjectproperty_cast<QUmlConnectableElement *>(role));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->removeRole(qmodelingelementproperty_cast<QUmlConnectableElement *>(role));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [EncapsulatedClassifier]
 
 void QUmlComponentObject::addOwnedPort(QObject *ownedPort)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->addOwnedPort(qmodelingobjectproperty_cast<QUmlPort *>(ownedPort));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->addOwnedPort(qmodelingelementproperty_cast<QUmlPort *>(ownedPort));
 }
 
 void QUmlComponentObject::removeOwnedPort(QObject *ownedPort)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->removeOwnedPort(qmodelingobjectproperty_cast<QUmlPort *>(ownedPort));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->removeOwnedPort(qmodelingelementproperty_cast<QUmlPort *>(ownedPort));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [BehavioredClassifier]
 
 void QUmlComponentObject::setClassifierBehavior(QObject *classifierBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->setClassifierBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(classifierBehavior));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->setClassifierBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(classifierBehavior));
 }
 
 void QUmlComponentObject::addInterfaceRealization(QObject *interfaceRealization)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->addInterfaceRealization(qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->addInterfaceRealization(qmodelingelementproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
 }
 
 void QUmlComponentObject::removeInterfaceRealization(QObject *interfaceRealization)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->removeInterfaceRealization(qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->removeInterfaceRealization(qmodelingelementproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
 }
 
 void QUmlComponentObject::addOwnedBehavior(QObject *ownedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->addOwnedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(ownedBehavior));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->addOwnedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(ownedBehavior));
 }
 
 void QUmlComponentObject::removeOwnedBehavior(QObject *ownedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->removeOwnedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(ownedBehavior));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->removeOwnedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(ownedBehavior));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Class]
 
 void QUmlComponentObject::addExtension(QObject *extension)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->addExtension(qmodelingobjectproperty_cast<QUmlExtension *>(extension));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->addExtension(qmodelingelementproperty_cast<QUmlExtension *>(extension));
 }
 
 void QUmlComponentObject::removeExtension(QObject *extension)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->removeExtension(qmodelingobjectproperty_cast<QUmlExtension *>(extension));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->removeExtension(qmodelingelementproperty_cast<QUmlExtension *>(extension));
 }
 
 void QUmlComponentObject::setAbstract(bool isAbstract)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->setAbstract(isAbstract);
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->setAbstract(isAbstract);
 }
 
 void QUmlComponentObject::unsetAbstract()
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("abstract"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
 void QUmlComponentObject::setActive(bool isActive)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->setActive(isActive);
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->setActive(isActive);
 }
 
 void QUmlComponentObject::unsetActive()
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("active"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("active"));
 }
 
 void QUmlComponentObject::addNestedClassifier(QObject *nestedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->addNestedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(nestedClassifier));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->addNestedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(nestedClassifier));
 }
 
 void QUmlComponentObject::removeNestedClassifier(QObject *nestedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->removeNestedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(nestedClassifier));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->removeNestedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(nestedClassifier));
 }
 
 void QUmlComponentObject::addOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->addOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->addOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlComponentObject::removeOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->removeOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->removeOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlComponentObject::addOwnedOperation(QObject *ownedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->addOwnedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(ownedOperation));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->addOwnedOperation(qmodelingelementproperty_cast<QUmlOperation *>(ownedOperation));
 }
 
 void QUmlComponentObject::removeOwnedOperation(QObject *ownedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->removeOwnedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(ownedOperation));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->removeOwnedOperation(qmodelingelementproperty_cast<QUmlOperation *>(ownedOperation));
 }
 
 void QUmlComponentObject::addOwnedReception(QObject *ownedReception)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->addOwnedReception(qmodelingobjectproperty_cast<QUmlReception *>(ownedReception));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->addOwnedReception(qmodelingelementproperty_cast<QUmlReception *>(ownedReception));
 }
 
 void QUmlComponentObject::removeOwnedReception(QObject *ownedReception)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->removeOwnedReception(qmodelingobjectproperty_cast<QUmlReception *>(ownedReception));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->removeOwnedReception(qmodelingelementproperty_cast<QUmlReception *>(ownedReception));
 }
 
 void QUmlComponentObject::addSuperClass(QObject *superClass)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->addSuperClass(qmodelingobjectproperty_cast<QUmlClass *>(superClass));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->addSuperClass(qmodelingelementproperty_cast<QUmlClass *>(superClass));
 }
 
 void QUmlComponentObject::removeSuperClass(QObject *superClass)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->removeSuperClass(qmodelingobjectproperty_cast<QUmlClass *>(superClass));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->removeSuperClass(qmodelingelementproperty_cast<QUmlClass *>(superClass));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Component]
 
 void QUmlComponentObject::setIndirectlyInstantiated(bool isIndirectlyInstantiated)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->setIndirectlyInstantiated(isIndirectlyInstantiated);
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->setIndirectlyInstantiated(isIndirectlyInstantiated);
 }
 
 void QUmlComponentObject::unsetIndirectlyInstantiated()
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("indirectlyInstantiated"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("indirectlyInstantiated"));
 }
 
 void QUmlComponentObject::addPackagedElement(QObject *packagedElement)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->addPackagedElement(qmodelingobjectproperty_cast<QUmlPackageableElement *>(packagedElement));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->addPackagedElement(qmodelingelementproperty_cast<QUmlPackageableElement *>(packagedElement));
 }
 
 void QUmlComponentObject::removePackagedElement(QObject *packagedElement)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->removePackagedElement(qmodelingobjectproperty_cast<QUmlPackageableElement *>(packagedElement));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->removePackagedElement(qmodelingelementproperty_cast<QUmlPackageableElement *>(packagedElement));
 }
 
 void QUmlComponentObject::addProvided(QObject *provided)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->addProvided(qmodelingobjectproperty_cast<QUmlInterface *>(provided));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->addProvided(qmodelingelementproperty_cast<QUmlInterface *>(provided));
 }
 
 void QUmlComponentObject::removeProvided(QObject *provided)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->removeProvided(qmodelingobjectproperty_cast<QUmlInterface *>(provided));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->removeProvided(qmodelingelementproperty_cast<QUmlInterface *>(provided));
 }
 
 void QUmlComponentObject::addRealization(QObject *realization)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->addRealization(qmodelingobjectproperty_cast<QUmlComponentRealization *>(realization));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->addRealization(qmodelingelementproperty_cast<QUmlComponentRealization *>(realization));
 }
 
 void QUmlComponentObject::removeRealization(QObject *realization)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->removeRealization(qmodelingobjectproperty_cast<QUmlComponentRealization *>(realization));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->removeRealization(qmodelingelementproperty_cast<QUmlComponentRealization *>(realization));
 }
 
 void QUmlComponentObject::addRequired(QObject *required)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->addRequired(qmodelingobjectproperty_cast<QUmlInterface *>(required));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->addRequired(qmodelingelementproperty_cast<QUmlInterface *>(required));
 }
 
 void QUmlComponentObject::removeRequired(QObject *required)
 {
-    qmodelingobjectproperty_cast<QUmlComponent *>(this)->removeRequired(qmodelingobjectproperty_cast<QUmlInterface *>(required));
+    qmodelingelementproperty_cast<QUmlComponent *>(this)->removeRequired(qmodelingelementproperty_cast<QUmlInterface *>(required));
+}
+
+
+void QUmlComponentObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlType");
+    d->groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
+
+    d->propertyGroups << QStringLiteral("QUmlStructuredClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedConnectors"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parts"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("roles"))));
+
+    d->propertyGroups << QStringLiteral("QUmlEncapsulatedClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlEncapsulatedClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedPorts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlBehavioredClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifierBehavior"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interfaceRealizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedBehaviors"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClass");
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extensions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isActive"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedReceptions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superClasses"))));
+
+    d->propertyGroups << QStringLiteral("QUmlComponent");
+    d->groupProperties.insert(QStringLiteral("QUmlComponent"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isIndirectlyInstantiated"))));
+    d->groupProperties.insert(QStringLiteral("QUmlComponent"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packagedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlComponent"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("provided"))));
+    d->groupProperties.insert(QStringLiteral("QUmlComponent"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("realizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlComponent"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("required"))));
+}
+
+void QUmlComponentObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, isIndirectlyInstantiated, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, isIndirectlyInstantiated, PropertyClassRole, QStringLiteral("QUmlComponent"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, isIndirectlyInstantiated, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, isIndirectlyInstantiated, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, isIndirectlyInstantiated, DocumentationRole, QStringLiteral("isIndirectlyInstantiated : Boolean {default = true} The kind of instantiation that applies to a Component. If false, the component is instantiated as an addressable object. If true, the Component is defined at design-time, but at run-time (or execution-time) an object specified by the Component does not exist, that is, the component is instantiated indirectly, through the instantiation of its realizing classifiers or parts. Several standard stereotypes use this meta attribute (e.g., specification, focus, subsystem)."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, isIndirectlyInstantiated, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, isIndirectlyInstantiated, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, isIndirectlyInstantiated, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, packagedElements, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, packagedElements, PropertyClassRole, QStringLiteral("QUmlComponent"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, packagedElements, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, packagedElements, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, packagedElements, DocumentationRole, QStringLiteral("The set of PackageableElements that a Component owns. In the namespace of a component, all model elements that are involved in or related to its definition may be owned or imported explicitly. These may include e.g. Classes, Interfaces, Components, Packages, Use cases, Dependencies (e.g. mappings), and Artifacts."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, packagedElements, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, packagedElements, SubsettedPropertiesRole, QStringLiteral("Namespace-ownedMember"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, packagedElements, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, provided, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, provided, PropertyClassRole, QStringLiteral("QUmlComponent"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, provided, IsDerivedRole, true);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, provided, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, provided, DocumentationRole, QStringLiteral("The interfaces that the component exposes to its environment. These interfaces may be Realized by the Component or any of its realizingClassifiers, or they may be the Interfaces that are provided by its public Ports."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, provided, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, provided, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, provided, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, realizations, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, realizations, PropertyClassRole, QStringLiteral("QUmlComponent"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, realizations, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, realizations, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, realizations, DocumentationRole, QStringLiteral("The set of Realizations owned by the Component. Realizations reference the Classifiers of which the Component is an abstraction; i.e., that realize its behavior."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, realizations, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, realizations, SubsettedPropertiesRole, QStringLiteral("A_supplier_supplierDependency-supplierDependency Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, realizations, OppositeEndRole, QStringLiteral("ComponentRealization-abstraction"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, required, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, required, PropertyClassRole, QStringLiteral("QUmlComponent"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, required, IsDerivedRole, true);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, required, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, required, DocumentationRole, QStringLiteral("The interfaces that the component requires from other components in its environment in order to be able to offer its full set of provided functionality. These interfaces may be used by the Component or any of its realizingClassifiers, or they may be the Interfaces that are required by its public Ports."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, required, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, required, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponent, required, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlcomponentobject_p.h b/src/uml/qobjects/qumlcomponentobject_p.h
index 2d20b72c..82d8ee33 100644
--- a/src/uml/qobjects/qumlcomponentobject_p.h
+++ b/src/uml/qobjects/qumlcomponentobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlComponent;
-class Q_UML_EXPORT QUmlComponentObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlComponentObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlComponentObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -142,7 +145,7 @@ class Q_UML_EXPORT QUmlComponentObject : public QObject
     Q_PROPERTY(QSet<QObject *> required READ required STORED false)
 
 public:
-    Q_INVOKABLE explicit QUmlComponentObject(QUmlComponent *qModelingObject);
+    Q_INVOKABLE explicit QUmlComponentObject(QUmlComponent *qModelingElement);
     virtual ~QUmlComponentObject();
 
     // Owned attributes [Element]
@@ -402,6 +405,10 @@ public Q_SLOTS:
     void removeRealization(QObject *realization);
     void Q_DECL_HIDDEN addRequired(QObject *required);
     void Q_DECL_HIDDEN removeRequired(QObject *required);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlcomponentrealizationobject.cpp b/src/uml/qobjects/qumlcomponentrealizationobject.cpp
index 55b5b33f..56fd5028 100644
--- a/src/uml/qobjects/qumlcomponentrealizationobject.cpp
+++ b/src/uml/qobjects/qumlcomponentrealizationobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlcomponentrealizationobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlComponentRealization>
 #include <QtUml/QUmlClassifier>
@@ -56,16 +57,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlComponentRealizationObject::QUmlComponentRealizationObject(QUmlComponentRealization *qModelingObject)
+QUmlComponentRealizationObject::QUmlComponentRealizationObject(QUmlComponentRealization *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlComponentRealizationObject::~QUmlComponentRealizationObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -74,43 +77,43 @@ QUmlComponentRealizationObject::~QUmlComponentRealizationObject()
 const QSet<QObject *> QUmlComponentRealizationObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlComponentRealizationObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlComponentRealizationObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlComponentRealizationObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlComponentRealizationObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -118,42 +121,42 @@ QObject *QUmlComponentRealizationObject::templateParameter() const
 const QSet<QObject *> QUmlComponentRealizationObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlComponentRealizationObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->name();
 }
 
 QObject *QUmlComponentRealizationObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlComponentRealizationObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlComponentRealizationObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlComponentRealizationObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Relationship]
@@ -161,8 +164,8 @@ QtUml::VisibilityKind QUmlComponentRealizationObject::visibility() const
 const QSet<QObject *> QUmlComponentRealizationObject::relatedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->relatedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->relatedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -171,16 +174,16 @@ const QSet<QObject *> QUmlComponentRealizationObject::relatedElements() const
 const QSet<QObject *> QUmlComponentRealizationObject::sources() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->sources())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->sources())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlComponentRealizationObject::targets() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->targets())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->targets())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -189,16 +192,16 @@ const QSet<QObject *> QUmlComponentRealizationObject::targets() const
 const QSet<QObject *> QUmlComponentRealizationObject::clients() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->clients())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->clients())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlComponentRealizationObject::suppliers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->suppliers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->suppliers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -206,27 +209,27 @@ const QSet<QObject *> QUmlComponentRealizationObject::suppliers() const
 
 QObject *QUmlComponentRealizationObject::mapping() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->mapping())
+    if (!qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->mapping())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->mapping()->asQObject();
+        return qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->mapping()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ComponentRealization]
 
 QObject *QUmlComponentRealizationObject::abstraction() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->abstraction())
+    if (!qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->abstraction())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->abstraction()->asQObject();
+        return qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->abstraction()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlComponentRealizationObject::realizingClassifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->realizingClassifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->realizingClassifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -235,26 +238,26 @@ const QSet<QObject *> QUmlComponentRealizationObject::realizingClassifiers() con
 QSet<QObject *> QUmlComponentRealizationObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlComponentRealizationObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlComponentRealizationObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlComponentRealizationObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [NamedElement]
@@ -262,189 +265,261 @@ bool QUmlComponentRealizationObject::isTemplateParameter() const
 QList<QObject *> QUmlComponentRealizationObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlComponentRealizationObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlComponentRealizationObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlComponentRealizationObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlComponentRealizationObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlComponentRealizationObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlComponentRealizationObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlComponentRealizationObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlComponentRealizationObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlComponentRealizationObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlComponentRealizationObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlComponentRealizationObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlComponentRealizationObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlComponentRealizationObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->setName(name);
 }
 
 void QUmlComponentRealizationObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlComponentRealizationObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlComponentRealizationObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlComponentRealizationObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->setVisibility(visibility);
 }
 
 void QUmlComponentRealizationObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Relationship]
 
 void QUmlComponentRealizationObject::addRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->addRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->addRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 void QUmlComponentRealizationObject::removeRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->removeRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->removeRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [DirectedRelationship]
 
 void QUmlComponentRealizationObject::addSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->addSource(qmodelingobjectproperty_cast<QUmlElement *>(source));
+    qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->addSource(qmodelingelementproperty_cast<QUmlElement *>(source));
 }
 
 void QUmlComponentRealizationObject::removeSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->removeSource(qmodelingobjectproperty_cast<QUmlElement *>(source));
+    qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->removeSource(qmodelingelementproperty_cast<QUmlElement *>(source));
 }
 
 void QUmlComponentRealizationObject::addTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->addTarget(qmodelingobjectproperty_cast<QUmlElement *>(target));
+    qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->addTarget(qmodelingelementproperty_cast<QUmlElement *>(target));
 }
 
 void QUmlComponentRealizationObject::removeTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->removeTarget(qmodelingobjectproperty_cast<QUmlElement *>(target));
+    qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->removeTarget(qmodelingelementproperty_cast<QUmlElement *>(target));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Dependency]
 
 void QUmlComponentRealizationObject::addClient(QObject *client)
 {
-    qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->addClient(qmodelingobjectproperty_cast<QUmlNamedElement *>(client));
+    qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->addClient(qmodelingelementproperty_cast<QUmlNamedElement *>(client));
 }
 
 void QUmlComponentRealizationObject::removeClient(QObject *client)
 {
-    qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->removeClient(qmodelingobjectproperty_cast<QUmlNamedElement *>(client));
+    qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->removeClient(qmodelingelementproperty_cast<QUmlNamedElement *>(client));
 }
 
 void QUmlComponentRealizationObject::addSupplier(QObject *supplier)
 {
-    qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->addSupplier(qmodelingobjectproperty_cast<QUmlNamedElement *>(supplier));
+    qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->addSupplier(qmodelingelementproperty_cast<QUmlNamedElement *>(supplier));
 }
 
 void QUmlComponentRealizationObject::removeSupplier(QObject *supplier)
 {
-    qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->removeSupplier(qmodelingobjectproperty_cast<QUmlNamedElement *>(supplier));
+    qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->removeSupplier(qmodelingelementproperty_cast<QUmlNamedElement *>(supplier));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Abstraction]
 
 void QUmlComponentRealizationObject::setMapping(QObject *mapping)
 {
-    qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->setMapping(qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(mapping));
+    qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->setMapping(qmodelingelementproperty_cast<QUmlOpaqueExpression *>(mapping));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ComponentRealization]
 
 void QUmlComponentRealizationObject::setAbstraction(QObject *abstraction)
 {
-    qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->setAbstraction(qmodelingobjectproperty_cast<QUmlComponent *>(abstraction));
+    qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->setAbstraction(qmodelingelementproperty_cast<QUmlComponent *>(abstraction));
 }
 
 void QUmlComponentRealizationObject::addRealizingClassifier(QObject *realizingClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->addRealizingClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(realizingClassifier));
+    qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->addRealizingClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(realizingClassifier));
 }
 
 void QUmlComponentRealizationObject::removeRealizingClassifier(QObject *realizingClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlComponentRealization *>(this)->removeRealizingClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(realizingClassifier));
+    qmodelingelementproperty_cast<QUmlComponentRealization *>(this)->removeRealizingClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(realizingClassifier));
+}
+
+
+void QUmlComponentRealizationObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDirectedRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDependency");
+    d->groupProperties.insert(QStringLiteral("QUmlDependency"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clients"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDependency"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("suppliers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAbstraction");
+    d->groupProperties.insert(QStringLiteral("QUmlAbstraction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("mapping"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRealization");
+
+    d->propertyGroups << QStringLiteral("QUmlComponentRealization");
+    d->groupProperties.insert(QStringLiteral("QUmlComponentRealization"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("abstraction"))));
+    d->groupProperties.insert(QStringLiteral("QUmlComponentRealization"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("realizingClassifiers"))));
+}
+
+void QUmlComponentRealizationObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponentRealization, abstraction, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponentRealization, abstraction, PropertyClassRole, QStringLiteral("QUmlComponentRealization"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponentRealization, abstraction, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponentRealization, abstraction, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponentRealization, abstraction, DocumentationRole, QStringLiteral("The Component that owns this ComponentRealization and which is implemented by its realizing classifiers."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponentRealization, abstraction, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponentRealization, abstraction, SubsettedPropertiesRole, QStringLiteral("Dependency-supplier Element-owner"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponentRealization, abstraction, OppositeEndRole, QStringLiteral("Component-realization"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponentRealization, realizingClassifiers, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponentRealization, realizingClassifiers, PropertyClassRole, QStringLiteral("QUmlComponentRealization"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponentRealization, realizingClassifiers, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponentRealization, realizingClassifiers, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponentRealization, realizingClassifiers, DocumentationRole, QStringLiteral("The classifiers that are involved in the implementation of the Component that owns this Realization."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponentRealization, realizingClassifiers, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponentRealization, realizingClassifiers, SubsettedPropertiesRole, QStringLiteral("Dependency-client"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlComponentRealization, realizingClassifiers, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlcomponentrealizationobject_p.h b/src/uml/qobjects/qumlcomponentrealizationobject_p.h
index 4d40b236..d9967c4a 100644
--- a/src/uml/qobjects/qumlcomponentrealizationobject_p.h
+++ b/src/uml/qobjects/qumlcomponentrealizationobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlComponentRealization;
-class Q_UML_EXPORT QUmlComponentRealizationObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlComponentRealizationObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlComponentRealizationObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -96,7 +99,7 @@ class Q_UML_EXPORT QUmlComponentRealizationObject : public QObject
     Q_PROPERTY(QSet<QObject *> realizingClassifiers READ realizingClassifiers)
 
 public:
-    Q_INVOKABLE explicit QUmlComponentRealizationObject(QUmlComponentRealization *qModelingObject);
+    Q_INVOKABLE explicit QUmlComponentRealizationObject(QUmlComponentRealization *qModelingElement);
     virtual ~QUmlComponentRealizationObject();
 
     // Owned attributes [Element]
@@ -198,6 +201,10 @@ public Q_SLOTS:
     void setAbstraction(QObject *abstraction = 0);
     void addRealizingClassifier(QObject *realizingClassifier);
     void removeRealizingClassifier(QObject *realizingClassifier);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlconditionalnodeobject.cpp b/src/uml/qobjects/qumlconditionalnodeobject.cpp
index f360588d..918a57f2 100644
--- a/src/uml/qobjects/qumlconditionalnodeobject.cpp
+++ b/src/uml/qobjects/qumlconditionalnodeobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlconditionalnodeobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlConditionalNode>
 #include <QtUml/QUmlActivity>
@@ -69,16 +70,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlConditionalNodeObject::QUmlConditionalNodeObject(QUmlConditionalNode *qModelingObject)
+QUmlConditionalNodeObject::QUmlConditionalNodeObject(QUmlConditionalNode *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlConditionalNodeObject::~QUmlConditionalNodeObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -87,25 +90,25 @@ QUmlConditionalNodeObject::~QUmlConditionalNodeObject()
 const QSet<QObject *> QUmlConditionalNodeObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlConditionalNodeObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlConditionalNodeObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -113,62 +116,62 @@ QObject *QUmlConditionalNodeObject::owner() const
 const QSet<QObject *> QUmlConditionalNodeObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlConditionalNodeObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->name();
 }
 
 QObject *QUmlConditionalNodeObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlConditionalNodeObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlConditionalNodeObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlConditionalNodeObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlConditionalNodeObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlConditionalNodeObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlConditionalNodeObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -177,56 +180,56 @@ const QSet<QObject *> QUmlConditionalNodeObject::redefinitionContexts() const
 const QSet<QObject *> QUmlConditionalNodeObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlConditionalNodeObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlConditionalNodeObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlConditionalNodeObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlConditionalNodeObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlConditionalNodeObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlConditionalNodeObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -235,8 +238,8 @@ const QSet<QObject *> QUmlConditionalNodeObject::redefinedNodes() const
 const QSet<QObject *> QUmlConditionalNodeObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -244,46 +247,46 @@ const QSet<QObject *> QUmlConditionalNodeObject::handlers() const
 
 QObject *QUmlConditionalNodeObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlConditionalNodeObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlConditionalNodeObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlConditionalNodeObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlConditionalNodeObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlConditionalNodeObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -292,48 +295,48 @@ const QList<QObject *> QUmlConditionalNodeObject::outputs() const
 const QSet<QObject *> QUmlConditionalNodeObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlConditionalNodeObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlConditionalNodeObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlConditionalNodeObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlConditionalNodeObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlConditionalNodeObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -342,79 +345,79 @@ const QSet<QObject *> QUmlConditionalNodeObject::packageImports() const
 const QSet<QObject *> QUmlConditionalNodeObject::containedEdges() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->containedEdges())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->containedEdges())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlConditionalNodeObject::containedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->containedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->containedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlConditionalNodeObject::subgroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->subgroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->subgroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlConditionalNodeObject::superGroup() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->superGroup())
+    if (!qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->superGroup())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->superGroup()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->superGroup()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [StructuredActivityNode]
 
 QObject *QUmlConditionalNodeObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlConditionalNodeObject::edges() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->edges())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->edges())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlConditionalNodeObject::mustIsolate() const
 {
-    return qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->mustIsolate();
+    return qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->mustIsolate();
 }
 
 const QSet<QObject *> QUmlConditionalNodeObject::nodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->nodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->nodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlConditionalNodeObject::structuredNodeInputs() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->structuredNodeInputs())
-        set.insert(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->structuredNodeInputs())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlConditionalNodeObject::variables() const
 {
     QSet<QObject *> set;
-    foreach (QUmlVariable *element, qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->variables())
-        set.insert(element->asQObject());
+    foreach (QUmlVariable *element, qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->variables())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -423,26 +426,26 @@ const QSet<QObject *> QUmlConditionalNodeObject::variables() const
 const QSet<QObject *> QUmlConditionalNodeObject::clauses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClause *element, qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->clauses())
-        set.insert(element->asQObject());
+    foreach (QUmlClause *element, qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->clauses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlConditionalNodeObject::isAssured() const
 {
-    return qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->isAssured();
+    return qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->isAssured();
 }
 
 bool QUmlConditionalNodeObject::isDeterminate() const
 {
-    return qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->isDeterminate();
+    return qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->isDeterminate();
 }
 
 const QList<QObject *> QUmlConditionalNodeObject::results() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->results())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->results())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -451,14 +454,14 @@ const QList<QObject *> QUmlConditionalNodeObject::results() const
 QSet<QObject *> QUmlConditionalNodeObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlConditionalNodeObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -466,39 +469,39 @@ bool QUmlConditionalNodeObject::mustBeOwned() const
 QList<QObject *> QUmlConditionalNodeObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlConditionalNodeObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlConditionalNodeObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlConditionalNodeObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlConditionalNodeObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlConditionalNodeObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [Namespace]
@@ -507,462 +510,583 @@ QSet<QObject *> QUmlConditionalNodeObject::excludeCollisions(QSet<QObject *> imp
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlConditionalNodeObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlConditionalNodeObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlConditionalNodeObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->membersAreDistinguishable();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlConditionalNodeObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlConditionalNodeObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlConditionalNodeObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlConditionalNodeObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlConditionalNodeObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlConditionalNodeObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlConditionalNodeObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlConditionalNodeObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->setName(name);
 }
 
 void QUmlConditionalNodeObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlConditionalNodeObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlConditionalNodeObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlConditionalNodeObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlConditionalNodeObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlConditionalNodeObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlConditionalNodeObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlConditionalNodeObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlConditionalNodeObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlConditionalNodeObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlConditionalNodeObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlConditionalNodeObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlConditionalNodeObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlConditionalNodeObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlConditionalNodeObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlConditionalNodeObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlConditionalNodeObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlConditionalNodeObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlConditionalNodeObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlConditionalNodeObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlConditionalNodeObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlConditionalNodeObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlConditionalNodeObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlConditionalNodeObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlConditionalNodeObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlConditionalNodeObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlConditionalNodeObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlConditionalNodeObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlConditionalNodeObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlConditionalNodeObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlConditionalNodeObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlConditionalNodeObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlConditionalNodeObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlConditionalNodeObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlConditionalNodeObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlConditionalNodeObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlConditionalNodeObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlConditionalNodeObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlConditionalNodeObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlConditionalNodeObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlConditionalNodeObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlConditionalNodeObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlConditionalNodeObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlConditionalNodeObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlConditionalNodeObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlConditionalNodeObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlConditionalNodeObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlConditionalNodeObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityGroup]
 
 void QUmlConditionalNodeObject::addContainedEdge(QObject *containedEdge)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->addContainedEdge(qmodelingobjectproperty_cast<QUmlActivityEdge *>(containedEdge));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->addContainedEdge(qmodelingelementproperty_cast<QUmlActivityEdge *>(containedEdge));
 }
 
 void QUmlConditionalNodeObject::removeContainedEdge(QObject *containedEdge)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->removeContainedEdge(qmodelingobjectproperty_cast<QUmlActivityEdge *>(containedEdge));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->removeContainedEdge(qmodelingelementproperty_cast<QUmlActivityEdge *>(containedEdge));
 }
 
 void QUmlConditionalNodeObject::addContainedNode(QObject *containedNode)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->addContainedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(containedNode));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->addContainedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(containedNode));
 }
 
 void QUmlConditionalNodeObject::removeContainedNode(QObject *containedNode)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->removeContainedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(containedNode));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->removeContainedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(containedNode));
 }
 
 void QUmlConditionalNodeObject::addSubgroup(QObject *subgroup)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->addSubgroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(subgroup));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->addSubgroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(subgroup));
 }
 
 void QUmlConditionalNodeObject::removeSubgroup(QObject *subgroup)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->removeSubgroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(subgroup));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->removeSubgroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(subgroup));
 }
 
 void QUmlConditionalNodeObject::setSuperGroup(QObject *superGroup)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->setSuperGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(superGroup));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->setSuperGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(superGroup));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [StructuredActivityNode]
 
 void QUmlConditionalNodeObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlConditionalNodeObject::addEdge(QObject *edge)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->addEdge(qmodelingobjectproperty_cast<QUmlActivityEdge *>(edge));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->addEdge(qmodelingelementproperty_cast<QUmlActivityEdge *>(edge));
 }
 
 void QUmlConditionalNodeObject::removeEdge(QObject *edge)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->removeEdge(qmodelingobjectproperty_cast<QUmlActivityEdge *>(edge));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->removeEdge(qmodelingelementproperty_cast<QUmlActivityEdge *>(edge));
 }
 
 void QUmlConditionalNodeObject::setMustIsolate(bool mustIsolate)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->setMustIsolate(mustIsolate);
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->setMustIsolate(mustIsolate);
 }
 
 void QUmlConditionalNodeObject::unsetMustIsolate()
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("mustIsolate"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("mustIsolate"));
 }
 
 void QUmlConditionalNodeObject::addNode(QObject *node)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->addNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(node));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->addNode(qmodelingelementproperty_cast<QUmlActivityNode *>(node));
 }
 
 void QUmlConditionalNodeObject::removeNode(QObject *node)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->removeNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(node));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->removeNode(qmodelingelementproperty_cast<QUmlActivityNode *>(node));
 }
 
 void QUmlConditionalNodeObject::addStructuredNodeInput(QObject *structuredNodeInput)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->addStructuredNodeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(structuredNodeInput));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->addStructuredNodeInput(qmodelingelementproperty_cast<QUmlInputPin *>(structuredNodeInput));
 }
 
 void QUmlConditionalNodeObject::removeStructuredNodeInput(QObject *structuredNodeInput)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->removeStructuredNodeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(structuredNodeInput));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->removeStructuredNodeInput(qmodelingelementproperty_cast<QUmlInputPin *>(structuredNodeInput));
 }
 
 void QUmlConditionalNodeObject::addVariable(QObject *variable)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->addVariable(qmodelingobjectproperty_cast<QUmlVariable *>(variable));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->addVariable(qmodelingelementproperty_cast<QUmlVariable *>(variable));
 }
 
 void QUmlConditionalNodeObject::removeVariable(QObject *variable)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->removeVariable(qmodelingobjectproperty_cast<QUmlVariable *>(variable));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->removeVariable(qmodelingelementproperty_cast<QUmlVariable *>(variable));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ConditionalNode]
 
 void QUmlConditionalNodeObject::addClause(QObject *clause)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->addClause(qmodelingobjectproperty_cast<QUmlClause *>(clause));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->addClause(qmodelingelementproperty_cast<QUmlClause *>(clause));
 }
 
 void QUmlConditionalNodeObject::removeClause(QObject *clause)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->removeClause(qmodelingobjectproperty_cast<QUmlClause *>(clause));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->removeClause(qmodelingelementproperty_cast<QUmlClause *>(clause));
 }
 
 void QUmlConditionalNodeObject::setAssured(bool isAssured)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->setAssured(isAssured);
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->setAssured(isAssured);
 }
 
 void QUmlConditionalNodeObject::unsetAssured()
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("assured"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("assured"));
 }
 
 void QUmlConditionalNodeObject::setDeterminate(bool isDeterminate)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->setDeterminate(isDeterminate);
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->setDeterminate(isDeterminate);
 }
 
 void QUmlConditionalNodeObject::unsetDeterminate()
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("determinate"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("determinate"));
 }
 
 void QUmlConditionalNodeObject::addResult(QObject *result)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->addResult(qmodelingobjectproperty_cast<QUmlOutputPin *>(result));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->addResult(qmodelingelementproperty_cast<QUmlOutputPin *>(result));
 }
 
 void QUmlConditionalNodeObject::removeResult(QObject *result)
 {
-    qmodelingobjectproperty_cast<QUmlConditionalNode *>(this)->removeResult(qmodelingobjectproperty_cast<QUmlOutputPin *>(result));
+    qmodelingelementproperty_cast<QUmlConditionalNode *>(this)->removeResult(qmodelingelementproperty_cast<QUmlOutputPin *>(result));
+}
+
+
+void QUmlConditionalNodeObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityGroup");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("containedEdges"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("containedNodes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("subgroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superGroup"))));
+
+    d->propertyGroups << QStringLiteral("QUmlStructuredActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("edges"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("mustIsolate"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nodes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("structuredNodeInputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("variables"))));
+
+    d->propertyGroups << QStringLiteral("QUmlConditionalNode");
+    d->groupProperties.insert(QStringLiteral("QUmlConditionalNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clauses"))));
+    d->groupProperties.insert(QStringLiteral("QUmlConditionalNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAssured"))));
+    d->groupProperties.insert(QStringLiteral("QUmlConditionalNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isDeterminate"))));
+    d->groupProperties.insert(QStringLiteral("QUmlConditionalNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("results"))));
+}
+
+void QUmlConditionalNodeObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConditionalNode, clauses, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConditionalNode, clauses, PropertyClassRole, QStringLiteral("QUmlConditionalNode"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConditionalNode, clauses, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConditionalNode, clauses, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConditionalNode, clauses, DocumentationRole, QStringLiteral("Set of clauses composing the conditional."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConditionalNode, clauses, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConditionalNode, clauses, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConditionalNode, clauses, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConditionalNode, isAssured, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConditionalNode, isAssured, PropertyClassRole, QStringLiteral("QUmlConditionalNode"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConditionalNode, isAssured, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConditionalNode, isAssured, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConditionalNode, isAssured, DocumentationRole, QStringLiteral("If true, the modeler asserts that at least one test will succeed."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConditionalNode, isAssured, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConditionalNode, isAssured, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConditionalNode, isAssured, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConditionalNode, isDeterminate, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConditionalNode, isDeterminate, PropertyClassRole, QStringLiteral("QUmlConditionalNode"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConditionalNode, isDeterminate, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConditionalNode, isDeterminate, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConditionalNode, isDeterminate, DocumentationRole, QStringLiteral("If true, the modeler asserts that at most one test will succeed."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConditionalNode, isDeterminate, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConditionalNode, isDeterminate, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConditionalNode, isDeterminate, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConditionalNode, results, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConditionalNode, results, PropertyClassRole, QStringLiteral("QUmlConditionalNode"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConditionalNode, results, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConditionalNode, results, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConditionalNode, results, DocumentationRole, QStringLiteral("A list of output pins that constitute the data flow outputs of the conditional."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConditionalNode, results, RedefinedPropertiesRole, QStringLiteral("StructuredActivityNode-structuredNodeOutput"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConditionalNode, results, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConditionalNode, results, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlconditionalnodeobject_p.h b/src/uml/qobjects/qumlconditionalnodeobject_p.h
index 63f43ca3..e792fbfb 100644
--- a/src/uml/qobjects/qumlconditionalnodeobject_p.h
+++ b/src/uml/qobjects/qumlconditionalnodeobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlConditionalNode;
-class Q_UML_EXPORT QUmlConditionalNodeObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlConditionalNodeObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlConditionalNodeObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -125,7 +128,7 @@ class Q_UML_EXPORT QUmlConditionalNodeObject : public QObject
     Q_PROPERTY(QList<QObject *> results READ results)
 
 public:
-    Q_INVOKABLE explicit QUmlConditionalNodeObject(QUmlConditionalNode *qModelingObject);
+    Q_INVOKABLE explicit QUmlConditionalNodeObject(QUmlConditionalNode *qModelingElement);
     virtual ~QUmlConditionalNodeObject();
 
     // Owned attributes [Element]
@@ -317,6 +320,10 @@ public Q_SLOTS:
     void unsetDeterminate();
     void addResult(QObject *result);
     void removeResult(QObject *result);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlconnectableelementtemplateparameterobject.cpp b/src/uml/qobjects/qumlconnectableelementtemplateparameterobject.cpp
index b65c3184..be6b1053 100644
--- a/src/uml/qobjects/qumlconnectableelementtemplateparameterobject.cpp
+++ b/src/uml/qobjects/qumlconnectableelementtemplateparameterobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlconnectableelementtemplateparameterobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlConnectableElementTemplateParameter>
 #include <QtUml/QUmlComment>
@@ -49,16 +50,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlConnectableElementTemplateParameterObject::QUmlConnectableElementTemplateParameterObject(QUmlConnectableElementTemplateParameter *qModelingObject)
+QUmlConnectableElementTemplateParameterObject::QUmlConnectableElementTemplateParameterObject(QUmlConnectableElementTemplateParameter *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlConnectableElementTemplateParameterObject::~QUmlConnectableElementTemplateParameterObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -67,69 +70,69 @@ QUmlConnectableElementTemplateParameterObject::~QUmlConnectableElementTemplatePa
 const QSet<QObject *> QUmlConnectableElementTemplateParameterObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlConnectableElementTemplateParameterObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlConnectableElementTemplateParameterObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [TemplateParameter]
 
 QObject *QUmlConnectableElementTemplateParameterObject::default_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->default_())
+    if (!qmodelingelementproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->default_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->default_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->default_()->asQModelingObject();
 }
 
 QObject *QUmlConnectableElementTemplateParameterObject::ownedDefault() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->ownedDefault())
+    if (!qmodelingelementproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->ownedDefault())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->ownedDefault()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->ownedDefault()->asQModelingObject();
 }
 
 QObject *QUmlConnectableElementTemplateParameterObject::ownedParameteredElement() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->ownedParameteredElement())
+    if (!qmodelingelementproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->ownedParameteredElement())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->ownedParameteredElement()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->ownedParameteredElement()->asQModelingObject();
 }
 
 QObject *QUmlConnectableElementTemplateParameterObject::signature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->signature())
+    if (!qmodelingelementproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->signature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->signature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->signature()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ConnectableElementTemplateParameter]
 
 QObject *QUmlConnectableElementTemplateParameterObject::parameteredElement() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->parameteredElement())
+    if (!qmodelingelementproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->parameteredElement())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->parameteredElement()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->parameteredElement()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -137,70 +140,107 @@ QObject *QUmlConnectableElementTemplateParameterObject::parameteredElement() con
 QSet<QObject *> QUmlConnectableElementTemplateParameterObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlConnectableElementTemplateParameterObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->mustBeOwned();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlConnectableElementTemplateParameterObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlConnectableElementTemplateParameterObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlConnectableElementTemplateParameterObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlConnectableElementTemplateParameterObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlConnectableElementTemplateParameterObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateParameter]
 
 void QUmlConnectableElementTemplateParameterObject::setDefault(QObject *default_)
 {
-    qmodelingobjectproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->setDefault(qmodelingobjectproperty_cast<QUmlParameterableElement *>(default_));
+    qmodelingelementproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->setDefault(qmodelingelementproperty_cast<QUmlParameterableElement *>(default_));
 }
 
 void QUmlConnectableElementTemplateParameterObject::setOwnedDefault(QObject *ownedDefault)
 {
-    qmodelingobjectproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->setOwnedDefault(qmodelingobjectproperty_cast<QUmlParameterableElement *>(ownedDefault));
+    qmodelingelementproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->setOwnedDefault(qmodelingelementproperty_cast<QUmlParameterableElement *>(ownedDefault));
 }
 
 void QUmlConnectableElementTemplateParameterObject::setOwnedParameteredElement(QObject *ownedParameteredElement)
 {
-    qmodelingobjectproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->setOwnedParameteredElement(qmodelingobjectproperty_cast<QUmlParameterableElement *>(ownedParameteredElement));
+    qmodelingelementproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->setOwnedParameteredElement(qmodelingelementproperty_cast<QUmlParameterableElement *>(ownedParameteredElement));
 }
 
 void QUmlConnectableElementTemplateParameterObject::setSignature(QObject *signature)
 {
-    qmodelingobjectproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->setSignature(qmodelingobjectproperty_cast<QUmlTemplateSignature *>(signature));
+    qmodelingelementproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->setSignature(qmodelingelementproperty_cast<QUmlTemplateSignature *>(signature));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ConnectableElementTemplateParameter]
 
 void QUmlConnectableElementTemplateParameterObject::setParameteredElement(QObject *parameteredElement)
 {
-    qmodelingobjectproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->setParameteredElement(qmodelingobjectproperty_cast<QUmlConnectableElement *>(parameteredElement));
+    qmodelingelementproperty_cast<QUmlConnectableElementTemplateParameter *>(this)->setParameteredElement(qmodelingelementproperty_cast<QUmlConnectableElement *>(parameteredElement));
+}
+
+
+void QUmlConnectableElementTemplateParameterObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateParameter");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("default_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedDefault"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameteredElement"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("signature"))));
+
+    d->propertyGroups << QStringLiteral("QUmlConnectableElementTemplateParameter");
+    d->groupProperties.insert(QStringLiteral("QUmlConnectableElementTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parameteredElement"))));
+}
+
+void QUmlConnectableElementTemplateParameterObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectableElementTemplateParameter, parameteredElement, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectableElementTemplateParameter, parameteredElement, PropertyClassRole, QStringLiteral("QUmlConnectableElementTemplateParameter"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectableElementTemplateParameter, parameteredElement, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectableElementTemplateParameter, parameteredElement, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectableElementTemplateParameter, parameteredElement, DocumentationRole, QStringLiteral("The ConnectableElement for this template parameter."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectableElementTemplateParameter, parameteredElement, RedefinedPropertiesRole, QStringLiteral("TemplateParameter-parameteredElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectableElementTemplateParameter, parameteredElement, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectableElementTemplateParameter, parameteredElement, OppositeEndRole, QStringLiteral("ConnectableElement-templateParameter"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlconnectableelementtemplateparameterobject_p.h b/src/uml/qobjects/qumlconnectableelementtemplateparameterobject_p.h
index f3d0d88b..7c5b5d59 100644
--- a/src/uml/qobjects/qumlconnectableelementtemplateparameterobject_p.h
+++ b/src/uml/qobjects/qumlconnectableelementtemplateparameterobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 QT_BEGIN_HEADER
 
@@ -52,9 +52,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlConnectableElementTemplateParameter;
-class Q_UML_EXPORT QUmlConnectableElementTemplateParameterObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlConnectableElementTemplateParameterObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlConnectableElementTemplateParameterObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -71,7 +74,7 @@ class Q_UML_EXPORT QUmlConnectableElementTemplateParameterObject : public QObjec
     Q_PROPERTY(QObject * parameteredElement READ parameteredElement WRITE setParameteredElement)
 
 public:
-    Q_INVOKABLE explicit QUmlConnectableElementTemplateParameterObject(QUmlConnectableElementTemplateParameter *qModelingObject);
+    Q_INVOKABLE explicit QUmlConnectableElementTemplateParameterObject(QUmlConnectableElementTemplateParameter *qModelingElement);
     virtual ~QUmlConnectableElementTemplateParameterObject();
 
     // Owned attributes [Element]
@@ -109,6 +112,10 @@ public Q_SLOTS:
 
     // Slots for owned attributes [ConnectableElementTemplateParameter]
     void setParameteredElement(QObject *parameteredElement = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlconnectionpointreferenceobject.cpp b/src/uml/qobjects/qumlconnectionpointreferenceobject.cpp
index 4d543a0a..505fcd37 100644
--- a/src/uml/qobjects/qumlconnectionpointreferenceobject.cpp
+++ b/src/uml/qobjects/qumlconnectionpointreferenceobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlconnectionpointreferenceobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlConnectionPointReference>
 #include <QtUml/QUmlComment>
@@ -56,16 +57,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlConnectionPointReferenceObject::QUmlConnectionPointReferenceObject(QUmlConnectionPointReference *qModelingObject)
+QUmlConnectionPointReferenceObject::QUmlConnectionPointReferenceObject(QUmlConnectionPointReference *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlConnectionPointReferenceObject::~QUmlConnectionPointReferenceObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -74,25 +77,25 @@ QUmlConnectionPointReferenceObject::~QUmlConnectionPointReferenceObject()
 const QSet<QObject *> QUmlConnectionPointReferenceObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlConnectionPointReferenceObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlConnectionPointReferenceObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -100,65 +103,65 @@ QObject *QUmlConnectionPointReferenceObject::owner() const
 const QSet<QObject *> QUmlConnectionPointReferenceObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlConnectionPointReferenceObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->name();
 }
 
 QObject *QUmlConnectionPointReferenceObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlConnectionPointReferenceObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlConnectionPointReferenceObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlConnectionPointReferenceObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Vertex]
 
 QObject *QUmlConnectionPointReferenceObject::container() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->container())
+    if (!qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->container())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->container()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->container()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlConnectionPointReferenceObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTransition *element, qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlTransition *element, qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlConnectionPointReferenceObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTransition *element, qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlTransition *element, qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -167,25 +170,25 @@ const QSet<QObject *> QUmlConnectionPointReferenceObject::outgoings() const
 const QSet<QObject *> QUmlConnectionPointReferenceObject::entries() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPseudostate *element, qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->entries())
-        set.insert(element->asQObject());
+    foreach (QUmlPseudostate *element, qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->entries())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlConnectionPointReferenceObject::exits() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPseudostate *element, qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->exits())
-        set.insert(element->asQObject());
+    foreach (QUmlPseudostate *element, qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->exits())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlConnectionPointReferenceObject::state() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->state())
+    if (!qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->state())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->state()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->state()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -193,14 +196,14 @@ QObject *QUmlConnectionPointReferenceObject::state() const
 QSet<QObject *> QUmlConnectionPointReferenceObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlConnectionPointReferenceObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -208,155 +211,219 @@ bool QUmlConnectionPointReferenceObject::mustBeOwned() const
 QList<QObject *> QUmlConnectionPointReferenceObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlConnectionPointReferenceObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlConnectionPointReferenceObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlConnectionPointReferenceObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->separator();
 }
 
 // OPERATIONS [Vertex]
 
 QObject *QUmlConnectionPointReferenceObject::containingStateMachine() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->containingStateMachine())
+    if (!qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->containingStateMachine())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->containingStateMachine()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->containingStateMachine()->asQModelingObject();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlConnectionPointReferenceObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlConnectionPointReferenceObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlConnectionPointReferenceObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlConnectionPointReferenceObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlConnectionPointReferenceObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlConnectionPointReferenceObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlConnectionPointReferenceObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlConnectionPointReferenceObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->setName(name);
 }
 
 void QUmlConnectionPointReferenceObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlConnectionPointReferenceObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlConnectionPointReferenceObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlConnectionPointReferenceObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Vertex]
 
 void QUmlConnectionPointReferenceObject::setContainer(QObject *container)
 {
-    qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->setContainer(qmodelingobjectproperty_cast<QUmlRegion *>(container));
+    qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->setContainer(qmodelingelementproperty_cast<QUmlRegion *>(container));
 }
 
 void QUmlConnectionPointReferenceObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlTransition *>(incoming));
+    qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlTransition *>(incoming));
 }
 
 void QUmlConnectionPointReferenceObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlTransition *>(incoming));
+    qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlTransition *>(incoming));
 }
 
 void QUmlConnectionPointReferenceObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlTransition *>(outgoing));
+    qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlTransition *>(outgoing));
 }
 
 void QUmlConnectionPointReferenceObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlTransition *>(outgoing));
+    qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlTransition *>(outgoing));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ConnectionPointReference]
 
 void QUmlConnectionPointReferenceObject::addEntry(QObject *entry)
 {
-    qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->addEntry(qmodelingobjectproperty_cast<QUmlPseudostate *>(entry));
+    qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->addEntry(qmodelingelementproperty_cast<QUmlPseudostate *>(entry));
 }
 
 void QUmlConnectionPointReferenceObject::removeEntry(QObject *entry)
 {
-    qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->removeEntry(qmodelingobjectproperty_cast<QUmlPseudostate *>(entry));
+    qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->removeEntry(qmodelingelementproperty_cast<QUmlPseudostate *>(entry));
 }
 
 void QUmlConnectionPointReferenceObject::addExit(QObject *exit)
 {
-    qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->addExit(qmodelingobjectproperty_cast<QUmlPseudostate *>(exit));
+    qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->addExit(qmodelingelementproperty_cast<QUmlPseudostate *>(exit));
 }
 
 void QUmlConnectionPointReferenceObject::removeExit(QObject *exit)
 {
-    qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->removeExit(qmodelingobjectproperty_cast<QUmlPseudostate *>(exit));
+    qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->removeExit(qmodelingelementproperty_cast<QUmlPseudostate *>(exit));
 }
 
 void QUmlConnectionPointReferenceObject::setState(QObject *state)
 {
-    qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(this)->setState(qmodelingobjectproperty_cast<QUmlState *>(state));
+    qmodelingelementproperty_cast<QUmlConnectionPointReference *>(this)->setState(qmodelingelementproperty_cast<QUmlState *>(state));
+}
+
+
+void QUmlConnectionPointReferenceObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlVertex");
+    d->groupProperties.insert(QStringLiteral("QUmlVertex"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("container"))));
+    d->groupProperties.insert(QStringLiteral("QUmlVertex"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlVertex"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlConnectionPointReference");
+    d->groupProperties.insert(QStringLiteral("QUmlConnectionPointReference"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("entries"))));
+    d->groupProperties.insert(QStringLiteral("QUmlConnectionPointReference"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("exits"))));
+    d->groupProperties.insert(QStringLiteral("QUmlConnectionPointReference"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("state"))));
+}
+
+void QUmlConnectionPointReferenceObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectionPointReference, entries, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectionPointReference, entries, PropertyClassRole, QStringLiteral("QUmlConnectionPointReference"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectionPointReference, entries, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectionPointReference, entries, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectionPointReference, entries, DocumentationRole, QStringLiteral("The entryPoint kind pseudo states corresponding to this connection point."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectionPointReference, entries, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectionPointReference, entries, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectionPointReference, entries, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectionPointReference, exits, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectionPointReference, exits, PropertyClassRole, QStringLiteral("QUmlConnectionPointReference"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectionPointReference, exits, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectionPointReference, exits, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectionPointReference, exits, DocumentationRole, QStringLiteral("The exitPoints kind pseudo states corresponding to this connection point."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectionPointReference, exits, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectionPointReference, exits, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectionPointReference, exits, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectionPointReference, state, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectionPointReference, state, PropertyClassRole, QStringLiteral("QUmlConnectionPointReference"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectionPointReference, state, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectionPointReference, state, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectionPointReference, state, DocumentationRole, QStringLiteral("The State in which the connection point refreshens are defined."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectionPointReference, state, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectionPointReference, state, SubsettedPropertiesRole, QStringLiteral("NamedElement-namespace"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectionPointReference, state, OppositeEndRole, QStringLiteral("State-connection"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlconnectionpointreferenceobject_p.h b/src/uml/qobjects/qumlconnectionpointreferenceobject_p.h
index 6df43b8a..d165b1df 100644
--- a/src/uml/qobjects/qumlconnectionpointreferenceobject_p.h
+++ b/src/uml/qobjects/qumlconnectionpointreferenceobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlConnectionPointReference;
-class Q_UML_EXPORT QUmlConnectionPointReferenceObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlConnectionPointReferenceObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlConnectionPointReferenceObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -82,7 +85,7 @@ class Q_UML_EXPORT QUmlConnectionPointReferenceObject : public QObject
     Q_PROPERTY(QObject * state READ state WRITE setState)
 
 public:
-    Q_INVOKABLE explicit QUmlConnectionPointReferenceObject(QUmlConnectionPointReference *qModelingObject);
+    Q_INVOKABLE explicit QUmlConnectionPointReferenceObject(QUmlConnectionPointReference *qModelingElement);
     virtual ~QUmlConnectionPointReferenceObject();
 
     // Owned attributes [Element]
@@ -152,6 +155,10 @@ public Q_SLOTS:
     void addExit(QObject *exit);
     void removeExit(QObject *exit);
     void setState(QObject *state = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlconnectorendobject.cpp b/src/uml/qobjects/qumlconnectorendobject.cpp
index a9e2e7de..8dcbb3ca 100644
--- a/src/uml/qobjects/qumlconnectorendobject.cpp
+++ b/src/uml/qobjects/qumlconnectorendobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlconnectorendobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlConnectorEnd>
 #include <QtUml/QUmlComment>
@@ -50,16 +51,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlConnectorEndObject::QUmlConnectorEndObject(QUmlConnectorEnd *qModelingObject)
+QUmlConnectorEndObject::QUmlConnectorEndObject(QUmlConnectorEnd *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlConnectorEndObject::~QUmlConnectorEndObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -68,89 +71,89 @@ QUmlConnectorEndObject::~QUmlConnectorEndObject()
 const QSet<QObject *> QUmlConnectorEndObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlConnectorEndObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlConnectorEndObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [MultiplicityElement]
 
 bool QUmlConnectorEndObject::isOrdered() const
 {
-    return qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->isOrdered();
+    return qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->isOrdered();
 }
 
 bool QUmlConnectorEndObject::isUnique() const
 {
-    return qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->isUnique();
+    return qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->isUnique();
 }
 
 int QUmlConnectorEndObject::lower() const
 {
-    return qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->lower();
+    return qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->lower();
 }
 
 QObject *QUmlConnectorEndObject::lowerValue() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->lowerValue())
+    if (!qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->lowerValue())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->lowerValue()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->lowerValue()->asQModelingObject();
 }
 
 int QUmlConnectorEndObject::upper() const
 {
-    return qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->upper();
+    return qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->upper();
 }
 
 QObject *QUmlConnectorEndObject::upperValue() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->upperValue())
+    if (!qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->upperValue())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->upperValue()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->upperValue()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ConnectorEnd]
 
 QObject *QUmlConnectorEndObject::definingEnd() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->definingEnd())
+    if (!qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->definingEnd())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->definingEnd()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->definingEnd()->asQModelingObject();
 }
 
 QObject *QUmlConnectorEndObject::partWithPort() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->partWithPort())
+    if (!qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->partWithPort())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->partWithPort()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->partWithPort()->asQModelingObject();
 }
 
 QObject *QUmlConnectorEndObject::role() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->role())
+    if (!qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->role())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->role()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->role()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -158,147 +161,210 @@ QObject *QUmlConnectorEndObject::role() const
 QSet<QObject *> QUmlConnectorEndObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlConnectorEndObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [MultiplicityElement]
 
 bool QUmlConnectorEndObject::compatibleWith(QObject *other) const
 {
-    return qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->compatibleWith(qmodelingobjectproperty_cast<QUmlMultiplicityElement *>(other));
+    return qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->compatibleWith(qmodelingelementproperty_cast<QUmlMultiplicityElement *>(other));
 }
 
 bool QUmlConnectorEndObject::includesCardinality(int C) const
 {
-    return qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->includesCardinality(C);
+    return qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->includesCardinality(C);
 }
 
 bool QUmlConnectorEndObject::includesMultiplicity(QObject *M) const
 {
-    return qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->includesMultiplicity(qmodelingobjectproperty_cast<QUmlMultiplicityElement *>(M));
+    return qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->includesMultiplicity(qmodelingelementproperty_cast<QUmlMultiplicityElement *>(M));
 }
 
 bool QUmlConnectorEndObject::is(int lowerbound, int upperbound) const
 {
-    return qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->is(lowerbound, upperbound);
+    return qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->is(lowerbound, upperbound);
 }
 
 bool QUmlConnectorEndObject::isMultivalued() const
 {
-    return qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->isMultivalued();
+    return qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->isMultivalued();
 }
 
 int QUmlConnectorEndObject::lowerBound() const
 {
-    return qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->lowerBound();
+    return qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->lowerBound();
 }
 
 //int QUmlConnectorEndObject::upperBound() const
 //{
-//    return qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->upperBound();
+//    return qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->upperBound();
 //}
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlConnectorEndObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlConnectorEndObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlConnectorEndObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlConnectorEndObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlConnectorEndObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [MultiplicityElement]
 
 void QUmlConnectorEndObject::setOrdered(bool isOrdered)
 {
-    qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->setOrdered(isOrdered);
+    qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->setOrdered(isOrdered);
 }
 
 void QUmlConnectorEndObject::unsetOrdered()
 {
-    qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("ordered"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("ordered"));
 }
 
 void QUmlConnectorEndObject::setUnique(bool isUnique)
 {
-    qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->setUnique(isUnique);
+    qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->setUnique(isUnique);
 }
 
 void QUmlConnectorEndObject::unsetUnique()
 {
-    qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("unique"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("unique"));
 }
 
 void QUmlConnectorEndObject::setLower(int lower)
 {
-    qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->setLower(lower);
+    qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->setLower(lower);
 }
 
 void QUmlConnectorEndObject::unsetLower()
 {
-    qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("lower"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("lower"));
 }
 
 void QUmlConnectorEndObject::setLowerValue(QObject *lowerValue)
 {
-    qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->setLowerValue(qmodelingobjectproperty_cast<QUmlValueSpecification *>(lowerValue));
+    qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->setLowerValue(qmodelingelementproperty_cast<QUmlValueSpecification *>(lowerValue));
 }
 
 void QUmlConnectorEndObject::setUpper(int upper)
 {
-    qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->setUpper(upper);
+    qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->setUpper(upper);
 }
 
 void QUmlConnectorEndObject::unsetUpper()
 {
-    qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("upper"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("upper"));
 }
 
 void QUmlConnectorEndObject::setUpperValue(QObject *upperValue)
 {
-    qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->setUpperValue(qmodelingobjectproperty_cast<QUmlValueSpecification *>(upperValue));
+    qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->setUpperValue(qmodelingelementproperty_cast<QUmlValueSpecification *>(upperValue));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ConnectorEnd]
 
 void QUmlConnectorEndObject::setDefiningEnd(QObject *definingEnd)
 {
-    qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->setDefiningEnd(qmodelingobjectproperty_cast<QUmlProperty *>(definingEnd));
+    qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->setDefiningEnd(qmodelingelementproperty_cast<QUmlProperty *>(definingEnd));
 }
 
 void QUmlConnectorEndObject::setPartWithPort(QObject *partWithPort)
 {
-    qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->setPartWithPort(qmodelingobjectproperty_cast<QUmlProperty *>(partWithPort));
+    qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->setPartWithPort(qmodelingelementproperty_cast<QUmlProperty *>(partWithPort));
 }
 
 void QUmlConnectorEndObject::setRole(QObject *role)
 {
-    qmodelingobjectproperty_cast<QUmlConnectorEnd *>(this)->setRole(qmodelingobjectproperty_cast<QUmlConnectableElement *>(role));
+    qmodelingelementproperty_cast<QUmlConnectorEnd *>(this)->setRole(qmodelingelementproperty_cast<QUmlConnectableElement *>(role));
+}
+
+
+void QUmlConnectorEndObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlMultiplicityElement");
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isOrdered"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isUnique"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lower"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lowerValue"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upper"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperValue"))));
+
+    d->propertyGroups << QStringLiteral("QUmlConnectorEnd");
+    d->groupProperties.insert(QStringLiteral("QUmlConnectorEnd"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("definingEnd"))));
+    d->groupProperties.insert(QStringLiteral("QUmlConnectorEnd"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("partWithPort"))));
+    d->groupProperties.insert(QStringLiteral("QUmlConnectorEnd"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("role"))));
+}
+
+void QUmlConnectorEndObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectorEnd, definingEnd, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectorEnd, definingEnd, PropertyClassRole, QStringLiteral("QUmlConnectorEnd"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectorEnd, definingEnd, IsDerivedRole, true);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectorEnd, definingEnd, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectorEnd, definingEnd, DocumentationRole, QStringLiteral("A derived association referencing the corresponding association end on the association which types the connector owing this connector end. This association is derived by selecting the association end at the same place in the ordering of association ends as this connector end."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectorEnd, definingEnd, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectorEnd, definingEnd, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectorEnd, definingEnd, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectorEnd, partWithPort, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectorEnd, partWithPort, PropertyClassRole, QStringLiteral("QUmlConnectorEnd"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectorEnd, partWithPort, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectorEnd, partWithPort, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectorEnd, partWithPort, DocumentationRole, QStringLiteral("Indicates the role of the internal structure of a classifier with the port to which the connector end is attached."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectorEnd, partWithPort, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectorEnd, partWithPort, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectorEnd, partWithPort, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectorEnd, role, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectorEnd, role, PropertyClassRole, QStringLiteral("QUmlConnectorEnd"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectorEnd, role, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectorEnd, role, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectorEnd, role, DocumentationRole, QStringLiteral("The connectable element attached at this connector end. When an instance of the containing classifier is created, a link may (depending on the multiplicities) be created to an instance of the classifier that types this connectable element."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectorEnd, role, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectorEnd, role, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnectorEnd, role, OppositeEndRole, QStringLiteral("ConnectableElement-end"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlconnectorendobject_p.h b/src/uml/qobjects/qumlconnectorendobject_p.h
index 60643eda..1a8ab0fd 100644
--- a/src/uml/qobjects/qumlconnectorendobject_p.h
+++ b/src/uml/qobjects/qumlconnectorendobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 QT_BEGIN_HEADER
 
@@ -52,9 +52,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlConnectorEnd;
-class Q_UML_EXPORT QUmlConnectorEndObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlConnectorEndObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlConnectorEndObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -75,7 +78,7 @@ class Q_UML_EXPORT QUmlConnectorEndObject : public QObject
     Q_PROPERTY(QObject * role READ role WRITE setRole)
 
 public:
-    Q_INVOKABLE explicit QUmlConnectorEndObject(QUmlConnectorEnd *qModelingObject);
+    Q_INVOKABLE explicit QUmlConnectorEndObject(QUmlConnectorEnd *qModelingElement);
     virtual ~QUmlConnectorEndObject();
 
     // Owned attributes [Element]
@@ -134,6 +137,10 @@ public Q_SLOTS:
     void Q_DECL_HIDDEN setDefiningEnd(QObject *definingEnd = 0);
     void setPartWithPort(QObject *partWithPort = 0);
     void setRole(QObject *role = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlconnectorobject.cpp b/src/uml/qobjects/qumlconnectorobject.cpp
index 872f5fc3..7376baba 100644
--- a/src/uml/qobjects/qumlconnectorobject.cpp
+++ b/src/uml/qobjects/qumlconnectorobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlconnectorobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlConnector>
 #include <QtUml/QUmlAssociation>
@@ -56,16 +57,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlConnectorObject::QUmlConnectorObject(QUmlConnector *qModelingObject)
+QUmlConnectorObject::QUmlConnectorObject(QUmlConnector *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlConnectorObject::~QUmlConnectorObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlConnector *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlConnector *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -74,25 +77,25 @@ QUmlConnectorObject::~QUmlConnectorObject()
 const QSet<QObject *> QUmlConnectorObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlConnector *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlConnector *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlConnectorObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlConnector *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlConnector *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlConnectorObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConnector *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlConnector *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConnector *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConnector *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -100,62 +103,62 @@ QObject *QUmlConnectorObject::owner() const
 const QSet<QObject *> QUmlConnectorObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlConnector *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlConnector *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlConnectorObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlConnector *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlConnector *>(this)->name();
 }
 
 QObject *QUmlConnectorObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConnector *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlConnector *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConnector *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConnector *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlConnectorObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConnector *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlConnector *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConnector *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConnector *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlConnectorObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlConnector *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlConnector *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlConnectorObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlConnector *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlConnector *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlConnectorObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlConnector *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlConnector *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlConnectorObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlConnector *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlConnector *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlConnectorObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlConnector *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlConnector *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -164,14 +167,14 @@ const QSet<QObject *> QUmlConnectorObject::redefinitionContexts() const
 const QSet<QObject *> QUmlConnectorObject::featuringClassifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlConnector *>(this)->featuringClassifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlConnector *>(this)->featuringClassifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlConnectorObject::isStatic() const
 {
-    return qmodelingobjectproperty_cast<QUmlConnector *>(this)->isStatic();
+    return qmodelingelementproperty_cast<QUmlConnector *>(this)->isStatic();
 }
 
 // OWNED ATTRIBUTES [Connector]
@@ -179,38 +182,38 @@ bool QUmlConnectorObject::isStatic() const
 const QSet<QObject *> QUmlConnectorObject::contracts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlBehavior *element, qmodelingobjectproperty_cast<QUmlConnector *>(this)->contracts())
-        set.insert(element->asQObject());
+    foreach (QUmlBehavior *element, qmodelingelementproperty_cast<QUmlConnector *>(this)->contracts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlConnectorObject::ends() const
 {
     QList<QObject *> list;
-    foreach (QUmlConnectorEnd *element, qmodelingobjectproperty_cast<QUmlConnector *>(this)->ends())
-        list.append(element->asQObject());
+    foreach (QUmlConnectorEnd *element, qmodelingelementproperty_cast<QUmlConnector *>(this)->ends())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 QtUml::ConnectorKind QUmlConnectorObject::kind() const
 {
-    return qmodelingobjectproperty_cast<QUmlConnector *>(this)->kind();
+    return qmodelingelementproperty_cast<QUmlConnector *>(this)->kind();
 }
 
 const QSet<QObject *> QUmlConnectorObject::redefinedConnectors() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConnector *element, qmodelingobjectproperty_cast<QUmlConnector *>(this)->redefinedConnectors())
-        set.insert(element->asQObject());
+    foreach (QUmlConnector *element, qmodelingelementproperty_cast<QUmlConnector *>(this)->redefinedConnectors())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlConnectorObject::type() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConnector *>(this)->type())
+    if (!qmodelingelementproperty_cast<QUmlConnector *>(this)->type())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConnector *>(this)->type()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConnector *>(this)->type()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -218,14 +221,14 @@ QObject *QUmlConnectorObject::type() const
 QSet<QObject *> QUmlConnectorObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlConnector *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlConnector *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlConnectorObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlConnector *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlConnector *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -233,199 +236,289 @@ bool QUmlConnectorObject::mustBeOwned() const
 QList<QObject *> QUmlConnectorObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlConnector *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlConnector *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlConnectorObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlConnector *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlConnector *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlConnectorObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlConnector *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlConnector *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlConnectorObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlConnector *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlConnector *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlConnectorObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlConnector *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlConnector *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlConnectorObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlConnector *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlConnector *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlConnectorObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlConnector *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlConnector *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlConnectorObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlConnector *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlConnector *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlConnectorObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlConnector *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlConnector *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlConnectorObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlConnector *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlConnector *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlConnectorObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlConnector *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlConnector *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlConnectorObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlConnector *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlConnector *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlConnectorObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlConnector *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlConnector *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlConnectorObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlConnector *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlConnector *>(this)->setName(name);
 }
 
 void QUmlConnectorObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlConnector *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlConnector *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlConnectorObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlConnector *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlConnector *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlConnectorObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlConnector *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlConnector *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlConnectorObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlConnector *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlConnector *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlConnectorObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlConnector *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlConnector *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlConnectorObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlConnector *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlConnectorObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlConnector *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlConnector *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlConnectorObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlConnector *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlConnector *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlConnectorObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlConnector *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlConnector *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlConnectorObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlConnector *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlConnector *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Feature]
 
 void QUmlConnectorObject::addFeaturingClassifier(QObject *featuringClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlConnector *>(this)->addFeaturingClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(featuringClassifier));
+    qmodelingelementproperty_cast<QUmlConnector *>(this)->addFeaturingClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(featuringClassifier));
 }
 
 void QUmlConnectorObject::removeFeaturingClassifier(QObject *featuringClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlConnector *>(this)->removeFeaturingClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(featuringClassifier));
+    qmodelingelementproperty_cast<QUmlConnector *>(this)->removeFeaturingClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(featuringClassifier));
 }
 
 void QUmlConnectorObject::setStatic(bool isStatic)
 {
-    qmodelingobjectproperty_cast<QUmlConnector *>(this)->setStatic(isStatic);
+    qmodelingelementproperty_cast<QUmlConnector *>(this)->setStatic(isStatic);
 }
 
 void QUmlConnectorObject::unsetStatic()
 {
-    qmodelingobjectproperty_cast<QUmlConnector *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("static"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("static"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Connector]
 
 void QUmlConnectorObject::addContract(QObject *contract)
 {
-    qmodelingobjectproperty_cast<QUmlConnector *>(this)->addContract(qmodelingobjectproperty_cast<QUmlBehavior *>(contract));
+    qmodelingelementproperty_cast<QUmlConnector *>(this)->addContract(qmodelingelementproperty_cast<QUmlBehavior *>(contract));
 }
 
 void QUmlConnectorObject::removeContract(QObject *contract)
 {
-    qmodelingobjectproperty_cast<QUmlConnector *>(this)->removeContract(qmodelingobjectproperty_cast<QUmlBehavior *>(contract));
+    qmodelingelementproperty_cast<QUmlConnector *>(this)->removeContract(qmodelingelementproperty_cast<QUmlBehavior *>(contract));
 }
 
 void QUmlConnectorObject::addEnd(QObject *end)
 {
-    qmodelingobjectproperty_cast<QUmlConnector *>(this)->addEnd(qmodelingobjectproperty_cast<QUmlConnectorEnd *>(end));
+    qmodelingelementproperty_cast<QUmlConnector *>(this)->addEnd(qmodelingelementproperty_cast<QUmlConnectorEnd *>(end));
 }
 
 void QUmlConnectorObject::removeEnd(QObject *end)
 {
-    qmodelingobjectproperty_cast<QUmlConnector *>(this)->removeEnd(qmodelingobjectproperty_cast<QUmlConnectorEnd *>(end));
+    qmodelingelementproperty_cast<QUmlConnector *>(this)->removeEnd(qmodelingelementproperty_cast<QUmlConnectorEnd *>(end));
 }
 
 void QUmlConnectorObject::setKind(QtUml::ConnectorKind kind)
 {
-    qmodelingobjectproperty_cast<QUmlConnector *>(this)->setKind(kind);
+    qmodelingelementproperty_cast<QUmlConnector *>(this)->setKind(kind);
 }
 
 void QUmlConnectorObject::addRedefinedConnector(QObject *redefinedConnector)
 {
-    qmodelingobjectproperty_cast<QUmlConnector *>(this)->addRedefinedConnector(qmodelingobjectproperty_cast<QUmlConnector *>(redefinedConnector));
+    qmodelingelementproperty_cast<QUmlConnector *>(this)->addRedefinedConnector(qmodelingelementproperty_cast<QUmlConnector *>(redefinedConnector));
 }
 
 void QUmlConnectorObject::removeRedefinedConnector(QObject *redefinedConnector)
 {
-    qmodelingobjectproperty_cast<QUmlConnector *>(this)->removeRedefinedConnector(qmodelingobjectproperty_cast<QUmlConnector *>(redefinedConnector));
+    qmodelingelementproperty_cast<QUmlConnector *>(this)->removeRedefinedConnector(qmodelingelementproperty_cast<QUmlConnector *>(redefinedConnector));
 }
 
 void QUmlConnectorObject::setType(QObject *type)
 {
-    qmodelingobjectproperty_cast<QUmlConnector *>(this)->setType(qmodelingobjectproperty_cast<QUmlAssociation *>(type));
+    qmodelingelementproperty_cast<QUmlConnector *>(this)->setType(qmodelingelementproperty_cast<QUmlAssociation *>(type));
+}
+
+
+void QUmlConnectorObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlFeature");
+    d->groupProperties.insert(QStringLiteral("QUmlFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("featuringClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isStatic"))));
+
+    d->propertyGroups << QStringLiteral("QUmlConnector");
+    d->groupProperties.insert(QStringLiteral("QUmlConnector"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("contracts"))));
+    d->groupProperties.insert(QStringLiteral("QUmlConnector"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ends"))));
+    d->groupProperties.insert(QStringLiteral("QUmlConnector"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("kind"))));
+    d->groupProperties.insert(QStringLiteral("QUmlConnector"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedConnectors"))));
+    d->groupProperties.insert(QStringLiteral("QUmlConnector"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
+}
+
+void QUmlConnectorObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, contracts, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, contracts, PropertyClassRole, QStringLiteral("QUmlConnector"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, contracts, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, contracts, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, contracts, DocumentationRole, QStringLiteral("The set of Behaviors that specify the valid interaction patterns across the connector."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, contracts, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, contracts, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, contracts, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, ends, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, ends, PropertyClassRole, QStringLiteral("QUmlConnector"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, ends, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, ends, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, ends, DocumentationRole, QStringLiteral("A connector consists of at least two connector ends, each representing the participation of instances of the classifiers typing the connectable elements attached to this end. The set of connector ends is ordered."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, ends, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, ends, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, ends, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, kind, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, kind, PropertyClassRole, QStringLiteral("QUmlConnector"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, kind, IsDerivedRole, true);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, kind, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, kind, DocumentationRole, QStringLiteral("Indicates the kind of connector. This is derived: a connector with one or more ends connected to a Port which is not on a Part and which is not a behavior port is a delegation; otherwise it is an assembly."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, kind, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, kind, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, kind, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, redefinedConnectors, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, redefinedConnectors, PropertyClassRole, QStringLiteral("QUmlConnector"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, redefinedConnectors, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, redefinedConnectors, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, redefinedConnectors, DocumentationRole, QStringLiteral("A connector may be redefined when its containing classifier is specialized. The redefining connector may have a type that specializes the type of the redefined connector. The types of the connector ends of the redefining connector may specialize the types of the connector ends of the redefined connector. The properties of the connector ends of the redefining connector may be replaced."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, redefinedConnectors, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, redefinedConnectors, SubsettedPropertiesRole, QStringLiteral("RedefinableElement-redefinedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, redefinedConnectors, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, type, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, type, PropertyClassRole, QStringLiteral("QUmlConnector"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, type, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, type, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, type, DocumentationRole, QStringLiteral("An optional association that specifies the link corresponding to this connector."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, type, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, type, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConnector, type, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlconnectorobject_p.h b/src/uml/qobjects/qumlconnectorobject_p.h
index 92b901b1..ea2b15ee 100644
--- a/src/uml/qobjects/qumlconnectorobject_p.h
+++ b/src/uml/qobjects/qumlconnectorobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlConnector;
-class Q_UML_EXPORT QUmlConnectorObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlConnectorObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlConnectorObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -88,7 +91,7 @@ class Q_UML_EXPORT QUmlConnectorObject : public QObject
     Q_PROPERTY(QObject * type READ type WRITE setType)
 
 public:
-    Q_INVOKABLE explicit QUmlConnectorObject(QUmlConnector *qModelingObject);
+    Q_INVOKABLE explicit QUmlConnectorObject(QUmlConnector *qModelingElement);
     virtual ~QUmlConnectorObject();
 
     // Owned attributes [Element]
@@ -175,6 +178,10 @@ public Q_SLOTS:
     void addRedefinedConnector(QObject *redefinedConnector);
     void removeRedefinedConnector(QObject *redefinedConnector);
     void setType(QObject *type = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlconsiderignorefragmentobject.cpp b/src/uml/qobjects/qumlconsiderignorefragmentobject.cpp
index e5d290f6..50ac5b90 100644
--- a/src/uml/qobjects/qumlconsiderignorefragmentobject.cpp
+++ b/src/uml/qobjects/qumlconsiderignorefragmentobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlconsiderignorefragmentobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlConsiderIgnoreFragment>
 #include <QtUml/QUmlComment>
@@ -56,16 +57,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlConsiderIgnoreFragmentObject::QUmlConsiderIgnoreFragmentObject(QUmlConsiderIgnoreFragment *qModelingObject)
+QUmlConsiderIgnoreFragmentObject::QUmlConsiderIgnoreFragmentObject(QUmlConsiderIgnoreFragment *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlConsiderIgnoreFragmentObject::~QUmlConsiderIgnoreFragmentObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -74,25 +77,25 @@ QUmlConsiderIgnoreFragmentObject::~QUmlConsiderIgnoreFragmentObject()
 const QSet<QObject *> QUmlConsiderIgnoreFragmentObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlConsiderIgnoreFragmentObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlConsiderIgnoreFragmentObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -100,40 +103,40 @@ QObject *QUmlConsiderIgnoreFragmentObject::owner() const
 const QSet<QObject *> QUmlConsiderIgnoreFragmentObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlConsiderIgnoreFragmentObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->name();
 }
 
 QObject *QUmlConsiderIgnoreFragmentObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlConsiderIgnoreFragmentObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlConsiderIgnoreFragmentObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlConsiderIgnoreFragmentObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [InteractionFragment]
@@ -141,32 +144,32 @@ QtUml::VisibilityKind QUmlConsiderIgnoreFragmentObject::visibility() const
 const QSet<QObject *> QUmlConsiderIgnoreFragmentObject::covered() const
 {
     QSet<QObject *> set;
-    foreach (QUmlLifeline *element, qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->covered())
-        set.insert(element->asQObject());
+    foreach (QUmlLifeline *element, qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->covered())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlConsiderIgnoreFragmentObject::enclosingInteraction() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->enclosingInteraction())
+    if (!qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->enclosingInteraction())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->enclosingInteraction()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->enclosingInteraction()->asQModelingObject();
 }
 
 QObject *QUmlConsiderIgnoreFragmentObject::enclosingOperand() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->enclosingOperand())
+    if (!qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->enclosingOperand())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->enclosingOperand()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->enclosingOperand()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlConsiderIgnoreFragmentObject::generalOrderings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralOrdering *element, qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->generalOrderings())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralOrdering *element, qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->generalOrderings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -175,21 +178,21 @@ const QSet<QObject *> QUmlConsiderIgnoreFragmentObject::generalOrderings() const
 const QSet<QObject *> QUmlConsiderIgnoreFragmentObject::cfragmentGates() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGate *element, qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->cfragmentGates())
-        set.insert(element->asQObject());
+    foreach (QUmlGate *element, qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->cfragmentGates())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QtUml::InteractionOperatorKind QUmlConsiderIgnoreFragmentObject::interactionOperator() const
 {
-    return qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->interactionOperator();
+    return qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->interactionOperator();
 }
 
 const QList<QObject *> QUmlConsiderIgnoreFragmentObject::operands() const
 {
     QList<QObject *> list;
-    foreach (QUmlInteractionOperand *element, qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->operands())
-        list.append(element->asQObject());
+    foreach (QUmlInteractionOperand *element, qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->operands())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -198,8 +201,8 @@ const QList<QObject *> QUmlConsiderIgnoreFragmentObject::operands() const
 const QSet<QObject *> QUmlConsiderIgnoreFragmentObject::messages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->messages())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->messages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -208,14 +211,14 @@ const QSet<QObject *> QUmlConsiderIgnoreFragmentObject::messages() const
 QSet<QObject *> QUmlConsiderIgnoreFragmentObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlConsiderIgnoreFragmentObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -223,167 +226,218 @@ bool QUmlConsiderIgnoreFragmentObject::mustBeOwned() const
 QList<QObject *> QUmlConsiderIgnoreFragmentObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlConsiderIgnoreFragmentObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlConsiderIgnoreFragmentObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlConsiderIgnoreFragmentObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlConsiderIgnoreFragmentObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlConsiderIgnoreFragmentObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlConsiderIgnoreFragmentObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlConsiderIgnoreFragmentObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlConsiderIgnoreFragmentObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlConsiderIgnoreFragmentObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlConsiderIgnoreFragmentObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlConsiderIgnoreFragmentObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->setName(name);
 }
 
 void QUmlConsiderIgnoreFragmentObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlConsiderIgnoreFragmentObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlConsiderIgnoreFragmentObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlConsiderIgnoreFragmentObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [InteractionFragment]
 
 void QUmlConsiderIgnoreFragmentObject::addCovered(QObject *covered)
 {
-    qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->addCovered(qmodelingobjectproperty_cast<QUmlLifeline *>(covered));
+    qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->addCovered(qmodelingelementproperty_cast<QUmlLifeline *>(covered));
 }
 
 void QUmlConsiderIgnoreFragmentObject::removeCovered(QObject *covered)
 {
-    qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->removeCovered(qmodelingobjectproperty_cast<QUmlLifeline *>(covered));
+    qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->removeCovered(qmodelingelementproperty_cast<QUmlLifeline *>(covered));
 }
 
 void QUmlConsiderIgnoreFragmentObject::setEnclosingInteraction(QObject *enclosingInteraction)
 {
-    qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->setEnclosingInteraction(qmodelingobjectproperty_cast<QUmlInteraction *>(enclosingInteraction));
+    qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->setEnclosingInteraction(qmodelingelementproperty_cast<QUmlInteraction *>(enclosingInteraction));
 }
 
 void QUmlConsiderIgnoreFragmentObject::setEnclosingOperand(QObject *enclosingOperand)
 {
-    qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->setEnclosingOperand(qmodelingobjectproperty_cast<QUmlInteractionOperand *>(enclosingOperand));
+    qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->setEnclosingOperand(qmodelingelementproperty_cast<QUmlInteractionOperand *>(enclosingOperand));
 }
 
 void QUmlConsiderIgnoreFragmentObject::addGeneralOrdering(QObject *generalOrdering)
 {
-    qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->addGeneralOrdering(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
+    qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->addGeneralOrdering(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
 }
 
 void QUmlConsiderIgnoreFragmentObject::removeGeneralOrdering(QObject *generalOrdering)
 {
-    qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->removeGeneralOrdering(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
+    qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->removeGeneralOrdering(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [CombinedFragment]
 
 void QUmlConsiderIgnoreFragmentObject::addCfragmentGate(QObject *cfragmentGate)
 {
-    qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->addCfragmentGate(qmodelingobjectproperty_cast<QUmlGate *>(cfragmentGate));
+    qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->addCfragmentGate(qmodelingelementproperty_cast<QUmlGate *>(cfragmentGate));
 }
 
 void QUmlConsiderIgnoreFragmentObject::removeCfragmentGate(QObject *cfragmentGate)
 {
-    qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->removeCfragmentGate(qmodelingobjectproperty_cast<QUmlGate *>(cfragmentGate));
+    qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->removeCfragmentGate(qmodelingelementproperty_cast<QUmlGate *>(cfragmentGate));
 }
 
 void QUmlConsiderIgnoreFragmentObject::setInteractionOperator(QtUml::InteractionOperatorKind interactionOperator)
 {
-    qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->setInteractionOperator(interactionOperator);
+    qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->setInteractionOperator(interactionOperator);
 }
 
 void QUmlConsiderIgnoreFragmentObject::unsetInteractionOperator()
 {
-    qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("interactionOperator"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("interactionOperator"));
 }
 
 void QUmlConsiderIgnoreFragmentObject::addOperand(QObject *operand)
 {
-    qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->addOperand(qmodelingobjectproperty_cast<QUmlInteractionOperand *>(operand));
+    qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->addOperand(qmodelingelementproperty_cast<QUmlInteractionOperand *>(operand));
 }
 
 void QUmlConsiderIgnoreFragmentObject::removeOperand(QObject *operand)
 {
-    qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->removeOperand(qmodelingobjectproperty_cast<QUmlInteractionOperand *>(operand));
+    qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->removeOperand(qmodelingelementproperty_cast<QUmlInteractionOperand *>(operand));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ConsiderIgnoreFragment]
 
 void QUmlConsiderIgnoreFragmentObject::addMessage(QObject *message)
 {
-    qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->addMessage(qmodelingobjectproperty_cast<QUmlNamedElement *>(message));
+    qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->addMessage(qmodelingelementproperty_cast<QUmlNamedElement *>(message));
 }
 
 void QUmlConsiderIgnoreFragmentObject::removeMessage(QObject *message)
 {
-    qmodelingobjectproperty_cast<QUmlConsiderIgnoreFragment *>(this)->removeMessage(qmodelingobjectproperty_cast<QUmlNamedElement *>(message));
+    qmodelingelementproperty_cast<QUmlConsiderIgnoreFragment *>(this)->removeMessage(qmodelingelementproperty_cast<QUmlNamedElement *>(message));
+}
+
+
+void QUmlConsiderIgnoreFragmentObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlInteractionFragment");
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("covered"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingInteraction"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingOperand"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalOrderings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlCombinedFragment");
+    d->groupProperties.insert(QStringLiteral("QUmlCombinedFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("cfragmentGates"))));
+    d->groupProperties.insert(QStringLiteral("QUmlCombinedFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interactionOperator"))));
+    d->groupProperties.insert(QStringLiteral("QUmlCombinedFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("operands"))));
+
+    d->propertyGroups << QStringLiteral("QUmlConsiderIgnoreFragment");
+    d->groupProperties.insert(QStringLiteral("QUmlConsiderIgnoreFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("messages"))));
+}
+
+void QUmlConsiderIgnoreFragmentObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConsiderIgnoreFragment, messages, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConsiderIgnoreFragment, messages, PropertyClassRole, QStringLiteral("QUmlConsiderIgnoreFragment"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConsiderIgnoreFragment, messages, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConsiderIgnoreFragment, messages, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConsiderIgnoreFragment, messages, DocumentationRole, QStringLiteral("The set of messages that apply to this fragment"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConsiderIgnoreFragment, messages, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConsiderIgnoreFragment, messages, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConsiderIgnoreFragment, messages, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlconsiderignorefragmentobject_p.h b/src/uml/qobjects/qumlconsiderignorefragmentobject_p.h
index dc2ca063..46577317 100644
--- a/src/uml/qobjects/qumlconsiderignorefragmentobject_p.h
+++ b/src/uml/qobjects/qumlconsiderignorefragmentobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlConsiderIgnoreFragment;
-class Q_UML_EXPORT QUmlConsiderIgnoreFragmentObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlConsiderIgnoreFragmentObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlConsiderIgnoreFragmentObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -86,7 +89,7 @@ class Q_UML_EXPORT QUmlConsiderIgnoreFragmentObject : public QObject
     Q_PROPERTY(QSet<QObject *> messages READ messages)
 
 public:
-    Q_INVOKABLE explicit QUmlConsiderIgnoreFragmentObject(QUmlConsiderIgnoreFragment *qModelingObject);
+    Q_INVOKABLE explicit QUmlConsiderIgnoreFragmentObject(QUmlConsiderIgnoreFragment *qModelingElement);
     virtual ~QUmlConsiderIgnoreFragmentObject();
 
     // Owned attributes [Element]
@@ -163,6 +166,10 @@ public Q_SLOTS:
     // Slots for owned attributes [ConsiderIgnoreFragment]
     void addMessage(QObject *message);
     void removeMessage(QObject *message);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlconstraintobject.cpp b/src/uml/qobjects/qumlconstraintobject.cpp
index 07078004..24f94f8f 100644
--- a/src/uml/qobjects/qumlconstraintobject.cpp
+++ b/src/uml/qobjects/qumlconstraintobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlconstraintobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlConstraint>
 #include <QtUml/QUmlComment>
@@ -54,16 +55,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlConstraintObject::QUmlConstraintObject(QUmlConstraint *qModelingObject)
+QUmlConstraintObject::QUmlConstraintObject(QUmlConstraint *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlConstraintObject::~QUmlConstraintObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlConstraint *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlConstraint *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -72,43 +75,43 @@ QUmlConstraintObject::~QUmlConstraintObject()
 const QSet<QObject *> QUmlConstraintObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlConstraint *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlConstraint *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlConstraintObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlConstraint *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlConstraint *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlConstraintObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConstraint *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlConstraint *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConstraint *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConstraint *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlConstraintObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConstraint *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlConstraint *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConstraint *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConstraint *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlConstraintObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConstraint *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlConstraint *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConstraint *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConstraint *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -116,42 +119,42 @@ QObject *QUmlConstraintObject::templateParameter() const
 const QSet<QObject *> QUmlConstraintObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlConstraint *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlConstraint *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlConstraintObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlConstraint *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlConstraint *>(this)->name();
 }
 
 QObject *QUmlConstraintObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConstraint *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlConstraint *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConstraint *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConstraint *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlConstraintObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConstraint *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlConstraint *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConstraint *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConstraint *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlConstraintObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlConstraint *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlConstraint *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlConstraintObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlConstraint *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlConstraint *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Constraint]
@@ -159,25 +162,25 @@ QtUml::VisibilityKind QUmlConstraintObject::visibility() const
 const QList<QObject *> QUmlConstraintObject::constrainedElements() const
 {
     QList<QObject *> list;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlConstraint *>(this)->constrainedElements())
-        list.append(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlConstraint *>(this)->constrainedElements())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 QObject *QUmlConstraintObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConstraint *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlConstraint *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConstraint *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConstraint *>(this)->context()->asQModelingObject();
 }
 
 QObject *QUmlConstraintObject::specification() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlConstraint *>(this)->specification())
+    if (!qmodelingelementproperty_cast<QUmlConstraint *>(this)->specification())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlConstraint *>(this)->specification()->asQObject();
+        return qmodelingelementproperty_cast<QUmlConstraint *>(this)->specification()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -185,26 +188,26 @@ QObject *QUmlConstraintObject::specification() const
 QSet<QObject *> QUmlConstraintObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlConstraint *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlConstraint *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlConstraintObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlConstraint *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlConstraint *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlConstraintObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlConstraint *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlConstraint *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlConstraintObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlConstraint *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlConstraint *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [NamedElement]
@@ -212,131 +215,197 @@ bool QUmlConstraintObject::isTemplateParameter() const
 QList<QObject *> QUmlConstraintObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlConstraint *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlConstraint *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlConstraintObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlConstraint *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlConstraint *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlConstraintObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlConstraint *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlConstraint *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlConstraintObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlConstraint *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlConstraint *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlConstraintObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlConstraint *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlConstraint *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlConstraintObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlConstraint *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlConstraint *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlConstraintObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlConstraint *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlConstraint *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlConstraintObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlConstraint *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlConstraint *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlConstraintObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlConstraint *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlConstraint *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlConstraintObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlConstraint *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlConstraint *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlConstraintObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlConstraint *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlConstraint *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlConstraintObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlConstraint *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlConstraint *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlConstraintObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlConstraint *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlConstraint *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlConstraintObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlConstraint *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlConstraint *>(this)->setName(name);
 }
 
 void QUmlConstraintObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlConstraint *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlConstraint *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlConstraintObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlConstraint *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlConstraint *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlConstraintObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlConstraint *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlConstraint *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlConstraintObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlConstraint *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlConstraint *>(this)->setVisibility(visibility);
 }
 
 void QUmlConstraintObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlConstraint *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Constraint]
 
 void QUmlConstraintObject::addConstrainedElement(QObject *constrainedElement)
 {
-    qmodelingobjectproperty_cast<QUmlConstraint *>(this)->addConstrainedElement(qmodelingobjectproperty_cast<QUmlElement *>(constrainedElement));
+    qmodelingelementproperty_cast<QUmlConstraint *>(this)->addConstrainedElement(qmodelingelementproperty_cast<QUmlElement *>(constrainedElement));
 }
 
 void QUmlConstraintObject::removeConstrainedElement(QObject *constrainedElement)
 {
-    qmodelingobjectproperty_cast<QUmlConstraint *>(this)->removeConstrainedElement(qmodelingobjectproperty_cast<QUmlElement *>(constrainedElement));
+    qmodelingelementproperty_cast<QUmlConstraint *>(this)->removeConstrainedElement(qmodelingelementproperty_cast<QUmlElement *>(constrainedElement));
 }
 
 void QUmlConstraintObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlConstraint *>(this)->setContext(qmodelingobjectproperty_cast<QUmlNamespace *>(context));
+    qmodelingelementproperty_cast<QUmlConstraint *>(this)->setContext(qmodelingelementproperty_cast<QUmlNamespace *>(context));
 }
 
 void QUmlConstraintObject::setSpecification(QObject *specification)
 {
-    qmodelingobjectproperty_cast<QUmlConstraint *>(this)->setSpecification(qmodelingobjectproperty_cast<QUmlValueSpecification *>(specification));
+    qmodelingelementproperty_cast<QUmlConstraint *>(this)->setSpecification(qmodelingelementproperty_cast<QUmlValueSpecification *>(specification));
+}
+
+
+void QUmlConstraintObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlConstraint");
+    d->groupProperties.insert(QStringLiteral("QUmlConstraint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("constrainedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlConstraint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlConstraint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("specification"))));
+}
+
+void QUmlConstraintObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConstraint, constrainedElements, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConstraint, constrainedElements, PropertyClassRole, QStringLiteral("QUmlConstraint"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConstraint, constrainedElements, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConstraint, constrainedElements, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConstraint, constrainedElements, DocumentationRole, QStringLiteral("The ordered set of Elements referenced by this Constraint."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConstraint, constrainedElements, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConstraint, constrainedElements, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConstraint, constrainedElements, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConstraint, context, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConstraint, context, PropertyClassRole, QStringLiteral("QUmlConstraint"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConstraint, context, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConstraint, context, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConstraint, context, DocumentationRole, QStringLiteral("Specifies the namespace that owns the NamedElement."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConstraint, context, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConstraint, context, SubsettedPropertiesRole, QStringLiteral("NamedElement-namespace"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConstraint, context, OppositeEndRole, QStringLiteral("Namespace-ownedRule"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConstraint, specification, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConstraint, specification, PropertyClassRole, QStringLiteral("QUmlConstraint"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConstraint, specification, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConstraint, specification, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConstraint, specification, DocumentationRole, QStringLiteral("A condition that must be true when evaluated in order for the constraint to be satisfied."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConstraint, specification, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConstraint, specification, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlConstraint, specification, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlconstraintobject_p.h b/src/uml/qobjects/qumlconstraintobject_p.h
index 4474d081..80266dcf 100644
--- a/src/uml/qobjects/qumlconstraintobject_p.h
+++ b/src/uml/qobjects/qumlconstraintobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlConstraint;
-class Q_UML_EXPORT QUmlConstraintObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlConstraintObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlConstraintObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -83,7 +86,7 @@ class Q_UML_EXPORT QUmlConstraintObject : public QObject
     Q_PROPERTY(QObject * specification READ specification WRITE setSpecification)
 
 public:
-    Q_INVOKABLE explicit QUmlConstraintObject(QUmlConstraint *qModelingObject);
+    Q_INVOKABLE explicit QUmlConstraintObject(QUmlConstraint *qModelingElement);
     virtual ~QUmlConstraintObject();
 
     // Owned attributes [Element]
@@ -154,6 +157,10 @@ public Q_SLOTS:
     void removeConstrainedElement(QObject *constrainedElement);
     void setContext(QObject *context = 0);
     void setSpecification(QObject *specification = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlcontinuationobject.cpp b/src/uml/qobjects/qumlcontinuationobject.cpp
index 60e4641a..416c1549 100644
--- a/src/uml/qobjects/qumlcontinuationobject.cpp
+++ b/src/uml/qobjects/qumlcontinuationobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlcontinuationobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlContinuation>
 #include <QtUml/QUmlComment>
@@ -55,16 +56,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlContinuationObject::QUmlContinuationObject(QUmlContinuation *qModelingObject)
+QUmlContinuationObject::QUmlContinuationObject(QUmlContinuation *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlContinuationObject::~QUmlContinuationObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlContinuation *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlContinuation *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -73,25 +76,25 @@ QUmlContinuationObject::~QUmlContinuationObject()
 const QSet<QObject *> QUmlContinuationObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlContinuation *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlContinuation *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlContinuationObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlContinuation *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlContinuation *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlContinuationObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlContinuation *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlContinuation *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlContinuation *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlContinuation *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -99,40 +102,40 @@ QObject *QUmlContinuationObject::owner() const
 const QSet<QObject *> QUmlContinuationObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlContinuation *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlContinuation *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlContinuationObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlContinuation *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlContinuation *>(this)->name();
 }
 
 QObject *QUmlContinuationObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlContinuation *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlContinuation *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlContinuation *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlContinuation *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlContinuationObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlContinuation *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlContinuation *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlContinuation *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlContinuation *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlContinuationObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlContinuation *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlContinuation *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlContinuationObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlContinuation *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlContinuation *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [InteractionFragment]
@@ -140,32 +143,32 @@ QtUml::VisibilityKind QUmlContinuationObject::visibility() const
 const QSet<QObject *> QUmlContinuationObject::covered() const
 {
     QSet<QObject *> set;
-    foreach (QUmlLifeline *element, qmodelingobjectproperty_cast<QUmlContinuation *>(this)->covered())
-        set.insert(element->asQObject());
+    foreach (QUmlLifeline *element, qmodelingelementproperty_cast<QUmlContinuation *>(this)->covered())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlContinuationObject::enclosingInteraction() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlContinuation *>(this)->enclosingInteraction())
+    if (!qmodelingelementproperty_cast<QUmlContinuation *>(this)->enclosingInteraction())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlContinuation *>(this)->enclosingInteraction()->asQObject();
+        return qmodelingelementproperty_cast<QUmlContinuation *>(this)->enclosingInteraction()->asQModelingObject();
 }
 
 QObject *QUmlContinuationObject::enclosingOperand() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlContinuation *>(this)->enclosingOperand())
+    if (!qmodelingelementproperty_cast<QUmlContinuation *>(this)->enclosingOperand())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlContinuation *>(this)->enclosingOperand()->asQObject();
+        return qmodelingelementproperty_cast<QUmlContinuation *>(this)->enclosingOperand()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlContinuationObject::generalOrderings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralOrdering *element, qmodelingobjectproperty_cast<QUmlContinuation *>(this)->generalOrderings())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralOrdering *element, qmodelingelementproperty_cast<QUmlContinuation *>(this)->generalOrderings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -173,7 +176,7 @@ const QSet<QObject *> QUmlContinuationObject::generalOrderings() const
 
 bool QUmlContinuationObject::setting() const
 {
-    return qmodelingobjectproperty_cast<QUmlContinuation *>(this)->setting();
+    return qmodelingelementproperty_cast<QUmlContinuation *>(this)->setting();
 }
 
 // OPERATIONS [Element]
@@ -181,14 +184,14 @@ bool QUmlContinuationObject::setting() const
 QSet<QObject *> QUmlContinuationObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlContinuation *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlContinuation *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlContinuationObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlContinuation *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlContinuation *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -196,135 +199,181 @@ bool QUmlContinuationObject::mustBeOwned() const
 QList<QObject *> QUmlContinuationObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlContinuation *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlContinuation *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlContinuationObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlContinuation *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlContinuation *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlContinuationObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlContinuation *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlContinuation *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlContinuationObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlContinuation *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlContinuation *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlContinuationObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlContinuation *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlContinuation *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlContinuationObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlContinuation *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlContinuation *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlContinuationObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlContinuation *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlContinuation *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlContinuationObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlContinuation *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlContinuation *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlContinuationObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlContinuation *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlContinuation *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlContinuationObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlContinuation *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlContinuation *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlContinuationObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlContinuation *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlContinuation *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlContinuationObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlContinuation *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlContinuation *>(this)->setName(name);
 }
 
 void QUmlContinuationObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlContinuation *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlContinuation *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlContinuationObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlContinuation *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlContinuation *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlContinuationObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlContinuation *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlContinuation *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlContinuationObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlContinuation *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlContinuation *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [InteractionFragment]
 
 void QUmlContinuationObject::addCovered(QObject *covered)
 {
-    qmodelingobjectproperty_cast<QUmlContinuation *>(this)->addCovered(qmodelingobjectproperty_cast<QUmlLifeline *>(covered));
+    qmodelingelementproperty_cast<QUmlContinuation *>(this)->addCovered(qmodelingelementproperty_cast<QUmlLifeline *>(covered));
 }
 
 void QUmlContinuationObject::removeCovered(QObject *covered)
 {
-    qmodelingobjectproperty_cast<QUmlContinuation *>(this)->removeCovered(qmodelingobjectproperty_cast<QUmlLifeline *>(covered));
+    qmodelingelementproperty_cast<QUmlContinuation *>(this)->removeCovered(qmodelingelementproperty_cast<QUmlLifeline *>(covered));
 }
 
 void QUmlContinuationObject::setEnclosingInteraction(QObject *enclosingInteraction)
 {
-    qmodelingobjectproperty_cast<QUmlContinuation *>(this)->setEnclosingInteraction(qmodelingobjectproperty_cast<QUmlInteraction *>(enclosingInteraction));
+    qmodelingelementproperty_cast<QUmlContinuation *>(this)->setEnclosingInteraction(qmodelingelementproperty_cast<QUmlInteraction *>(enclosingInteraction));
 }
 
 void QUmlContinuationObject::setEnclosingOperand(QObject *enclosingOperand)
 {
-    qmodelingobjectproperty_cast<QUmlContinuation *>(this)->setEnclosingOperand(qmodelingobjectproperty_cast<QUmlInteractionOperand *>(enclosingOperand));
+    qmodelingelementproperty_cast<QUmlContinuation *>(this)->setEnclosingOperand(qmodelingelementproperty_cast<QUmlInteractionOperand *>(enclosingOperand));
 }
 
 void QUmlContinuationObject::addGeneralOrdering(QObject *generalOrdering)
 {
-    qmodelingobjectproperty_cast<QUmlContinuation *>(this)->addGeneralOrdering(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
+    qmodelingelementproperty_cast<QUmlContinuation *>(this)->addGeneralOrdering(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
 }
 
 void QUmlContinuationObject::removeGeneralOrdering(QObject *generalOrdering)
 {
-    qmodelingobjectproperty_cast<QUmlContinuation *>(this)->removeGeneralOrdering(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
+    qmodelingelementproperty_cast<QUmlContinuation *>(this)->removeGeneralOrdering(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Continuation]
 
 void QUmlContinuationObject::setSetting(bool setting)
 {
-    qmodelingobjectproperty_cast<QUmlContinuation *>(this)->setSetting(setting);
+    qmodelingelementproperty_cast<QUmlContinuation *>(this)->setSetting(setting);
 }
 
 void QUmlContinuationObject::unsetSetting()
 {
-    qmodelingobjectproperty_cast<QUmlContinuation *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("setting"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("setting"));
+}
+
+
+void QUmlContinuationObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlInteractionFragment");
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("covered"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingInteraction"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingOperand"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalOrderings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlContinuation");
+    d->groupProperties.insert(QStringLiteral("QUmlContinuation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("setting"))));
+}
+
+void QUmlContinuationObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlContinuation, setting, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlContinuation, setting, PropertyClassRole, QStringLiteral("QUmlContinuation"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlContinuation, setting, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlContinuation, setting, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlContinuation, setting, DocumentationRole, QStringLiteral("True: when the Continuation is at the end of the enclosing InteractionFragment and False when it is in the beginning."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlContinuation, setting, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlContinuation, setting, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlContinuation, setting, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlcontinuationobject_p.h b/src/uml/qobjects/qumlcontinuationobject_p.h
index 08d2a0cb..02242198 100644
--- a/src/uml/qobjects/qumlcontinuationobject_p.h
+++ b/src/uml/qobjects/qumlcontinuationobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlContinuation;
-class Q_UML_EXPORT QUmlContinuationObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlContinuationObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlContinuationObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -81,7 +84,7 @@ class Q_UML_EXPORT QUmlContinuationObject : public QObject
     Q_PROPERTY(bool setting READ setting WRITE setSetting RESET unsetSetting)
 
 public:
-    Q_INVOKABLE explicit QUmlContinuationObject(QUmlContinuation *qModelingObject);
+    Q_INVOKABLE explicit QUmlContinuationObject(QUmlContinuation *qModelingElement);
     virtual ~QUmlContinuationObject();
 
     // Owned attributes [Element]
@@ -145,6 +148,10 @@ public Q_SLOTS:
     // Slots for owned attributes [Continuation]
     void setSetting(bool setting);
     void unsetSetting();
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlcontrolflowobject.cpp b/src/uml/qobjects/qumlcontrolflowobject.cpp
index 3bdfb24f..89348b91 100644
--- a/src/uml/qobjects/qumlcontrolflowobject.cpp
+++ b/src/uml/qobjects/qumlcontrolflowobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlcontrolflowobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlControlFlow>
 #include <QtUml/QUmlActivity>
@@ -61,16 +62,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlControlFlowObject::QUmlControlFlowObject(QUmlControlFlow *qModelingObject)
+QUmlControlFlowObject::QUmlControlFlowObject(QUmlControlFlow *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlControlFlowObject::~QUmlControlFlowObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlControlFlow *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -79,25 +82,25 @@ QUmlControlFlowObject::~QUmlControlFlowObject()
 const QSet<QObject *> QUmlControlFlowObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlControlFlow *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlControlFlowObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlControlFlow *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlControlFlowObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlControlFlow *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlControlFlow *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -105,62 +108,62 @@ QObject *QUmlControlFlowObject::owner() const
 const QSet<QObject *> QUmlControlFlowObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlControlFlow *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlControlFlowObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlControlFlow *>(this)->name();
 }
 
 QObject *QUmlControlFlowObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlControlFlow *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlControlFlow *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlControlFlowObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlControlFlow *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlControlFlow *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlControlFlowObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlControlFlow *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlControlFlowObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlControlFlow *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlControlFlowObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlControlFlow *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlControlFlowObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlControlFlow *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlControlFlowObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlControlFlow *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -168,82 +171,82 @@ const QSet<QObject *> QUmlControlFlowObject::redefinitionContexts() const
 
 QObject *QUmlControlFlowObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlControlFlow *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlControlFlow *>(this)->activity()->asQModelingObject();
 }
 
 QObject *QUmlControlFlowObject::guard() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->guard())
+    if (!qmodelingelementproperty_cast<QUmlControlFlow *>(this)->guard())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->guard()->asQObject();
+        return qmodelingelementproperty_cast<QUmlControlFlow *>(this)->guard()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlControlFlowObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlControlFlow *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlControlFlowObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlControlFlow *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlControlFlowObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlControlFlow *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlControlFlow *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 QObject *QUmlControlFlowObject::interrupts() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->interrupts())
+    if (!qmodelingelementproperty_cast<QUmlControlFlow *>(this)->interrupts())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->interrupts()->asQObject();
+        return qmodelingelementproperty_cast<QUmlControlFlow *>(this)->interrupts()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlControlFlowObject::redefinedEdges() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->redefinedEdges())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlControlFlow *>(this)->redefinedEdges())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlControlFlowObject::source() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->source())
+    if (!qmodelingelementproperty_cast<QUmlControlFlow *>(this)->source())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->source()->asQObject();
+        return qmodelingelementproperty_cast<QUmlControlFlow *>(this)->source()->asQModelingObject();
 }
 
 QObject *QUmlControlFlowObject::target() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->target())
+    if (!qmodelingelementproperty_cast<QUmlControlFlow *>(this)->target())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->target()->asQObject();
+        return qmodelingelementproperty_cast<QUmlControlFlow *>(this)->target()->asQModelingObject();
 }
 
 QObject *QUmlControlFlowObject::weight() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->weight())
+    if (!qmodelingelementproperty_cast<QUmlControlFlow *>(this)->weight())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->weight()->asQObject();
+        return qmodelingelementproperty_cast<QUmlControlFlow *>(this)->weight()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -251,14 +254,14 @@ QObject *QUmlControlFlowObject::weight() const
 QSet<QObject *> QUmlControlFlowObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlControlFlow *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlControlFlowObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlControlFlow *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -266,202 +269,249 @@ bool QUmlControlFlowObject::mustBeOwned() const
 QList<QObject *> QUmlControlFlowObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlControlFlow *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlControlFlowObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlControlFlow *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlControlFlowObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlControlFlow *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlControlFlowObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlControlFlow *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlControlFlowObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlControlFlow *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlControlFlowObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlControlFlow *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlControlFlowObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlControlFlow *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlControlFlowObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlControlFlow *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlControlFlowObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlControlFlow *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlControlFlowObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlControlFlow *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlControlFlowObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlControlFlow *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlControlFlowObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlControlFlow *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlControlFlowObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlControlFlow *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlControlFlowObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlControlFlow *>(this)->setName(name);
 }
 
 void QUmlControlFlowObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlControlFlow *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlControlFlowObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlControlFlow *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlControlFlowObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlControlFlow *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlControlFlowObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlControlFlow *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlControlFlowObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlControlFlow *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlControlFlowObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlControlFlowObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlControlFlow *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlControlFlowObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlControlFlow *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlControlFlowObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlControlFlow *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlControlFlowObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlControlFlow *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityEdge]
 
 void QUmlControlFlowObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlControlFlow *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlControlFlowObject::setGuard(QObject *guard)
 {
-    qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->setGuard(qmodelingobjectproperty_cast<QUmlValueSpecification *>(guard));
+    qmodelingelementproperty_cast<QUmlControlFlow *>(this)->setGuard(qmodelingelementproperty_cast<QUmlValueSpecification *>(guard));
 }
 
 void QUmlControlFlowObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlControlFlow *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlControlFlowObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlControlFlow *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlControlFlowObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlControlFlow *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlControlFlowObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlControlFlow *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlControlFlowObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlControlFlow *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlControlFlowObject::setInterrupts(QObject *interrupts)
 {
-    qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->setInterrupts(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(interrupts));
+    qmodelingelementproperty_cast<QUmlControlFlow *>(this)->setInterrupts(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(interrupts));
 }
 
 void QUmlControlFlowObject::addRedefinedEdge(QObject *redefinedEdge)
 {
-    qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->addRedefinedEdge(qmodelingobjectproperty_cast<QUmlActivityEdge *>(redefinedEdge));
+    qmodelingelementproperty_cast<QUmlControlFlow *>(this)->addRedefinedEdge(qmodelingelementproperty_cast<QUmlActivityEdge *>(redefinedEdge));
 }
 
 void QUmlControlFlowObject::removeRedefinedEdge(QObject *redefinedEdge)
 {
-    qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->removeRedefinedEdge(qmodelingobjectproperty_cast<QUmlActivityEdge *>(redefinedEdge));
+    qmodelingelementproperty_cast<QUmlControlFlow *>(this)->removeRedefinedEdge(qmodelingelementproperty_cast<QUmlActivityEdge *>(redefinedEdge));
 }
 
 void QUmlControlFlowObject::setSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->setSource(qmodelingobjectproperty_cast<QUmlActivityNode *>(source));
+    qmodelingelementproperty_cast<QUmlControlFlow *>(this)->setSource(qmodelingelementproperty_cast<QUmlActivityNode *>(source));
 }
 
 void QUmlControlFlowObject::setTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->setTarget(qmodelingobjectproperty_cast<QUmlActivityNode *>(target));
+    qmodelingelementproperty_cast<QUmlControlFlow *>(this)->setTarget(qmodelingelementproperty_cast<QUmlActivityNode *>(target));
 }
 
 void QUmlControlFlowObject::setWeight(QObject *weight)
 {
-    qmodelingobjectproperty_cast<QUmlControlFlow *>(this)->setWeight(qmodelingobjectproperty_cast<QUmlValueSpecification *>(weight));
+    qmodelingelementproperty_cast<QUmlControlFlow *>(this)->setWeight(qmodelingelementproperty_cast<QUmlValueSpecification *>(weight));
+}
+
+
+void QUmlControlFlowObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityEdge");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("guard"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interrupts"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedEdges"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("source"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("target"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("weight"))));
+
+    d->propertyGroups << QStringLiteral("QUmlControlFlow");
+}
+
+void QUmlControlFlowObject::setPropertyData()
+{
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlcontrolflowobject_p.h b/src/uml/qobjects/qumlcontrolflowobject_p.h
index 73a09010..21091c24 100644
--- a/src/uml/qobjects/qumlcontrolflowobject_p.h
+++ b/src/uml/qobjects/qumlcontrolflowobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlControlFlow;
-class Q_UML_EXPORT QUmlControlFlowObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlControlFlowObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlControlFlowObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -89,7 +92,7 @@ class Q_UML_EXPORT QUmlControlFlowObject : public QObject
     Q_PROPERTY(QObject * weight READ weight WRITE setWeight)
 
 public:
-    Q_INVOKABLE explicit QUmlControlFlowObject(QUmlControlFlow *qModelingObject);
+    Q_INVOKABLE explicit QUmlControlFlowObject(QUmlControlFlow *qModelingElement);
     virtual ~QUmlControlFlowObject();
 
     // Owned attributes [Element]
@@ -176,6 +179,10 @@ public Q_SLOTS:
     void setSource(QObject *source = 0);
     void setTarget(QObject *target = 0);
     void setWeight(QObject *weight = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlcreatelinkactionobject.cpp b/src/uml/qobjects/qumlcreatelinkactionobject.cpp
index 055748b7..5ae3c4d8 100644
--- a/src/uml/qobjects/qumlcreatelinkactionobject.cpp
+++ b/src/uml/qobjects/qumlcreatelinkactionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlcreatelinkactionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlCreateLinkAction>
 #include <QtUml/QUmlActivity>
@@ -67,16 +68,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlCreateLinkActionObject::QUmlCreateLinkActionObject(QUmlCreateLinkAction *qModelingObject)
+QUmlCreateLinkActionObject::QUmlCreateLinkActionObject(QUmlCreateLinkAction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlCreateLinkActionObject::~QUmlCreateLinkActionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -85,25 +88,25 @@ QUmlCreateLinkActionObject::~QUmlCreateLinkActionObject()
 const QSet<QObject *> QUmlCreateLinkActionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCreateLinkActionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlCreateLinkActionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -111,62 +114,62 @@ QObject *QUmlCreateLinkActionObject::owner() const
 const QSet<QObject *> QUmlCreateLinkActionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlCreateLinkActionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->name();
 }
 
 QObject *QUmlCreateLinkActionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlCreateLinkActionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlCreateLinkActionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlCreateLinkActionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlCreateLinkActionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlCreateLinkActionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCreateLinkActionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -174,65 +177,65 @@ const QSet<QObject *> QUmlCreateLinkActionObject::redefinitionContexts() const
 
 QObject *QUmlCreateLinkActionObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlCreateLinkActionObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCreateLinkActionObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCreateLinkActionObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlCreateLinkActionObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlCreateLinkActionObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCreateLinkActionObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCreateLinkActionObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -241,8 +244,8 @@ const QSet<QObject *> QUmlCreateLinkActionObject::redefinedNodes() const
 const QSet<QObject *> QUmlCreateLinkActionObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -250,46 +253,46 @@ const QSet<QObject *> QUmlCreateLinkActionObject::handlers() const
 
 QObject *QUmlCreateLinkActionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlCreateLinkActionObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlCreateLinkActionObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlCreateLinkActionObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCreateLinkActionObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlCreateLinkActionObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -298,8 +301,8 @@ const QList<QObject *> QUmlCreateLinkActionObject::outputs() const
 const QSet<QObject *> QUmlCreateLinkActionObject::inputValues() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->inputValues())
-        set.insert(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->inputValues())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -308,8 +311,8 @@ const QSet<QObject *> QUmlCreateLinkActionObject::inputValues() const
 const QSet<QObject *> QUmlCreateLinkActionObject::endData() const
 {
     QSet<QObject *> set;
-    foreach (QUmlLinkEndCreationData *element, qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->endData())
-        set.insert(element->asQObject());
+    foreach (QUmlLinkEndCreationData *element, qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->endData())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -318,14 +321,14 @@ const QSet<QObject *> QUmlCreateLinkActionObject::endData() const
 QSet<QObject *> QUmlCreateLinkActionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlCreateLinkActionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -333,310 +336,382 @@ bool QUmlCreateLinkActionObject::mustBeOwned() const
 QList<QObject *> QUmlCreateLinkActionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlCreateLinkActionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlCreateLinkActionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlCreateLinkActionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlCreateLinkActionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlCreateLinkActionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [LinkAction]
 
 QObject *QUmlCreateLinkActionObject::association() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->association())
+    if (!qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->association())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->association()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->association()->asQModelingObject();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlCreateLinkActionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlCreateLinkActionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlCreateLinkActionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlCreateLinkActionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlCreateLinkActionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlCreateLinkActionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlCreateLinkActionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlCreateLinkActionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->setName(name);
 }
 
 void QUmlCreateLinkActionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlCreateLinkActionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlCreateLinkActionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlCreateLinkActionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlCreateLinkActionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlCreateLinkActionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlCreateLinkActionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlCreateLinkActionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlCreateLinkActionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlCreateLinkActionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlCreateLinkActionObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlCreateLinkActionObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlCreateLinkActionObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlCreateLinkActionObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlCreateLinkActionObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlCreateLinkActionObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlCreateLinkActionObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlCreateLinkActionObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlCreateLinkActionObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlCreateLinkActionObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlCreateLinkActionObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlCreateLinkActionObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlCreateLinkActionObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlCreateLinkActionObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlCreateLinkActionObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlCreateLinkActionObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlCreateLinkActionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlCreateLinkActionObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlCreateLinkActionObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlCreateLinkActionObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlCreateLinkActionObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlCreateLinkActionObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlCreateLinkActionObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlCreateLinkActionObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlCreateLinkActionObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlCreateLinkActionObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlCreateLinkActionObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [LinkAction]
 
 void QUmlCreateLinkActionObject::addInputValue(QObject *inputValue)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->addInputValue(qmodelingobjectproperty_cast<QUmlInputPin *>(inputValue));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->addInputValue(qmodelingelementproperty_cast<QUmlInputPin *>(inputValue));
 }
 
 void QUmlCreateLinkActionObject::removeInputValue(QObject *inputValue)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->removeInputValue(qmodelingobjectproperty_cast<QUmlInputPin *>(inputValue));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->removeInputValue(qmodelingelementproperty_cast<QUmlInputPin *>(inputValue));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [CreateLinkAction]
 
 void QUmlCreateLinkActionObject::addEndData(QObject *endData)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->addEndData(qmodelingobjectproperty_cast<QUmlLinkEndCreationData *>(endData));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->addEndData(qmodelingelementproperty_cast<QUmlLinkEndCreationData *>(endData));
 }
 
 void QUmlCreateLinkActionObject::removeEndData(QObject *endData)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkAction *>(this)->removeEndData(qmodelingobjectproperty_cast<QUmlLinkEndCreationData *>(endData));
+    qmodelingelementproperty_cast<QUmlCreateLinkAction *>(this)->removeEndData(qmodelingelementproperty_cast<QUmlLinkEndCreationData *>(endData));
+}
+
+
+void QUmlCreateLinkActionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlLinkAction");
+    d->groupProperties.insert(QStringLiteral("QUmlLinkAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputValues"))));
+
+    d->propertyGroups << QStringLiteral("QUmlWriteLinkAction");
+
+    d->propertyGroups << QStringLiteral("QUmlCreateLinkAction");
+    d->groupProperties.insert(QStringLiteral("QUmlCreateLinkAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("endData"))));
+}
+
+void QUmlCreateLinkActionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCreateLinkAction, endData, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCreateLinkAction, endData, PropertyClassRole, QStringLiteral("QUmlCreateLinkAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCreateLinkAction, endData, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCreateLinkAction, endData, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCreateLinkAction, endData, DocumentationRole, QStringLiteral("Specifies ends of association and inputs."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCreateLinkAction, endData, RedefinedPropertiesRole, QStringLiteral("LinkAction-endData"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCreateLinkAction, endData, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCreateLinkAction, endData, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlcreatelinkactionobject_p.h b/src/uml/qobjects/qumlcreatelinkactionobject_p.h
index 9ee8d4f3..51fca928 100644
--- a/src/uml/qobjects/qumlcreatelinkactionobject_p.h
+++ b/src/uml/qobjects/qumlcreatelinkactionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlCreateLinkAction;
-class Q_UML_EXPORT QUmlCreateLinkActionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlCreateLinkActionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlCreateLinkActionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -104,7 +107,7 @@ class Q_UML_EXPORT QUmlCreateLinkActionObject : public QObject
     Q_PROPERTY(QSet<QObject *> endData READ endData)
 
 public:
-    Q_INVOKABLE explicit QUmlCreateLinkActionObject(QUmlCreateLinkAction *qModelingObject);
+    Q_INVOKABLE explicit QUmlCreateLinkActionObject(QUmlCreateLinkAction *qModelingElement);
     virtual ~QUmlCreateLinkActionObject();
 
     // Owned attributes [Element]
@@ -235,6 +238,10 @@ public Q_SLOTS:
     // Slots for owned attributes [CreateLinkAction]
     void addEndData(QObject *endData);
     void removeEndData(QObject *endData);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlcreatelinkobjectactionobject.cpp b/src/uml/qobjects/qumlcreatelinkobjectactionobject.cpp
index e0cc48ba..de256306 100644
--- a/src/uml/qobjects/qumlcreatelinkobjectactionobject.cpp
+++ b/src/uml/qobjects/qumlcreatelinkobjectactionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlcreatelinkobjectactionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlCreateLinkObjectAction>
 #include <QtUml/QUmlActivity>
@@ -67,16 +68,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlCreateLinkObjectActionObject::QUmlCreateLinkObjectActionObject(QUmlCreateLinkObjectAction *qModelingObject)
+QUmlCreateLinkObjectActionObject::QUmlCreateLinkObjectActionObject(QUmlCreateLinkObjectAction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlCreateLinkObjectActionObject::~QUmlCreateLinkObjectActionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -85,25 +88,25 @@ QUmlCreateLinkObjectActionObject::~QUmlCreateLinkObjectActionObject()
 const QSet<QObject *> QUmlCreateLinkObjectActionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCreateLinkObjectActionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlCreateLinkObjectActionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -111,62 +114,62 @@ QObject *QUmlCreateLinkObjectActionObject::owner() const
 const QSet<QObject *> QUmlCreateLinkObjectActionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlCreateLinkObjectActionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->name();
 }
 
 QObject *QUmlCreateLinkObjectActionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlCreateLinkObjectActionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlCreateLinkObjectActionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlCreateLinkObjectActionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlCreateLinkObjectActionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlCreateLinkObjectActionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCreateLinkObjectActionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -174,65 +177,65 @@ const QSet<QObject *> QUmlCreateLinkObjectActionObject::redefinitionContexts() c
 
 QObject *QUmlCreateLinkObjectActionObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlCreateLinkObjectActionObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCreateLinkObjectActionObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCreateLinkObjectActionObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlCreateLinkObjectActionObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlCreateLinkObjectActionObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCreateLinkObjectActionObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCreateLinkObjectActionObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -241,8 +244,8 @@ const QSet<QObject *> QUmlCreateLinkObjectActionObject::redefinedNodes() const
 const QSet<QObject *> QUmlCreateLinkObjectActionObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -250,46 +253,46 @@ const QSet<QObject *> QUmlCreateLinkObjectActionObject::handlers() const
 
 QObject *QUmlCreateLinkObjectActionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlCreateLinkObjectActionObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlCreateLinkObjectActionObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlCreateLinkObjectActionObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCreateLinkObjectActionObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlCreateLinkObjectActionObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -298,8 +301,8 @@ const QList<QObject *> QUmlCreateLinkObjectActionObject::outputs() const
 const QSet<QObject *> QUmlCreateLinkObjectActionObject::inputValues() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->inputValues())
-        set.insert(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->inputValues())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -308,8 +311,8 @@ const QSet<QObject *> QUmlCreateLinkObjectActionObject::inputValues() const
 const QSet<QObject *> QUmlCreateLinkObjectActionObject::endData() const
 {
     QSet<QObject *> set;
-    foreach (QUmlLinkEndCreationData *element, qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->endData())
-        set.insert(element->asQObject());
+    foreach (QUmlLinkEndCreationData *element, qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->endData())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -317,10 +320,10 @@ const QSet<QObject *> QUmlCreateLinkObjectActionObject::endData() const
 
 QObject *QUmlCreateLinkObjectActionObject::result() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->result())
+    if (!qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->result())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->result()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->result()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -328,14 +331,14 @@ QObject *QUmlCreateLinkObjectActionObject::result() const
 QSet<QObject *> QUmlCreateLinkObjectActionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlCreateLinkObjectActionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -343,317 +346,392 @@ bool QUmlCreateLinkObjectActionObject::mustBeOwned() const
 QList<QObject *> QUmlCreateLinkObjectActionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlCreateLinkObjectActionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlCreateLinkObjectActionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlCreateLinkObjectActionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlCreateLinkObjectActionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlCreateLinkObjectActionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [LinkAction]
 
 QObject *QUmlCreateLinkObjectActionObject::association() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->association())
+    if (!qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->association())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->association()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->association()->asQModelingObject();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlCreateLinkObjectActionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlCreateLinkObjectActionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlCreateLinkObjectActionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlCreateLinkObjectActionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlCreateLinkObjectActionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlCreateLinkObjectActionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlCreateLinkObjectActionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlCreateLinkObjectActionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->setName(name);
 }
 
 void QUmlCreateLinkObjectActionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlCreateLinkObjectActionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlCreateLinkObjectActionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlCreateLinkObjectActionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlCreateLinkObjectActionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlCreateLinkObjectActionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlCreateLinkObjectActionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlCreateLinkObjectActionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlCreateLinkObjectActionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlCreateLinkObjectActionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlCreateLinkObjectActionObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlCreateLinkObjectActionObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlCreateLinkObjectActionObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlCreateLinkObjectActionObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlCreateLinkObjectActionObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlCreateLinkObjectActionObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlCreateLinkObjectActionObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlCreateLinkObjectActionObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlCreateLinkObjectActionObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlCreateLinkObjectActionObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlCreateLinkObjectActionObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlCreateLinkObjectActionObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlCreateLinkObjectActionObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlCreateLinkObjectActionObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlCreateLinkObjectActionObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlCreateLinkObjectActionObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlCreateLinkObjectActionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlCreateLinkObjectActionObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlCreateLinkObjectActionObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlCreateLinkObjectActionObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlCreateLinkObjectActionObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlCreateLinkObjectActionObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlCreateLinkObjectActionObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlCreateLinkObjectActionObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlCreateLinkObjectActionObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlCreateLinkObjectActionObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlCreateLinkObjectActionObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [LinkAction]
 
 void QUmlCreateLinkObjectActionObject::addInputValue(QObject *inputValue)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->addInputValue(qmodelingobjectproperty_cast<QUmlInputPin *>(inputValue));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->addInputValue(qmodelingelementproperty_cast<QUmlInputPin *>(inputValue));
 }
 
 void QUmlCreateLinkObjectActionObject::removeInputValue(QObject *inputValue)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->removeInputValue(qmodelingobjectproperty_cast<QUmlInputPin *>(inputValue));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->removeInputValue(qmodelingelementproperty_cast<QUmlInputPin *>(inputValue));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [CreateLinkAction]
 
 void QUmlCreateLinkObjectActionObject::addEndData(QObject *endData)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->addEndData(qmodelingobjectproperty_cast<QUmlLinkEndCreationData *>(endData));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->addEndData(qmodelingelementproperty_cast<QUmlLinkEndCreationData *>(endData));
 }
 
 void QUmlCreateLinkObjectActionObject::removeEndData(QObject *endData)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->removeEndData(qmodelingobjectproperty_cast<QUmlLinkEndCreationData *>(endData));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->removeEndData(qmodelingelementproperty_cast<QUmlLinkEndCreationData *>(endData));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [CreateLinkObjectAction]
 
 void QUmlCreateLinkObjectActionObject::setResult(QObject *result)
 {
-    qmodelingobjectproperty_cast<QUmlCreateLinkObjectAction *>(this)->setResult(qmodelingobjectproperty_cast<QUmlOutputPin *>(result));
+    qmodelingelementproperty_cast<QUmlCreateLinkObjectAction *>(this)->setResult(qmodelingelementproperty_cast<QUmlOutputPin *>(result));
+}
+
+
+void QUmlCreateLinkObjectActionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlLinkAction");
+    d->groupProperties.insert(QStringLiteral("QUmlLinkAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputValues"))));
+
+    d->propertyGroups << QStringLiteral("QUmlWriteLinkAction");
+
+    d->propertyGroups << QStringLiteral("QUmlCreateLinkAction");
+    d->groupProperties.insert(QStringLiteral("QUmlCreateLinkAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("endData"))));
+
+    d->propertyGroups << QStringLiteral("QUmlCreateLinkObjectAction");
+    d->groupProperties.insert(QStringLiteral("QUmlCreateLinkObjectAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("result"))));
+}
+
+void QUmlCreateLinkObjectActionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCreateLinkObjectAction, result, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCreateLinkObjectAction, result, PropertyClassRole, QStringLiteral("QUmlCreateLinkObjectAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCreateLinkObjectAction, result, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCreateLinkObjectAction, result, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCreateLinkObjectAction, result, DocumentationRole, QStringLiteral("Gives the output pin on which the result is put."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCreateLinkObjectAction, result, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCreateLinkObjectAction, result, SubsettedPropertiesRole, QStringLiteral("Action-output"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCreateLinkObjectAction, result, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlcreatelinkobjectactionobject_p.h b/src/uml/qobjects/qumlcreatelinkobjectactionobject_p.h
index bad7d4cc..d873487b 100644
--- a/src/uml/qobjects/qumlcreatelinkobjectactionobject_p.h
+++ b/src/uml/qobjects/qumlcreatelinkobjectactionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlCreateLinkObjectAction;
-class Q_UML_EXPORT QUmlCreateLinkObjectActionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlCreateLinkObjectActionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlCreateLinkObjectActionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -107,7 +110,7 @@ class Q_UML_EXPORT QUmlCreateLinkObjectActionObject : public QObject
     Q_PROPERTY(QObject * result READ result WRITE setResult)
 
 public:
-    Q_INVOKABLE explicit QUmlCreateLinkObjectActionObject(QUmlCreateLinkObjectAction *qModelingObject);
+    Q_INVOKABLE explicit QUmlCreateLinkObjectActionObject(QUmlCreateLinkObjectAction *qModelingElement);
     virtual ~QUmlCreateLinkObjectActionObject();
 
     // Owned attributes [Element]
@@ -244,6 +247,10 @@ public Q_SLOTS:
 
     // Slots for owned attributes [CreateLinkObjectAction]
     void setResult(QObject *result = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlcreateobjectactionobject.cpp b/src/uml/qobjects/qumlcreateobjectactionobject.cpp
index a56cb93e..a5cd0edb 100644
--- a/src/uml/qobjects/qumlcreateobjectactionobject.cpp
+++ b/src/uml/qobjects/qumlcreateobjectactionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlcreateobjectactionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlCreateObjectAction>
 #include <QtUml/QUmlActivity>
@@ -64,16 +65,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlCreateObjectActionObject::QUmlCreateObjectActionObject(QUmlCreateObjectAction *qModelingObject)
+QUmlCreateObjectActionObject::QUmlCreateObjectActionObject(QUmlCreateObjectAction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlCreateObjectActionObject::~QUmlCreateObjectActionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -82,25 +85,25 @@ QUmlCreateObjectActionObject::~QUmlCreateObjectActionObject()
 const QSet<QObject *> QUmlCreateObjectActionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCreateObjectActionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlCreateObjectActionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -108,62 +111,62 @@ QObject *QUmlCreateObjectActionObject::owner() const
 const QSet<QObject *> QUmlCreateObjectActionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlCreateObjectActionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->name();
 }
 
 QObject *QUmlCreateObjectActionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlCreateObjectActionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlCreateObjectActionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlCreateObjectActionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlCreateObjectActionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlCreateObjectActionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCreateObjectActionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -171,65 +174,65 @@ const QSet<QObject *> QUmlCreateObjectActionObject::redefinitionContexts() const
 
 QObject *QUmlCreateObjectActionObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlCreateObjectActionObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCreateObjectActionObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCreateObjectActionObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlCreateObjectActionObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlCreateObjectActionObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCreateObjectActionObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCreateObjectActionObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -238,8 +241,8 @@ const QSet<QObject *> QUmlCreateObjectActionObject::redefinedNodes() const
 const QSet<QObject *> QUmlCreateObjectActionObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -247,46 +250,46 @@ const QSet<QObject *> QUmlCreateObjectActionObject::handlers() const
 
 QObject *QUmlCreateObjectActionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlCreateObjectActionObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlCreateObjectActionObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlCreateObjectActionObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlCreateObjectActionObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlCreateObjectActionObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -294,18 +297,18 @@ const QList<QObject *> QUmlCreateObjectActionObject::outputs() const
 
 QObject *QUmlCreateObjectActionObject::classifier() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->classifier())
+    if (!qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->classifier())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->classifier()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->classifier()->asQModelingObject();
 }
 
 QObject *QUmlCreateObjectActionObject::result() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->result())
+    if (!qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->result())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->result()->asQObject();
+        return qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->result()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -313,14 +316,14 @@ QObject *QUmlCreateObjectActionObject::result() const
 QSet<QObject *> QUmlCreateObjectActionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlCreateObjectActionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -328,288 +331,365 @@ bool QUmlCreateObjectActionObject::mustBeOwned() const
 QList<QObject *> QUmlCreateObjectActionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlCreateObjectActionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlCreateObjectActionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlCreateObjectActionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlCreateObjectActionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlCreateObjectActionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlCreateObjectActionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlCreateObjectActionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlCreateObjectActionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlCreateObjectActionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlCreateObjectActionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlCreateObjectActionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlCreateObjectActionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlCreateObjectActionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->setName(name);
 }
 
 void QUmlCreateObjectActionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlCreateObjectActionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlCreateObjectActionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlCreateObjectActionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlCreateObjectActionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlCreateObjectActionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlCreateObjectActionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlCreateObjectActionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlCreateObjectActionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlCreateObjectActionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlCreateObjectActionObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlCreateObjectActionObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlCreateObjectActionObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlCreateObjectActionObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlCreateObjectActionObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlCreateObjectActionObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlCreateObjectActionObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlCreateObjectActionObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlCreateObjectActionObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlCreateObjectActionObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlCreateObjectActionObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlCreateObjectActionObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlCreateObjectActionObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlCreateObjectActionObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlCreateObjectActionObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlCreateObjectActionObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlCreateObjectActionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlCreateObjectActionObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlCreateObjectActionObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlCreateObjectActionObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlCreateObjectActionObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlCreateObjectActionObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlCreateObjectActionObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlCreateObjectActionObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlCreateObjectActionObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlCreateObjectActionObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlCreateObjectActionObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [CreateObjectAction]
 
 void QUmlCreateObjectActionObject::setClassifier(QObject *classifier)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->setClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(classifier));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->setClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(classifier));
 }
 
 void QUmlCreateObjectActionObject::setResult(QObject *result)
 {
-    qmodelingobjectproperty_cast<QUmlCreateObjectAction *>(this)->setResult(qmodelingobjectproperty_cast<QUmlOutputPin *>(result));
+    qmodelingelementproperty_cast<QUmlCreateObjectAction *>(this)->setResult(qmodelingelementproperty_cast<QUmlOutputPin *>(result));
+}
+
+
+void QUmlCreateObjectActionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlCreateObjectAction");
+    d->groupProperties.insert(QStringLiteral("QUmlCreateObjectAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifier"))));
+    d->groupProperties.insert(QStringLiteral("QUmlCreateObjectAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("result"))));
+}
+
+void QUmlCreateObjectActionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCreateObjectAction, classifier, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCreateObjectAction, classifier, PropertyClassRole, QStringLiteral("QUmlCreateObjectAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCreateObjectAction, classifier, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCreateObjectAction, classifier, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCreateObjectAction, classifier, DocumentationRole, QStringLiteral("Classifier to be instantiated."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCreateObjectAction, classifier, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCreateObjectAction, classifier, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCreateObjectAction, classifier, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCreateObjectAction, result, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCreateObjectAction, result, PropertyClassRole, QStringLiteral("QUmlCreateObjectAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCreateObjectAction, result, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCreateObjectAction, result, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCreateObjectAction, result, DocumentationRole, QStringLiteral("Gives the output pin on which the result is put."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCreateObjectAction, result, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCreateObjectAction, result, SubsettedPropertiesRole, QStringLiteral("Action-output"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlCreateObjectAction, result, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlcreateobjectactionobject_p.h b/src/uml/qobjects/qumlcreateobjectactionobject_p.h
index 49c4d38f..83a139b7 100644
--- a/src/uml/qobjects/qumlcreateobjectactionobject_p.h
+++ b/src/uml/qobjects/qumlcreateobjectactionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlCreateObjectAction;
-class Q_UML_EXPORT QUmlCreateObjectActionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlCreateObjectActionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlCreateObjectActionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -102,7 +105,7 @@ class Q_UML_EXPORT QUmlCreateObjectActionObject : public QObject
     Q_PROPERTY(QObject * result READ result WRITE setResult)
 
 public:
-    Q_INVOKABLE explicit QUmlCreateObjectActionObject(QUmlCreateObjectAction *qModelingObject);
+    Q_INVOKABLE explicit QUmlCreateObjectActionObject(QUmlCreateObjectAction *qModelingElement);
     virtual ~QUmlCreateObjectActionObject();
 
     // Owned attributes [Element]
@@ -224,6 +227,10 @@ public Q_SLOTS:
     // Slots for owned attributes [CreateObjectAction]
     void setClassifier(QObject *classifier = 0);
     void setResult(QObject *result = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumldatastorenodeobject.cpp b/src/uml/qobjects/qumldatastorenodeobject.cpp
index b8e105f2..c5bf3ac0 100644
--- a/src/uml/qobjects/qumldatastorenodeobject.cpp
+++ b/src/uml/qobjects/qumldatastorenodeobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumldatastorenodeobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlDataStoreNode>
 #include <QtUml/QUmlActivity>
@@ -64,16 +65,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlDataStoreNodeObject::QUmlDataStoreNodeObject(QUmlDataStoreNode *qModelingObject)
+QUmlDataStoreNodeObject::QUmlDataStoreNodeObject(QUmlDataStoreNode *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlDataStoreNodeObject::~QUmlDataStoreNodeObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -82,25 +85,25 @@ QUmlDataStoreNodeObject::~QUmlDataStoreNodeObject()
 const QSet<QObject *> QUmlDataStoreNodeObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDataStoreNodeObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlDataStoreNodeObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -108,62 +111,62 @@ QObject *QUmlDataStoreNodeObject::owner() const
 const QSet<QObject *> QUmlDataStoreNodeObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlDataStoreNodeObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->name();
 }
 
 QObject *QUmlDataStoreNodeObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlDataStoreNodeObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlDataStoreNodeObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlDataStoreNodeObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlDataStoreNodeObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlDataStoreNodeObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDataStoreNodeObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -171,65 +174,65 @@ const QSet<QObject *> QUmlDataStoreNodeObject::redefinitionContexts() const
 
 QObject *QUmlDataStoreNodeObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlDataStoreNodeObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDataStoreNodeObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDataStoreNodeObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlDataStoreNodeObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlDataStoreNodeObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDataStoreNodeObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDataStoreNodeObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -237,10 +240,10 @@ const QSet<QObject *> QUmlDataStoreNodeObject::redefinedNodes() const
 
 QObject *QUmlDataStoreNodeObject::type() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->type())
+    if (!qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->type())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->type()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->type()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ObjectNode]
@@ -248,35 +251,35 @@ QObject *QUmlDataStoreNodeObject::type() const
 const QSet<QObject *> QUmlDataStoreNodeObject::inStates() const
 {
     QSet<QObject *> set;
-    foreach (QUmlState *element, qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->inStates())
-        set.insert(element->asQObject());
+    foreach (QUmlState *element, qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->inStates())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDataStoreNodeObject::isControlType() const
 {
-    return qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->isControlType();
+    return qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->isControlType();
 }
 
 QtUml::ObjectNodeOrderingKind QUmlDataStoreNodeObject::ordering() const
 {
-    return qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->ordering();
+    return qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->ordering();
 }
 
 QObject *QUmlDataStoreNodeObject::selection() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->selection())
+    if (!qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->selection())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->selection()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->selection()->asQModelingObject();
 }
 
 QObject *QUmlDataStoreNodeObject::upperBound() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->upperBound())
+    if (!qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->upperBound())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->upperBound()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->upperBound()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -284,14 +287,14 @@ QObject *QUmlDataStoreNodeObject::upperBound() const
 QSet<QObject *> QUmlDataStoreNodeObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDataStoreNodeObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -299,256 +302,315 @@ bool QUmlDataStoreNodeObject::mustBeOwned() const
 QList<QObject *> QUmlDataStoreNodeObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlDataStoreNodeObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDataStoreNodeObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlDataStoreNodeObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlDataStoreNodeObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlDataStoreNodeObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlDataStoreNodeObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlDataStoreNodeObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlDataStoreNodeObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlDataStoreNodeObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlDataStoreNodeObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlDataStoreNodeObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlDataStoreNodeObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlDataStoreNodeObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->setName(name);
 }
 
 void QUmlDataStoreNodeObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlDataStoreNodeObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlDataStoreNodeObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlDataStoreNodeObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlDataStoreNodeObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlDataStoreNodeObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlDataStoreNodeObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlDataStoreNodeObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlDataStoreNodeObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlDataStoreNodeObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlDataStoreNodeObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlDataStoreNodeObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlDataStoreNodeObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlDataStoreNodeObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlDataStoreNodeObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlDataStoreNodeObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlDataStoreNodeObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlDataStoreNodeObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlDataStoreNodeObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlDataStoreNodeObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlDataStoreNodeObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlDataStoreNodeObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlDataStoreNodeObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlDataStoreNodeObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TypedElement]
 
 void QUmlDataStoreNodeObject::setType(QObject *type)
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->setType(qmodelingobjectproperty_cast<QUmlType *>(type));
+    qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->setType(qmodelingelementproperty_cast<QUmlType *>(type));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ObjectNode]
 
 void QUmlDataStoreNodeObject::addInState(QObject *inState)
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->addInState(qmodelingobjectproperty_cast<QUmlState *>(inState));
+    qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->addInState(qmodelingelementproperty_cast<QUmlState *>(inState));
 }
 
 void QUmlDataStoreNodeObject::removeInState(QObject *inState)
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->removeInState(qmodelingobjectproperty_cast<QUmlState *>(inState));
+    qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->removeInState(qmodelingelementproperty_cast<QUmlState *>(inState));
 }
 
 void QUmlDataStoreNodeObject::setControlType(bool isControlType)
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->setControlType(isControlType);
+    qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->setControlType(isControlType);
 }
 
 void QUmlDataStoreNodeObject::unsetControlType()
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("controlType"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("controlType"));
 }
 
 void QUmlDataStoreNodeObject::setOrdering(QtUml::ObjectNodeOrderingKind ordering)
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->setOrdering(ordering);
+    qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->setOrdering(ordering);
 }
 
 void QUmlDataStoreNodeObject::unsetOrdering()
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("ordering"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("ordering"));
 }
 
 void QUmlDataStoreNodeObject::setSelection(QObject *selection)
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->setSelection(qmodelingobjectproperty_cast<QUmlBehavior *>(selection));
+    qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->setSelection(qmodelingelementproperty_cast<QUmlBehavior *>(selection));
 }
 
 void QUmlDataStoreNodeObject::setUpperBound(QObject *upperBound)
 {
-    qmodelingobjectproperty_cast<QUmlDataStoreNode *>(this)->setUpperBound(qmodelingobjectproperty_cast<QUmlValueSpecification *>(upperBound));
+    qmodelingelementproperty_cast<QUmlDataStoreNode *>(this)->setUpperBound(qmodelingelementproperty_cast<QUmlValueSpecification *>(upperBound));
+}
+
+
+void QUmlDataStoreNodeObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTypedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
+
+    d->propertyGroups << QStringLiteral("QUmlObjectNode");
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStates"))));
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isControlType"))));
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ordering"))));
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("selection"))));
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperBound"))));
+
+    d->propertyGroups << QStringLiteral("QUmlCentralBufferNode");
+
+    d->propertyGroups << QStringLiteral("QUmlDataStoreNode");
+}
+
+void QUmlDataStoreNodeObject::setPropertyData()
+{
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumldatastorenodeobject_p.h b/src/uml/qobjects/qumldatastorenodeobject_p.h
index a95ff0a3..ec2b3e63 100644
--- a/src/uml/qobjects/qumldatastorenodeobject_p.h
+++ b/src/uml/qobjects/qumldatastorenodeobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlDataStoreNode;
-class Q_UML_EXPORT QUmlDataStoreNodeObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlDataStoreNodeObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlDataStoreNodeObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -97,7 +100,7 @@ class Q_UML_EXPORT QUmlDataStoreNodeObject : public QObject
     Q_PROPERTY(QObject * upperBound READ upperBound WRITE setUpperBound)
 
 public:
-    Q_INVOKABLE explicit QUmlDataStoreNodeObject(QUmlDataStoreNode *qModelingObject);
+    Q_INVOKABLE explicit QUmlDataStoreNodeObject(QUmlDataStoreNode *qModelingElement);
     virtual ~QUmlDataStoreNodeObject();
 
     // Owned attributes [Element]
@@ -206,6 +209,10 @@ public Q_SLOTS:
     void unsetOrdering();
     void setSelection(QObject *selection = 0);
     void setUpperBound(QObject *upperBound = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumldatatypeobject.cpp b/src/uml/qobjects/qumldatatypeobject.cpp
index 8cbc5b3b..489f76fb 100644
--- a/src/uml/qobjects/qumldatatypeobject.cpp
+++ b/src/uml/qobjects/qumldatatypeobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumldatatypeobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlDataType>
 #include <QtUml/QUmlClassifier>
@@ -72,16 +73,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlDataTypeObject::QUmlDataTypeObject(QUmlDataType *qModelingObject)
+QUmlDataTypeObject::QUmlDataTypeObject(QUmlDataType *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlDataTypeObject::~QUmlDataTypeObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlDataType *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlDataType *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -90,25 +93,25 @@ QUmlDataTypeObject::~QUmlDataTypeObject()
 const QSet<QObject *> QUmlDataTypeObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlDataType *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlDataType *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDataTypeObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlDataType *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlDataType *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlDataTypeObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDataType *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlDataType *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDataType *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDataType *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -116,35 +119,35 @@ QObject *QUmlDataTypeObject::owner() const
 const QSet<QObject *> QUmlDataTypeObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlDataType *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlDataType *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlDataTypeObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlDataType *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlDataType *>(this)->name();
 }
 
 QObject *QUmlDataTypeObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDataType *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlDataType *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDataType *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDataType *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlDataTypeObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDataType *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlDataType *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDataType *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDataType *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlDataTypeObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlDataType *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlDataType *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [Namespace]
@@ -152,48 +155,48 @@ QString QUmlDataTypeObject::qualifiedName() const
 const QSet<QObject *> QUmlDataTypeObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlDataType *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlDataType *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDataTypeObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlDataType *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlDataType *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDataTypeObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlDataType *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlDataType *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDataTypeObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlDataType *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlDataType *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDataTypeObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlDataType *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlDataType *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDataTypeObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlDataType *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlDataType *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -201,49 +204,49 @@ const QSet<QObject *> QUmlDataTypeObject::packageImports() const
 
 QObject *QUmlDataTypeObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDataType *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlDataType *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDataType *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDataType *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlDataTypeObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlDataType *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlDataType *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Type]
 
 QObject *QUmlDataTypeObject::package() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDataType *>(this)->package())
+    if (!qmodelingelementproperty_cast<QUmlDataType *>(this)->package())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDataType *>(this)->package()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDataType *>(this)->package()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlDataTypeObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlDataType *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlDataType *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlDataTypeObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlDataType *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlDataType *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDataTypeObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlDataType *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlDataType *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -252,8 +255,8 @@ const QSet<QObject *> QUmlDataTypeObject::redefinitionContexts() const
 const QSet<QObject *> QUmlDataTypeObject::templateBindings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTemplateBinding *element, qmodelingobjectproperty_cast<QUmlDataType *>(this)->templateBindings())
-        set.insert(element->asQObject());
+    foreach (QUmlTemplateBinding *element, qmodelingelementproperty_cast<QUmlDataType *>(this)->templateBindings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -262,122 +265,122 @@ const QSet<QObject *> QUmlDataTypeObject::templateBindings() const
 const QSet<QObject *> QUmlDataTypeObject::attributes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlDataType *>(this)->attributes())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlDataType *>(this)->attributes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDataTypeObject::collaborationUses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlCollaborationUse *element, qmodelingobjectproperty_cast<QUmlDataType *>(this)->collaborationUses())
-        set.insert(element->asQObject());
+    foreach (QUmlCollaborationUse *element, qmodelingelementproperty_cast<QUmlDataType *>(this)->collaborationUses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDataTypeObject::features() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlDataType *>(this)->features())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlDataType *>(this)->features())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDataTypeObject::generals() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlDataType *>(this)->generals())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlDataType *>(this)->generals())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDataTypeObject::generalizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralization *element, qmodelingobjectproperty_cast<QUmlDataType *>(this)->generalizations())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralization *element, qmodelingelementproperty_cast<QUmlDataType *>(this)->generalizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDataTypeObject::inheritedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlDataType *>(this)->inheritedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlDataType *>(this)->inheritedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDataTypeObject::isAbstract() const
 {
-    return qmodelingobjectproperty_cast<QUmlDataType *>(this)->isAbstract();
+    return qmodelingelementproperty_cast<QUmlDataType *>(this)->isAbstract();
 }
 
 bool QUmlDataTypeObject::isFinalSpecialization() const
 {
-    return qmodelingobjectproperty_cast<QUmlDataType *>(this)->isFinalSpecialization();
+    return qmodelingelementproperty_cast<QUmlDataType *>(this)->isFinalSpecialization();
 }
 
 QObject *QUmlDataTypeObject::ownedTemplateSignature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDataType *>(this)->ownedTemplateSignature())
+    if (!qmodelingelementproperty_cast<QUmlDataType *>(this)->ownedTemplateSignature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDataType *>(this)->ownedTemplateSignature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDataType *>(this)->ownedTemplateSignature()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlDataTypeObject::ownedUseCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlDataType *>(this)->ownedUseCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlDataType *>(this)->ownedUseCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDataTypeObject::powertypeExtents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralizationSet *element, qmodelingobjectproperty_cast<QUmlDataType *>(this)->powertypeExtents())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralizationSet *element, qmodelingelementproperty_cast<QUmlDataType *>(this)->powertypeExtents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDataTypeObject::redefinedClassifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlDataType *>(this)->redefinedClassifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlDataType *>(this)->redefinedClassifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlDataTypeObject::representation() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDataType *>(this)->representation())
+    if (!qmodelingelementproperty_cast<QUmlDataType *>(this)->representation())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDataType *>(this)->representation()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDataType *>(this)->representation()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlDataTypeObject::substitutions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlSubstitution *element, qmodelingobjectproperty_cast<QUmlDataType *>(this)->substitutions())
-        set.insert(element->asQObject());
+    foreach (QUmlSubstitution *element, qmodelingelementproperty_cast<QUmlDataType *>(this)->substitutions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlDataTypeObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDataType *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlDataType *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDataType *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDataType *>(this)->templateParameter()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlDataTypeObject::useCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlDataType *>(this)->useCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlDataType *>(this)->useCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -386,16 +389,16 @@ const QSet<QObject *> QUmlDataTypeObject::useCases() const
 const QList<QObject *> QUmlDataTypeObject::ownedAttributes() const
 {
     QList<QObject *> list;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlDataType *>(this)->ownedAttributes())
-        list.append(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlDataType *>(this)->ownedAttributes())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QList<QObject *> QUmlDataTypeObject::ownedOperations() const
 {
     QList<QObject *> list;
-    foreach (QUmlOperation *element, qmodelingobjectproperty_cast<QUmlDataType *>(this)->ownedOperations())
-        list.append(element->asQObject());
+    foreach (QUmlOperation *element, qmodelingelementproperty_cast<QUmlDataType *>(this)->ownedOperations())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -404,14 +407,14 @@ const QList<QObject *> QUmlDataTypeObject::ownedOperations() const
 QSet<QObject *> QUmlDataTypeObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlDataType *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlDataType *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDataTypeObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlDataType *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlDataType *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -419,27 +422,27 @@ bool QUmlDataTypeObject::mustBeOwned() const
 QList<QObject *> QUmlDataTypeObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlDataType *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlDataType *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlDataTypeObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlDataType *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlDataType *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDataTypeObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlDataType *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlDataType *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlDataTypeObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlDataType *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlDataType *>(this)->separator();
 }
 
 // OPERATIONS [Namespace]
@@ -448,44 +451,44 @@ QSet<QObject *> QUmlDataTypeObject::excludeCollisions(QSet<QObject *> imps) cons
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlDataType *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlDataType *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlDataTypeObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlDataType *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlDataType *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlDataTypeObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlDataType *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlDataType *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDataTypeObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlDataType *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlDataType *>(this)->membersAreDistinguishable();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlDataTypeObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlDataType *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlDataType *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlDataTypeObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlDataType *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlDataType *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [Type]
@@ -493,12 +496,12 @@ bool QUmlDataTypeObject::isTemplateParameter() const
 
 bool QUmlDataTypeObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlDataType *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlDataType *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlDataTypeObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlDataType *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlDataType *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [TemplateableElement]
@@ -506,8 +509,8 @@ bool QUmlDataTypeObject::isRedefinitionContextValid(QObject *redefined) const
 QSet<QObject *> QUmlDataTypeObject::parameterableElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterableElement *element, qmodelingobjectproperty_cast<QUmlDataType *>(this)->parameterableElements())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterableElement *element, qmodelingelementproperty_cast<QUmlDataType *>(this)->parameterableElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -516,52 +519,52 @@ QSet<QObject *> QUmlDataTypeObject::parameterableElements() const
 QSet<QObject *> QUmlDataTypeObject::allFeatures() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlDataType *>(this)->allFeatures())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlDataType *>(this)->allFeatures())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlDataTypeObject::allParents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlDataType *>(this)->allParents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlDataType *>(this)->allParents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDataTypeObject::conformsTo(QObject *other) const
 {
-    return qmodelingobjectproperty_cast<QUmlDataType *>(this)->conformsTo(qmodelingobjectproperty_cast<QUmlClassifier *>(other));
+    return qmodelingelementproperty_cast<QUmlDataType *>(this)->conformsTo(qmodelingelementproperty_cast<QUmlClassifier *>(other));
 }
 
 bool QUmlDataTypeObject::hasVisibilityOf(QObject *n) const
 {
-    return qmodelingobjectproperty_cast<QUmlDataType *>(this)->hasVisibilityOf(qmodelingobjectproperty_cast<QUmlNamedElement *>(n));
+    return qmodelingelementproperty_cast<QUmlDataType *>(this)->hasVisibilityOf(qmodelingelementproperty_cast<QUmlNamedElement *>(n));
 }
 
 QSet<QObject *> QUmlDataTypeObject::inheritableMembers(QObject *c) const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlDataType *>(this)->inheritableMembers(qmodelingobjectproperty_cast<QUmlClassifier *>(c)))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlDataType *>(this)->inheritableMembers(qmodelingelementproperty_cast<QUmlClassifier *>(c)))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDataTypeObject::isTemplate() const
 {
-    return qmodelingobjectproperty_cast<QUmlDataType *>(this)->isTemplate();
+    return qmodelingelementproperty_cast<QUmlDataType *>(this)->isTemplate();
 }
 
 bool QUmlDataTypeObject::maySpecializeType(QObject *c) const
 {
-    return qmodelingobjectproperty_cast<QUmlDataType *>(this)->maySpecializeType(qmodelingobjectproperty_cast<QUmlClassifier *>(c));
+    return qmodelingelementproperty_cast<QUmlDataType *>(this)->maySpecializeType(qmodelingelementproperty_cast<QUmlClassifier *>(c));
 }
 
 QSet<QObject *> QUmlDataTypeObject::parents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlDataType *>(this)->parents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlDataType *>(this)->parents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -571,10 +574,10 @@ QSet<QObject *> QUmlDataTypeObject::inherit(QSet<QObject *> inhs) const
 {
     QSet<QUmlNamedElement *> inhsConverted;
     foreach (QObject *object, inhs)
-        inhsConverted.insert(qmodelingobjectproperty_cast<QUmlNamedElement *>(object));
+        inhsConverted.insert(qmodelingelementproperty_cast<QUmlNamedElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlDataType *>(this)->inherit(inhsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlDataType *>(this)->inherit(inhsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -582,358 +585,453 @@ QSet<QObject *> QUmlDataTypeObject::inherit(QSet<QObject *> inhs) const
 
 void QUmlDataTypeObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlDataTypeObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlDataTypeObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlDataTypeObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlDataTypeObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlDataTypeObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlDataTypeObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlDataTypeObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->setName(name);
 }
 
 void QUmlDataTypeObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlDataTypeObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlDataTypeObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlDataTypeObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlDataTypeObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlDataTypeObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlDataTypeObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlDataTypeObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlDataTypeObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlDataTypeObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlDataTypeObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlDataTypeObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlDataTypeObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlDataTypeObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlDataTypeObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlDataTypeObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlDataTypeObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->setVisibility(visibility);
 }
 
 void QUmlDataTypeObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Type]
 
 void QUmlDataTypeObject::setPackage(QObject *package)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->setPackage(qmodelingobjectproperty_cast<QUmlPackage *>(package));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->setPackage(qmodelingelementproperty_cast<QUmlPackage *>(package));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlDataTypeObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlDataTypeObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlDataTypeObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlDataTypeObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlDataTypeObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlDataTypeObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateableElement]
 
 void QUmlDataTypeObject::addTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->addTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->addTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 void QUmlDataTypeObject::removeTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->removeTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->removeTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Classifier]
 
 void QUmlDataTypeObject::addAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->addAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->addAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlDataTypeObject::removeAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->removeAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->removeAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlDataTypeObject::addCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->addCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->addCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlDataTypeObject::removeCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->removeCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->removeCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlDataTypeObject::addFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->addFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->addFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlDataTypeObject::removeFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->removeFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->removeFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlDataTypeObject::addGeneral(QObject *general)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->addGeneral(qmodelingobjectproperty_cast<QUmlClassifier *>(general));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->addGeneral(qmodelingelementproperty_cast<QUmlClassifier *>(general));
 }
 
 void QUmlDataTypeObject::removeGeneral(QObject *general)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->removeGeneral(qmodelingobjectproperty_cast<QUmlClassifier *>(general));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->removeGeneral(qmodelingelementproperty_cast<QUmlClassifier *>(general));
 }
 
 void QUmlDataTypeObject::addGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->addGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->addGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlDataTypeObject::removeGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->removeGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->removeGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlDataTypeObject::addInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->addInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->addInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlDataTypeObject::removeInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->removeInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->removeInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlDataTypeObject::setAbstract(bool isAbstract)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->setAbstract(isAbstract);
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->setAbstract(isAbstract);
 }
 
 void QUmlDataTypeObject::unsetAbstract()
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("abstract"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
 void QUmlDataTypeObject::setFinalSpecialization(bool isFinalSpecialization)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->setFinalSpecialization(isFinalSpecialization);
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->setFinalSpecialization(isFinalSpecialization);
 }
 
 void QUmlDataTypeObject::unsetFinalSpecialization()
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("finalSpecialization"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
 void QUmlDataTypeObject::setOwnedTemplateSignature(QObject *ownedTemplateSignature)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->setOwnedTemplateSignature(qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->setOwnedTemplateSignature(qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
 }
 
 void QUmlDataTypeObject::addOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->addOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->addOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlDataTypeObject::removeOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->removeOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->removeOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlDataTypeObject::addPowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->addPowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->addPowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlDataTypeObject::removePowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->removePowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->removePowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlDataTypeObject::addRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->addRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->addRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlDataTypeObject::removeRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->removeRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->removeRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlDataTypeObject::setRepresentation(QObject *representation)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->setRepresentation(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(representation));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->setRepresentation(qmodelingelementproperty_cast<QUmlCollaborationUse *>(representation));
 }
 
 void QUmlDataTypeObject::addSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->addSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->addSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlDataTypeObject::removeSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->removeSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->removeSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlDataTypeObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
 }
 
 void QUmlDataTypeObject::addUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->addUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->addUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 void QUmlDataTypeObject::removeUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->removeUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->removeUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [DataType]
 
 void QUmlDataTypeObject::addOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->addOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->addOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlDataTypeObject::removeOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->removeOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->removeOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlDataTypeObject::addOwnedOperation(QObject *ownedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->addOwnedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(ownedOperation));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->addOwnedOperation(qmodelingelementproperty_cast<QUmlOperation *>(ownedOperation));
 }
 
 void QUmlDataTypeObject::removeOwnedOperation(QObject *ownedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlDataType *>(this)->removeOwnedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(ownedOperation));
+    qmodelingelementproperty_cast<QUmlDataType *>(this)->removeOwnedOperation(qmodelingelementproperty_cast<QUmlOperation *>(ownedOperation));
+}
+
+
+void QUmlDataTypeObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlType");
+    d->groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generals"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDataType");
+    d->groupProperties.insert(QStringLiteral("QUmlDataType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDataType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
+}
+
+void QUmlDataTypeObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDataType, ownedAttributes, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDataType, ownedAttributes, PropertyClassRole, QStringLiteral("QUmlDataType"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDataType, ownedAttributes, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDataType, ownedAttributes, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDataType, ownedAttributes, DocumentationRole, QStringLiteral("The Attributes owned by the DataType."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDataType, ownedAttributes, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDataType, ownedAttributes, SubsettedPropertiesRole, QStringLiteral("Namespace-ownedMember Classifier-attribute"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDataType, ownedAttributes, OppositeEndRole, QStringLiteral("Property-datatype"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDataType, ownedOperations, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDataType, ownedOperations, PropertyClassRole, QStringLiteral("QUmlDataType"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDataType, ownedOperations, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDataType, ownedOperations, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDataType, ownedOperations, DocumentationRole, QStringLiteral("The Operations owned by the DataType."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDataType, ownedOperations, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDataType, ownedOperations, SubsettedPropertiesRole, QStringLiteral("Classifier-feature A_redefinitionContext_redefinableElement-redefinableElement Namespace-ownedMember"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDataType, ownedOperations, OppositeEndRole, QStringLiteral("Operation-datatype"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumldatatypeobject_p.h b/src/uml/qobjects/qumldatatypeobject_p.h
index caeca808..2b6b2063 100644
--- a/src/uml/qobjects/qumldatatypeobject_p.h
+++ b/src/uml/qobjects/qumldatatypeobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlDataType;
-class Q_UML_EXPORT QUmlDataTypeObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlDataTypeObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlDataTypeObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -118,7 +121,7 @@ class Q_UML_EXPORT QUmlDataTypeObject : public QObject
     Q_PROPERTY(QList<QObject *> ownedOperations READ ownedOperations)
 
 public:
-    Q_INVOKABLE explicit QUmlDataTypeObject(QUmlDataType *qModelingObject);
+    Q_INVOKABLE explicit QUmlDataTypeObject(QUmlDataType *qModelingElement);
     virtual ~QUmlDataTypeObject();
 
     // Owned attributes [Element]
@@ -311,6 +314,10 @@ public Q_SLOTS:
     void removeOwnedAttribute(QObject *ownedAttribute);
     void addOwnedOperation(QObject *ownedOperation);
     void removeOwnedOperation(QObject *ownedOperation);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumldecisionnodeobject.cpp b/src/uml/qobjects/qumldecisionnodeobject.cpp
index 98e93687..8ada2e27 100644
--- a/src/uml/qobjects/qumldecisionnodeobject.cpp
+++ b/src/uml/qobjects/qumldecisionnodeobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumldecisionnodeobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlDecisionNode>
 #include <QtUml/QUmlActivity>
@@ -62,16 +63,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlDecisionNodeObject::QUmlDecisionNodeObject(QUmlDecisionNode *qModelingObject)
+QUmlDecisionNodeObject::QUmlDecisionNodeObject(QUmlDecisionNode *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlDecisionNodeObject::~QUmlDecisionNodeObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -80,25 +83,25 @@ QUmlDecisionNodeObject::~QUmlDecisionNodeObject()
 const QSet<QObject *> QUmlDecisionNodeObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDecisionNodeObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlDecisionNodeObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -106,62 +109,62 @@ QObject *QUmlDecisionNodeObject::owner() const
 const QSet<QObject *> QUmlDecisionNodeObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlDecisionNodeObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->name();
 }
 
 QObject *QUmlDecisionNodeObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlDecisionNodeObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlDecisionNodeObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlDecisionNodeObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlDecisionNodeObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlDecisionNodeObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDecisionNodeObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -169,65 +172,65 @@ const QSet<QObject *> QUmlDecisionNodeObject::redefinitionContexts() const
 
 QObject *QUmlDecisionNodeObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlDecisionNodeObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDecisionNodeObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDecisionNodeObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlDecisionNodeObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlDecisionNodeObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDecisionNodeObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDecisionNodeObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -235,18 +238,18 @@ const QSet<QObject *> QUmlDecisionNodeObject::redefinedNodes() const
 
 QObject *QUmlDecisionNodeObject::decisionInput() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->decisionInput())
+    if (!qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->decisionInput())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->decisionInput()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->decisionInput()->asQModelingObject();
 }
 
 QObject *QUmlDecisionNodeObject::decisionInputFlow() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->decisionInputFlow())
+    if (!qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->decisionInputFlow())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->decisionInputFlow()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->decisionInputFlow()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -254,14 +257,14 @@ QObject *QUmlDecisionNodeObject::decisionInputFlow() const
 QSet<QObject *> QUmlDecisionNodeObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDecisionNodeObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -269,219 +272,286 @@ bool QUmlDecisionNodeObject::mustBeOwned() const
 QList<QObject *> QUmlDecisionNodeObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlDecisionNodeObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDecisionNodeObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlDecisionNodeObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlDecisionNodeObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlDecisionNodeObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlDecisionNodeObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlDecisionNodeObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlDecisionNodeObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlDecisionNodeObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlDecisionNodeObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlDecisionNodeObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlDecisionNodeObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlDecisionNodeObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->setName(name);
 }
 
 void QUmlDecisionNodeObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlDecisionNodeObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlDecisionNodeObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlDecisionNodeObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlDecisionNodeObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlDecisionNodeObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlDecisionNodeObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlDecisionNodeObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlDecisionNodeObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlDecisionNodeObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlDecisionNodeObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlDecisionNodeObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlDecisionNodeObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlDecisionNodeObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlDecisionNodeObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlDecisionNodeObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlDecisionNodeObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlDecisionNodeObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlDecisionNodeObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlDecisionNodeObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlDecisionNodeObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlDecisionNodeObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlDecisionNodeObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlDecisionNodeObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [DecisionNode]
 
 void QUmlDecisionNodeObject::setDecisionInput(QObject *decisionInput)
 {
-    qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->setDecisionInput(qmodelingobjectproperty_cast<QUmlBehavior *>(decisionInput));
+    qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->setDecisionInput(qmodelingelementproperty_cast<QUmlBehavior *>(decisionInput));
 }
 
 void QUmlDecisionNodeObject::setDecisionInputFlow(QObject *decisionInputFlow)
 {
-    qmodelingobjectproperty_cast<QUmlDecisionNode *>(this)->setDecisionInputFlow(qmodelingobjectproperty_cast<QUmlObjectFlow *>(decisionInputFlow));
+    qmodelingelementproperty_cast<QUmlDecisionNode *>(this)->setDecisionInputFlow(qmodelingelementproperty_cast<QUmlObjectFlow *>(decisionInputFlow));
+}
+
+
+void QUmlDecisionNodeObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlControlNode");
+
+    d->propertyGroups << QStringLiteral("QUmlDecisionNode");
+    d->groupProperties.insert(QStringLiteral("QUmlDecisionNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("decisionInput"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDecisionNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("decisionInputFlow"))));
+}
+
+void QUmlDecisionNodeObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDecisionNode, decisionInput, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDecisionNode, decisionInput, PropertyClassRole, QStringLiteral("QUmlDecisionNode"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDecisionNode, decisionInput, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDecisionNode, decisionInput, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDecisionNode, decisionInput, DocumentationRole, QStringLiteral("Provides input to guard specifications on edges outgoing from the decision node."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDecisionNode, decisionInput, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDecisionNode, decisionInput, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDecisionNode, decisionInput, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDecisionNode, decisionInputFlow, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDecisionNode, decisionInputFlow, PropertyClassRole, QStringLiteral("QUmlDecisionNode"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDecisionNode, decisionInputFlow, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDecisionNode, decisionInputFlow, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDecisionNode, decisionInputFlow, DocumentationRole, QStringLiteral("An additional edge incoming to the decision node that provides a decision input value."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDecisionNode, decisionInputFlow, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDecisionNode, decisionInputFlow, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDecisionNode, decisionInputFlow, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumldecisionnodeobject_p.h b/src/uml/qobjects/qumldecisionnodeobject_p.h
index ed594faf..fab9ad6d 100644
--- a/src/uml/qobjects/qumldecisionnodeobject_p.h
+++ b/src/uml/qobjects/qumldecisionnodeobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlDecisionNode;
-class Q_UML_EXPORT QUmlDecisionNodeObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlDecisionNodeObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlDecisionNodeObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -91,7 +94,7 @@ class Q_UML_EXPORT QUmlDecisionNodeObject : public QObject
     Q_PROPERTY(QObject * decisionInputFlow READ decisionInputFlow WRITE setDecisionInputFlow)
 
 public:
-    Q_INVOKABLE explicit QUmlDecisionNodeObject(QUmlDecisionNode *qModelingObject);
+    Q_INVOKABLE explicit QUmlDecisionNodeObject(QUmlDecisionNode *qModelingElement);
     virtual ~QUmlDecisionNodeObject();
 
     // Owned attributes [Element]
@@ -185,6 +188,10 @@ public Q_SLOTS:
     // Slots for owned attributes [DecisionNode]
     void setDecisionInput(QObject *decisionInput = 0);
     void setDecisionInputFlow(QObject *decisionInputFlow = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumldependencyobject.cpp b/src/uml/qobjects/qumldependencyobject.cpp
index 1ac58eb5..1e997350 100644
--- a/src/uml/qobjects/qumldependencyobject.cpp
+++ b/src/uml/qobjects/qumldependencyobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumldependencyobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlDependency>
 #include <QtUml/QUmlComment>
@@ -52,16 +53,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlDependencyObject::QUmlDependencyObject(QUmlDependency *qModelingObject)
+QUmlDependencyObject::QUmlDependencyObject(QUmlDependency *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlDependencyObject::~QUmlDependencyObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlDependency *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlDependency *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -70,43 +73,43 @@ QUmlDependencyObject::~QUmlDependencyObject()
 const QSet<QObject *> QUmlDependencyObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlDependency *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlDependency *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDependencyObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlDependency *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlDependency *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlDependencyObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDependency *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlDependency *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDependency *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDependency *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlDependencyObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDependency *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlDependency *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDependency *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDependency *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlDependencyObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDependency *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlDependency *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDependency *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDependency *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -114,42 +117,42 @@ QObject *QUmlDependencyObject::templateParameter() const
 const QSet<QObject *> QUmlDependencyObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlDependency *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlDependency *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlDependencyObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlDependency *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlDependency *>(this)->name();
 }
 
 QObject *QUmlDependencyObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDependency *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlDependency *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDependency *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDependency *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlDependencyObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDependency *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlDependency *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDependency *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDependency *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlDependencyObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlDependency *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlDependency *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlDependencyObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlDependency *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlDependency *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Relationship]
@@ -157,8 +160,8 @@ QtUml::VisibilityKind QUmlDependencyObject::visibility() const
 const QSet<QObject *> QUmlDependencyObject::relatedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlDependency *>(this)->relatedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlDependency *>(this)->relatedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -167,16 +170,16 @@ const QSet<QObject *> QUmlDependencyObject::relatedElements() const
 const QSet<QObject *> QUmlDependencyObject::sources() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlDependency *>(this)->sources())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlDependency *>(this)->sources())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDependencyObject::targets() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlDependency *>(this)->targets())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlDependency *>(this)->targets())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -185,16 +188,16 @@ const QSet<QObject *> QUmlDependencyObject::targets() const
 const QSet<QObject *> QUmlDependencyObject::clients() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlDependency *>(this)->clients())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlDependency *>(this)->clients())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDependencyObject::suppliers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlDependency *>(this)->suppliers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlDependency *>(this)->suppliers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -203,26 +206,26 @@ const QSet<QObject *> QUmlDependencyObject::suppliers() const
 QSet<QObject *> QUmlDependencyObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlDependency *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlDependency *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDependencyObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlDependency *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlDependency *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlDependencyObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlDependency *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlDependency *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlDependencyObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlDependency *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlDependency *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [NamedElement]
@@ -230,165 +233,228 @@ bool QUmlDependencyObject::isTemplateParameter() const
 QList<QObject *> QUmlDependencyObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlDependency *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlDependency *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlDependencyObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlDependency *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlDependency *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDependencyObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlDependency *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlDependency *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlDependencyObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlDependency *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlDependency *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlDependencyObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlDependency *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlDependency *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlDependencyObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlDependency *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlDependency *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlDependencyObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDependency *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlDependency *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlDependencyObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDependency *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlDependency *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlDependencyObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlDependency *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlDependency *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlDependencyObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlDependency *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlDependency *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlDependencyObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlDependency *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlDependency *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlDependencyObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlDependency *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlDependency *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlDependencyObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlDependency *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlDependency *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlDependencyObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlDependency *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlDependency *>(this)->setName(name);
 }
 
 void QUmlDependencyObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlDependency *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlDependency *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlDependencyObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlDependency *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlDependency *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlDependencyObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlDependency *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlDependency *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlDependencyObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlDependency *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlDependency *>(this)->setVisibility(visibility);
 }
 
 void QUmlDependencyObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlDependency *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Relationship]
 
 void QUmlDependencyObject::addRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDependency *>(this)->addRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlDependency *>(this)->addRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 void QUmlDependencyObject::removeRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDependency *>(this)->removeRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlDependency *>(this)->removeRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [DirectedRelationship]
 
 void QUmlDependencyObject::addSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlDependency *>(this)->addSource(qmodelingobjectproperty_cast<QUmlElement *>(source));
+    qmodelingelementproperty_cast<QUmlDependency *>(this)->addSource(qmodelingelementproperty_cast<QUmlElement *>(source));
 }
 
 void QUmlDependencyObject::removeSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlDependency *>(this)->removeSource(qmodelingobjectproperty_cast<QUmlElement *>(source));
+    qmodelingelementproperty_cast<QUmlDependency *>(this)->removeSource(qmodelingelementproperty_cast<QUmlElement *>(source));
 }
 
 void QUmlDependencyObject::addTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlDependency *>(this)->addTarget(qmodelingobjectproperty_cast<QUmlElement *>(target));
+    qmodelingelementproperty_cast<QUmlDependency *>(this)->addTarget(qmodelingelementproperty_cast<QUmlElement *>(target));
 }
 
 void QUmlDependencyObject::removeTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlDependency *>(this)->removeTarget(qmodelingobjectproperty_cast<QUmlElement *>(target));
+    qmodelingelementproperty_cast<QUmlDependency *>(this)->removeTarget(qmodelingelementproperty_cast<QUmlElement *>(target));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Dependency]
 
 void QUmlDependencyObject::addClient(QObject *client)
 {
-    qmodelingobjectproperty_cast<QUmlDependency *>(this)->addClient(qmodelingobjectproperty_cast<QUmlNamedElement *>(client));
+    qmodelingelementproperty_cast<QUmlDependency *>(this)->addClient(qmodelingelementproperty_cast<QUmlNamedElement *>(client));
 }
 
 void QUmlDependencyObject::removeClient(QObject *client)
 {
-    qmodelingobjectproperty_cast<QUmlDependency *>(this)->removeClient(qmodelingobjectproperty_cast<QUmlNamedElement *>(client));
+    qmodelingelementproperty_cast<QUmlDependency *>(this)->removeClient(qmodelingelementproperty_cast<QUmlNamedElement *>(client));
 }
 
 void QUmlDependencyObject::addSupplier(QObject *supplier)
 {
-    qmodelingobjectproperty_cast<QUmlDependency *>(this)->addSupplier(qmodelingobjectproperty_cast<QUmlNamedElement *>(supplier));
+    qmodelingelementproperty_cast<QUmlDependency *>(this)->addSupplier(qmodelingelementproperty_cast<QUmlNamedElement *>(supplier));
 }
 
 void QUmlDependencyObject::removeSupplier(QObject *supplier)
 {
-    qmodelingobjectproperty_cast<QUmlDependency *>(this)->removeSupplier(qmodelingobjectproperty_cast<QUmlNamedElement *>(supplier));
+    qmodelingelementproperty_cast<QUmlDependency *>(this)->removeSupplier(qmodelingelementproperty_cast<QUmlNamedElement *>(supplier));
+}
+
+
+void QUmlDependencyObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDirectedRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDependency");
+    d->groupProperties.insert(QStringLiteral("QUmlDependency"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clients"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDependency"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("suppliers"))));
+}
+
+void QUmlDependencyObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDependency, clients, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDependency, clients, PropertyClassRole, QStringLiteral("QUmlDependency"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDependency, clients, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDependency, clients, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDependency, clients, DocumentationRole, QStringLiteral("The element(s) dependent on the supplier element(s). In some cases (such as a Trace Abstraction) the assignment of direction (that is, the designation of the client element) is at the discretion of the modeler, and is a stipulation."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDependency, clients, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDependency, clients, SubsettedPropertiesRole, QStringLiteral("DirectedRelationship-source"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDependency, clients, OppositeEndRole, QStringLiteral("NamedElement-clientDependency"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDependency, suppliers, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDependency, suppliers, PropertyClassRole, QStringLiteral("QUmlDependency"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDependency, suppliers, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDependency, suppliers, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDependency, suppliers, DocumentationRole, QStringLiteral("The element(s) independent of the client element(s), in the same respect and the same dependency relationship. In some directed dependency relationships (such as Refinement Abstractions), a common convention in the domain of class-based OO software is to put the more abstract element in this role. Despite this convention, users of UML may stipulate a sense of dependency suitable for their domain, which makes a more abstract element dependent on that which is more specific."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDependency, suppliers, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDependency, suppliers, SubsettedPropertiesRole, QStringLiteral("DirectedRelationship-target"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDependency, suppliers, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumldependencyobject_p.h b/src/uml/qobjects/qumldependencyobject_p.h
index 292f1978..719a6dcb 100644
--- a/src/uml/qobjects/qumldependencyobject_p.h
+++ b/src/uml/qobjects/qumldependencyobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlDependency;
-class Q_UML_EXPORT QUmlDependencyObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlDependencyObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlDependencyObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -89,7 +92,7 @@ class Q_UML_EXPORT QUmlDependencyObject : public QObject
     Q_PROPERTY(QSet<QObject *> suppliers READ suppliers)
 
 public:
-    Q_INVOKABLE explicit QUmlDependencyObject(QUmlDependency *qModelingObject);
+    Q_INVOKABLE explicit QUmlDependencyObject(QUmlDependency *qModelingElement);
     virtual ~QUmlDependencyObject();
 
     // Owned attributes [Element]
@@ -176,6 +179,10 @@ public Q_SLOTS:
     void removeClient(QObject *client);
     void addSupplier(QObject *supplier);
     void removeSupplier(QObject *supplier);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumldeploymentobject.cpp b/src/uml/qobjects/qumldeploymentobject.cpp
index 47448a7a..cc0ef6a7 100644
--- a/src/uml/qobjects/qumldeploymentobject.cpp
+++ b/src/uml/qobjects/qumldeploymentobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumldeploymentobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlDeployment>
 #include <QtUml/QUmlComment>
@@ -56,16 +57,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlDeploymentObject::QUmlDeploymentObject(QUmlDeployment *qModelingObject)
+QUmlDeploymentObject::QUmlDeploymentObject(QUmlDeployment *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlDeploymentObject::~QUmlDeploymentObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlDeployment *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlDeployment *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -74,43 +77,43 @@ QUmlDeploymentObject::~QUmlDeploymentObject()
 const QSet<QObject *> QUmlDeploymentObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlDeployment *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlDeployment *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDeploymentObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlDeployment *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlDeployment *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlDeploymentObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDeployment *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlDeployment *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDeployment *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDeployment *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlDeploymentObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDeployment *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlDeployment *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDeployment *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDeployment *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlDeploymentObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDeployment *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlDeployment *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDeployment *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDeployment *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -118,42 +121,42 @@ QObject *QUmlDeploymentObject::templateParameter() const
 const QSet<QObject *> QUmlDeploymentObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlDeployment *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlDeployment *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlDeploymentObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlDeployment *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlDeployment *>(this)->name();
 }
 
 QObject *QUmlDeploymentObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDeployment *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlDeployment *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDeployment *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDeployment *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlDeploymentObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDeployment *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlDeployment *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDeployment *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDeployment *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlDeploymentObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlDeployment *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlDeployment *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlDeploymentObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlDeployment *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlDeployment *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Relationship]
@@ -161,8 +164,8 @@ QtUml::VisibilityKind QUmlDeploymentObject::visibility() const
 const QSet<QObject *> QUmlDeploymentObject::relatedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlDeployment *>(this)->relatedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlDeployment *>(this)->relatedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -171,16 +174,16 @@ const QSet<QObject *> QUmlDeploymentObject::relatedElements() const
 const QSet<QObject *> QUmlDeploymentObject::sources() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlDeployment *>(this)->sources())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlDeployment *>(this)->sources())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDeploymentObject::targets() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlDeployment *>(this)->targets())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlDeployment *>(this)->targets())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -189,16 +192,16 @@ const QSet<QObject *> QUmlDeploymentObject::targets() const
 const QSet<QObject *> QUmlDeploymentObject::clients() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlDeployment *>(this)->clients())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlDeployment *>(this)->clients())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDeploymentObject::suppliers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlDeployment *>(this)->suppliers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlDeployment *>(this)->suppliers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -207,25 +210,25 @@ const QSet<QObject *> QUmlDeploymentObject::suppliers() const
 const QSet<QObject *> QUmlDeploymentObject::configurations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDeploymentSpecification *element, qmodelingobjectproperty_cast<QUmlDeployment *>(this)->configurations())
-        set.insert(element->asQObject());
+    foreach (QUmlDeploymentSpecification *element, qmodelingelementproperty_cast<QUmlDeployment *>(this)->configurations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDeploymentObject::deployedArtifacts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDeployedArtifact *element, qmodelingobjectproperty_cast<QUmlDeployment *>(this)->deployedArtifacts())
-        set.insert(element->asQObject());
+    foreach (QUmlDeployedArtifact *element, qmodelingelementproperty_cast<QUmlDeployment *>(this)->deployedArtifacts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlDeploymentObject::location() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDeployment *>(this)->location())
+    if (!qmodelingelementproperty_cast<QUmlDeployment *>(this)->location())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDeployment *>(this)->location()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDeployment *>(this)->location()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -233,26 +236,26 @@ QObject *QUmlDeploymentObject::location() const
 QSet<QObject *> QUmlDeploymentObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlDeployment *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlDeployment *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDeploymentObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlDeployment *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlDeployment *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlDeploymentObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlDeployment *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlDeployment *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlDeploymentObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlDeployment *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlDeployment *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [NamedElement]
@@ -260,192 +263,269 @@ bool QUmlDeploymentObject::isTemplateParameter() const
 QList<QObject *> QUmlDeploymentObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlDeployment *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlDeployment *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlDeploymentObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlDeployment *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlDeployment *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDeploymentObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlDeployment *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlDeployment *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlDeploymentObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlDeployment *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlDeployment *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlDeploymentObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlDeployment *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlDeployment *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlDeploymentObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlDeployment *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlDeployment *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlDeploymentObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDeployment *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlDeployment *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlDeploymentObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDeployment *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlDeployment *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlDeploymentObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlDeployment *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlDeployment *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlDeploymentObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlDeployment *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlDeployment *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlDeploymentObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlDeployment *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlDeployment *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlDeploymentObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlDeployment *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlDeployment *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlDeploymentObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlDeployment *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlDeployment *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlDeploymentObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlDeployment *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlDeployment *>(this)->setName(name);
 }
 
 void QUmlDeploymentObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlDeployment *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlDeployment *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlDeploymentObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlDeployment *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlDeployment *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlDeploymentObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlDeployment *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlDeployment *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlDeploymentObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlDeployment *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlDeployment *>(this)->setVisibility(visibility);
 }
 
 void QUmlDeploymentObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlDeployment *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Relationship]
 
 void QUmlDeploymentObject::addRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDeployment *>(this)->addRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlDeployment *>(this)->addRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 void QUmlDeploymentObject::removeRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDeployment *>(this)->removeRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlDeployment *>(this)->removeRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [DirectedRelationship]
 
 void QUmlDeploymentObject::addSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlDeployment *>(this)->addSource(qmodelingobjectproperty_cast<QUmlElement *>(source));
+    qmodelingelementproperty_cast<QUmlDeployment *>(this)->addSource(qmodelingelementproperty_cast<QUmlElement *>(source));
 }
 
 void QUmlDeploymentObject::removeSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlDeployment *>(this)->removeSource(qmodelingobjectproperty_cast<QUmlElement *>(source));
+    qmodelingelementproperty_cast<QUmlDeployment *>(this)->removeSource(qmodelingelementproperty_cast<QUmlElement *>(source));
 }
 
 void QUmlDeploymentObject::addTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlDeployment *>(this)->addTarget(qmodelingobjectproperty_cast<QUmlElement *>(target));
+    qmodelingelementproperty_cast<QUmlDeployment *>(this)->addTarget(qmodelingelementproperty_cast<QUmlElement *>(target));
 }
 
 void QUmlDeploymentObject::removeTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlDeployment *>(this)->removeTarget(qmodelingobjectproperty_cast<QUmlElement *>(target));
+    qmodelingelementproperty_cast<QUmlDeployment *>(this)->removeTarget(qmodelingelementproperty_cast<QUmlElement *>(target));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Dependency]
 
 void QUmlDeploymentObject::addClient(QObject *client)
 {
-    qmodelingobjectproperty_cast<QUmlDeployment *>(this)->addClient(qmodelingobjectproperty_cast<QUmlNamedElement *>(client));
+    qmodelingelementproperty_cast<QUmlDeployment *>(this)->addClient(qmodelingelementproperty_cast<QUmlNamedElement *>(client));
 }
 
 void QUmlDeploymentObject::removeClient(QObject *client)
 {
-    qmodelingobjectproperty_cast<QUmlDeployment *>(this)->removeClient(qmodelingobjectproperty_cast<QUmlNamedElement *>(client));
+    qmodelingelementproperty_cast<QUmlDeployment *>(this)->removeClient(qmodelingelementproperty_cast<QUmlNamedElement *>(client));
 }
 
 void QUmlDeploymentObject::addSupplier(QObject *supplier)
 {
-    qmodelingobjectproperty_cast<QUmlDeployment *>(this)->addSupplier(qmodelingobjectproperty_cast<QUmlNamedElement *>(supplier));
+    qmodelingelementproperty_cast<QUmlDeployment *>(this)->addSupplier(qmodelingelementproperty_cast<QUmlNamedElement *>(supplier));
 }
 
 void QUmlDeploymentObject::removeSupplier(QObject *supplier)
 {
-    qmodelingobjectproperty_cast<QUmlDeployment *>(this)->removeSupplier(qmodelingobjectproperty_cast<QUmlNamedElement *>(supplier));
+    qmodelingelementproperty_cast<QUmlDeployment *>(this)->removeSupplier(qmodelingelementproperty_cast<QUmlNamedElement *>(supplier));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Deployment]
 
 void QUmlDeploymentObject::addConfiguration(QObject *configuration)
 {
-    qmodelingobjectproperty_cast<QUmlDeployment *>(this)->addConfiguration(qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(configuration));
+    qmodelingelementproperty_cast<QUmlDeployment *>(this)->addConfiguration(qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(configuration));
 }
 
 void QUmlDeploymentObject::removeConfiguration(QObject *configuration)
 {
-    qmodelingobjectproperty_cast<QUmlDeployment *>(this)->removeConfiguration(qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(configuration));
+    qmodelingelementproperty_cast<QUmlDeployment *>(this)->removeConfiguration(qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(configuration));
 }
 
 void QUmlDeploymentObject::addDeployedArtifact(QObject *deployedArtifact)
 {
-    qmodelingobjectproperty_cast<QUmlDeployment *>(this)->addDeployedArtifact(qmodelingobjectproperty_cast<QUmlDeployedArtifact *>(deployedArtifact));
+    qmodelingelementproperty_cast<QUmlDeployment *>(this)->addDeployedArtifact(qmodelingelementproperty_cast<QUmlDeployedArtifact *>(deployedArtifact));
 }
 
 void QUmlDeploymentObject::removeDeployedArtifact(QObject *deployedArtifact)
 {
-    qmodelingobjectproperty_cast<QUmlDeployment *>(this)->removeDeployedArtifact(qmodelingobjectproperty_cast<QUmlDeployedArtifact *>(deployedArtifact));
+    qmodelingelementproperty_cast<QUmlDeployment *>(this)->removeDeployedArtifact(qmodelingelementproperty_cast<QUmlDeployedArtifact *>(deployedArtifact));
 }
 
 void QUmlDeploymentObject::setLocation(QObject *location)
 {
-    qmodelingobjectproperty_cast<QUmlDeployment *>(this)->setLocation(qmodelingobjectproperty_cast<QUmlDeploymentTarget *>(location));
+    qmodelingelementproperty_cast<QUmlDeployment *>(this)->setLocation(qmodelingelementproperty_cast<QUmlDeploymentTarget *>(location));
+}
+
+
+void QUmlDeploymentObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDirectedRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDependency");
+    d->groupProperties.insert(QStringLiteral("QUmlDependency"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clients"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDependency"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("suppliers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDeployment");
+    d->groupProperties.insert(QStringLiteral("QUmlDeployment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("configurations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDeployment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deployedArtifacts"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDeployment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("location"))));
+}
+
+void QUmlDeploymentObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeployment, configurations, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeployment, configurations, PropertyClassRole, QStringLiteral("QUmlDeployment"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeployment, configurations, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeployment, configurations, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeployment, configurations, DocumentationRole, QStringLiteral("The specification of properties that parameterize the deployment and execution of one or more Artifacts."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeployment, configurations, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeployment, configurations, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeployment, configurations, OppositeEndRole, QStringLiteral("DeploymentSpecification-deployment"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeployment, deployedArtifacts, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeployment, deployedArtifacts, PropertyClassRole, QStringLiteral("QUmlDeployment"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeployment, deployedArtifacts, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeployment, deployedArtifacts, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeployment, deployedArtifacts, DocumentationRole, QStringLiteral("The Artifacts that are deployed onto a Node. This association specializes the supplier association."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeployment, deployedArtifacts, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeployment, deployedArtifacts, SubsettedPropertiesRole, QStringLiteral("Dependency-supplier"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeployment, deployedArtifacts, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeployment, location, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeployment, location, PropertyClassRole, QStringLiteral("QUmlDeployment"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeployment, location, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeployment, location, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeployment, location, DocumentationRole, QStringLiteral("The DeployedTarget which is the target of a Deployment."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeployment, location, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeployment, location, SubsettedPropertiesRole, QStringLiteral("Element-owner Dependency-client"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeployment, location, OppositeEndRole, QStringLiteral("DeploymentTarget-deployment"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumldeploymentobject_p.h b/src/uml/qobjects/qumldeploymentobject_p.h
index e7ddc400..7e9e1192 100644
--- a/src/uml/qobjects/qumldeploymentobject_p.h
+++ b/src/uml/qobjects/qumldeploymentobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlDeployment;
-class Q_UML_EXPORT QUmlDeploymentObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlDeploymentObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlDeploymentObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -94,7 +97,7 @@ class Q_UML_EXPORT QUmlDeploymentObject : public QObject
     Q_PROPERTY(QObject * location READ location WRITE setLocation)
 
 public:
-    Q_INVOKABLE explicit QUmlDeploymentObject(QUmlDeployment *qModelingObject);
+    Q_INVOKABLE explicit QUmlDeploymentObject(QUmlDeployment *qModelingElement);
     virtual ~QUmlDeploymentObject();
 
     // Owned attributes [Element]
@@ -193,6 +196,10 @@ public Q_SLOTS:
     void addDeployedArtifact(QObject *deployedArtifact);
     void removeDeployedArtifact(QObject *deployedArtifact);
     void setLocation(QObject *location = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumldeploymentspecificationobject.cpp b/src/uml/qobjects/qumldeploymentspecificationobject.cpp
index a8f20c16..327a9148 100644
--- a/src/uml/qobjects/qumldeploymentspecificationobject.cpp
+++ b/src/uml/qobjects/qumldeploymentspecificationobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumldeploymentspecificationobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlDeploymentSpecification>
 #include <QtUml/QUmlArtifact>
@@ -75,16 +76,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlDeploymentSpecificationObject::QUmlDeploymentSpecificationObject(QUmlDeploymentSpecification *qModelingObject)
+QUmlDeploymentSpecificationObject::QUmlDeploymentSpecificationObject(QUmlDeploymentSpecification *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlDeploymentSpecificationObject::~QUmlDeploymentSpecificationObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -93,25 +96,25 @@ QUmlDeploymentSpecificationObject::~QUmlDeploymentSpecificationObject()
 const QSet<QObject *> QUmlDeploymentSpecificationObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDeploymentSpecificationObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlDeploymentSpecificationObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -119,35 +122,35 @@ QObject *QUmlDeploymentSpecificationObject::owner() const
 const QSet<QObject *> QUmlDeploymentSpecificationObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlDeploymentSpecificationObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->name();
 }
 
 QObject *QUmlDeploymentSpecificationObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlDeploymentSpecificationObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlDeploymentSpecificationObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [Namespace]
@@ -155,48 +158,48 @@ QString QUmlDeploymentSpecificationObject::qualifiedName() const
 const QSet<QObject *> QUmlDeploymentSpecificationObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDeploymentSpecificationObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDeploymentSpecificationObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDeploymentSpecificationObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDeploymentSpecificationObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDeploymentSpecificationObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -204,49 +207,49 @@ const QSet<QObject *> QUmlDeploymentSpecificationObject::packageImports() const
 
 QObject *QUmlDeploymentSpecificationObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlDeploymentSpecificationObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Type]
 
 QObject *QUmlDeploymentSpecificationObject::package() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->package())
+    if (!qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->package())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->package()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->package()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlDeploymentSpecificationObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlDeploymentSpecificationObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDeploymentSpecificationObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -255,8 +258,8 @@ const QSet<QObject *> QUmlDeploymentSpecificationObject::redefinitionContexts()
 const QSet<QObject *> QUmlDeploymentSpecificationObject::templateBindings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTemplateBinding *element, qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->templateBindings())
-        set.insert(element->asQObject());
+    foreach (QUmlTemplateBinding *element, qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->templateBindings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -265,122 +268,122 @@ const QSet<QObject *> QUmlDeploymentSpecificationObject::templateBindings() cons
 const QSet<QObject *> QUmlDeploymentSpecificationObject::attributes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->attributes())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->attributes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDeploymentSpecificationObject::collaborationUses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlCollaborationUse *element, qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->collaborationUses())
-        set.insert(element->asQObject());
+    foreach (QUmlCollaborationUse *element, qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->collaborationUses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDeploymentSpecificationObject::features() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->features())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->features())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDeploymentSpecificationObject::generals() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->generals())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->generals())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDeploymentSpecificationObject::generalizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralization *element, qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->generalizations())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralization *element, qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->generalizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDeploymentSpecificationObject::inheritedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->inheritedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->inheritedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDeploymentSpecificationObject::isAbstract() const
 {
-    return qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->isAbstract();
+    return qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->isAbstract();
 }
 
 bool QUmlDeploymentSpecificationObject::isFinalSpecialization() const
 {
-    return qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->isFinalSpecialization();
+    return qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->isFinalSpecialization();
 }
 
 QObject *QUmlDeploymentSpecificationObject::ownedTemplateSignature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->ownedTemplateSignature())
+    if (!qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->ownedTemplateSignature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->ownedTemplateSignature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->ownedTemplateSignature()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlDeploymentSpecificationObject::ownedUseCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->ownedUseCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->ownedUseCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDeploymentSpecificationObject::powertypeExtents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralizationSet *element, qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->powertypeExtents())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralizationSet *element, qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->powertypeExtents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDeploymentSpecificationObject::redefinedClassifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->redefinedClassifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->redefinedClassifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlDeploymentSpecificationObject::representation() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->representation())
+    if (!qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->representation())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->representation()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->representation()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlDeploymentSpecificationObject::substitutions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlSubstitution *element, qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->substitutions())
-        set.insert(element->asQObject());
+    foreach (QUmlSubstitution *element, qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->substitutions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlDeploymentSpecificationObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->templateParameter()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlDeploymentSpecificationObject::useCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->useCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->useCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -388,38 +391,38 @@ const QSet<QObject *> QUmlDeploymentSpecificationObject::useCases() const
 
 QString QUmlDeploymentSpecificationObject::fileName() const
 {
-    return qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->fileName();
+    return qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->fileName();
 }
 
 const QSet<QObject *> QUmlDeploymentSpecificationObject::manifestations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlManifestation *element, qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->manifestations())
-        set.insert(element->asQObject());
+    foreach (QUmlManifestation *element, qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->manifestations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDeploymentSpecificationObject::nestedArtifacts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlArtifact *element, qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->nestedArtifacts())
-        set.insert(element->asQObject());
+    foreach (QUmlArtifact *element, qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->nestedArtifacts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlDeploymentSpecificationObject::ownedAttributes() const
 {
     QList<QObject *> list;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->ownedAttributes())
-        list.append(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->ownedAttributes())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QList<QObject *> QUmlDeploymentSpecificationObject::ownedOperations() const
 {
     QList<QObject *> list;
-    foreach (QUmlOperation *element, qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->ownedOperations())
-        list.append(element->asQObject());
+    foreach (QUmlOperation *element, qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->ownedOperations())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -427,20 +430,20 @@ const QList<QObject *> QUmlDeploymentSpecificationObject::ownedOperations() cons
 
 QObject *QUmlDeploymentSpecificationObject::deployment() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->deployment())
+    if (!qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->deployment())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->deployment()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->deployment()->asQModelingObject();
 }
 
 QString QUmlDeploymentSpecificationObject::deploymentLocation() const
 {
-    return qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->deploymentLocation();
+    return qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->deploymentLocation();
 }
 
 QString QUmlDeploymentSpecificationObject::executionLocation() const
 {
-    return qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->executionLocation();
+    return qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->executionLocation();
 }
 
 // OPERATIONS [Element]
@@ -448,14 +451,14 @@ QString QUmlDeploymentSpecificationObject::executionLocation() const
 QSet<QObject *> QUmlDeploymentSpecificationObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDeploymentSpecificationObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -463,27 +466,27 @@ bool QUmlDeploymentSpecificationObject::mustBeOwned() const
 QList<QObject *> QUmlDeploymentSpecificationObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlDeploymentSpecificationObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDeploymentSpecificationObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlDeploymentSpecificationObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->separator();
 }
 
 // OPERATIONS [Namespace]
@@ -492,44 +495,44 @@ QSet<QObject *> QUmlDeploymentSpecificationObject::excludeCollisions(QSet<QObjec
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlDeploymentSpecificationObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlDeploymentSpecificationObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDeploymentSpecificationObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->membersAreDistinguishable();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlDeploymentSpecificationObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlDeploymentSpecificationObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [Type]
@@ -537,12 +540,12 @@ bool QUmlDeploymentSpecificationObject::isTemplateParameter() const
 
 bool QUmlDeploymentSpecificationObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlDeploymentSpecificationObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [TemplateableElement]
@@ -550,8 +553,8 @@ bool QUmlDeploymentSpecificationObject::isRedefinitionContextValid(QObject *rede
 QSet<QObject *> QUmlDeploymentSpecificationObject::parameterableElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterableElement *element, qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->parameterableElements())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterableElement *element, qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->parameterableElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -560,63 +563,63 @@ QSet<QObject *> QUmlDeploymentSpecificationObject::parameterableElements() const
 QSet<QObject *> QUmlDeploymentSpecificationObject::allFeatures() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->allFeatures())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->allFeatures())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlDeploymentSpecificationObject::allParents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->allParents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->allParents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDeploymentSpecificationObject::conformsTo(QObject *other) const
 {
-    return qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->conformsTo(qmodelingobjectproperty_cast<QUmlClassifier *>(other));
+    return qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->conformsTo(qmodelingelementproperty_cast<QUmlClassifier *>(other));
 }
 
 bool QUmlDeploymentSpecificationObject::hasVisibilityOf(QObject *n) const
 {
-    return qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->hasVisibilityOf(qmodelingobjectproperty_cast<QUmlNamedElement *>(n));
+    return qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->hasVisibilityOf(qmodelingelementproperty_cast<QUmlNamedElement *>(n));
 }
 
 QSet<QObject *> QUmlDeploymentSpecificationObject::inherit(QSet<QObject *> inhs) const
 {
     QSet<QUmlNamedElement *> inhsConverted;
     foreach (QObject *object, inhs)
-        inhsConverted.insert(qmodelingobjectproperty_cast<QUmlNamedElement *>(object));
+        inhsConverted.insert(qmodelingelementproperty_cast<QUmlNamedElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->inherit(inhsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->inherit(inhsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlDeploymentSpecificationObject::inheritableMembers(QObject *c) const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->inheritableMembers(qmodelingobjectproperty_cast<QUmlClassifier *>(c)))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->inheritableMembers(qmodelingelementproperty_cast<QUmlClassifier *>(c)))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDeploymentSpecificationObject::isTemplate() const
 {
-    return qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->isTemplate();
+    return qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->isTemplate();
 }
 
 bool QUmlDeploymentSpecificationObject::maySpecializeType(QObject *c) const
 {
-    return qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->maySpecializeType(qmodelingobjectproperty_cast<QUmlClassifier *>(c));
+    return qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->maySpecializeType(qmodelingelementproperty_cast<QUmlClassifier *>(c));
 }
 
 QSet<QObject *> QUmlDeploymentSpecificationObject::parents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->parents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->parents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -624,400 +627,514 @@ QSet<QObject *> QUmlDeploymentSpecificationObject::parents() const
 
 void QUmlDeploymentSpecificationObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlDeploymentSpecificationObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlDeploymentSpecificationObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlDeploymentSpecificationObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlDeploymentSpecificationObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlDeploymentSpecificationObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlDeploymentSpecificationObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlDeploymentSpecificationObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->setName(name);
 }
 
 void QUmlDeploymentSpecificationObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlDeploymentSpecificationObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlDeploymentSpecificationObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlDeploymentSpecificationObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlDeploymentSpecificationObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlDeploymentSpecificationObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlDeploymentSpecificationObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlDeploymentSpecificationObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlDeploymentSpecificationObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlDeploymentSpecificationObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlDeploymentSpecificationObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlDeploymentSpecificationObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlDeploymentSpecificationObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlDeploymentSpecificationObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlDeploymentSpecificationObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlDeploymentSpecificationObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlDeploymentSpecificationObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->setVisibility(visibility);
 }
 
 void QUmlDeploymentSpecificationObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Type]
 
 void QUmlDeploymentSpecificationObject::setPackage(QObject *package)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->setPackage(qmodelingobjectproperty_cast<QUmlPackage *>(package));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->setPackage(qmodelingelementproperty_cast<QUmlPackage *>(package));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlDeploymentSpecificationObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlDeploymentSpecificationObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlDeploymentSpecificationObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlDeploymentSpecificationObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlDeploymentSpecificationObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlDeploymentSpecificationObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateableElement]
 
 void QUmlDeploymentSpecificationObject::addTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->addTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->addTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 void QUmlDeploymentSpecificationObject::removeTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->removeTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->removeTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Classifier]
 
 void QUmlDeploymentSpecificationObject::addAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->addAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->addAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlDeploymentSpecificationObject::removeAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->removeAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->removeAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlDeploymentSpecificationObject::addCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->addCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->addCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlDeploymentSpecificationObject::removeCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->removeCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->removeCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlDeploymentSpecificationObject::addFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->addFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->addFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlDeploymentSpecificationObject::removeFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->removeFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->removeFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlDeploymentSpecificationObject::addGeneral(QObject *general)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->addGeneral(qmodelingobjectproperty_cast<QUmlClassifier *>(general));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->addGeneral(qmodelingelementproperty_cast<QUmlClassifier *>(general));
 }
 
 void QUmlDeploymentSpecificationObject::removeGeneral(QObject *general)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->removeGeneral(qmodelingobjectproperty_cast<QUmlClassifier *>(general));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->removeGeneral(qmodelingelementproperty_cast<QUmlClassifier *>(general));
 }
 
 void QUmlDeploymentSpecificationObject::addGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->addGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->addGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlDeploymentSpecificationObject::removeGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->removeGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->removeGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlDeploymentSpecificationObject::addInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->addInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->addInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlDeploymentSpecificationObject::removeInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->removeInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->removeInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlDeploymentSpecificationObject::setAbstract(bool isAbstract)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->setAbstract(isAbstract);
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->setAbstract(isAbstract);
 }
 
 void QUmlDeploymentSpecificationObject::unsetAbstract()
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("abstract"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
 void QUmlDeploymentSpecificationObject::setFinalSpecialization(bool isFinalSpecialization)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->setFinalSpecialization(isFinalSpecialization);
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->setFinalSpecialization(isFinalSpecialization);
 }
 
 void QUmlDeploymentSpecificationObject::unsetFinalSpecialization()
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("finalSpecialization"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
 void QUmlDeploymentSpecificationObject::setOwnedTemplateSignature(QObject *ownedTemplateSignature)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->setOwnedTemplateSignature(qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->setOwnedTemplateSignature(qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
 }
 
 void QUmlDeploymentSpecificationObject::addOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->addOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->addOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlDeploymentSpecificationObject::removeOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->removeOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->removeOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlDeploymentSpecificationObject::addPowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->addPowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->addPowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlDeploymentSpecificationObject::removePowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->removePowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->removePowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlDeploymentSpecificationObject::addRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->addRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->addRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlDeploymentSpecificationObject::removeRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->removeRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->removeRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlDeploymentSpecificationObject::setRepresentation(QObject *representation)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->setRepresentation(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(representation));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->setRepresentation(qmodelingelementproperty_cast<QUmlCollaborationUse *>(representation));
 }
 
 void QUmlDeploymentSpecificationObject::addSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->addSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->addSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlDeploymentSpecificationObject::removeSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->removeSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->removeSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlDeploymentSpecificationObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
 }
 
 void QUmlDeploymentSpecificationObject::addUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->addUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->addUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 void QUmlDeploymentSpecificationObject::removeUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->removeUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->removeUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Artifact]
 
 void QUmlDeploymentSpecificationObject::setFileName(QString fileName)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->setFileName(fileName);
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->setFileName(fileName);
 }
 
 void QUmlDeploymentSpecificationObject::addManifestation(QObject *manifestation)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->addManifestation(qmodelingobjectproperty_cast<QUmlManifestation *>(manifestation));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->addManifestation(qmodelingelementproperty_cast<QUmlManifestation *>(manifestation));
 }
 
 void QUmlDeploymentSpecificationObject::removeManifestation(QObject *manifestation)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->removeManifestation(qmodelingobjectproperty_cast<QUmlManifestation *>(manifestation));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->removeManifestation(qmodelingelementproperty_cast<QUmlManifestation *>(manifestation));
 }
 
 void QUmlDeploymentSpecificationObject::addNestedArtifact(QObject *nestedArtifact)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->addNestedArtifact(qmodelingobjectproperty_cast<QUmlArtifact *>(nestedArtifact));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->addNestedArtifact(qmodelingelementproperty_cast<QUmlArtifact *>(nestedArtifact));
 }
 
 void QUmlDeploymentSpecificationObject::removeNestedArtifact(QObject *nestedArtifact)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->removeNestedArtifact(qmodelingobjectproperty_cast<QUmlArtifact *>(nestedArtifact));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->removeNestedArtifact(qmodelingelementproperty_cast<QUmlArtifact *>(nestedArtifact));
 }
 
 void QUmlDeploymentSpecificationObject::addOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->addOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->addOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlDeploymentSpecificationObject::removeOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->removeOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->removeOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlDeploymentSpecificationObject::addOwnedOperation(QObject *ownedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->addOwnedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(ownedOperation));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->addOwnedOperation(qmodelingelementproperty_cast<QUmlOperation *>(ownedOperation));
 }
 
 void QUmlDeploymentSpecificationObject::removeOwnedOperation(QObject *ownedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->removeOwnedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(ownedOperation));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->removeOwnedOperation(qmodelingelementproperty_cast<QUmlOperation *>(ownedOperation));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [DeploymentSpecification]
 
 void QUmlDeploymentSpecificationObject::setDeployment(QObject *deployment)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->setDeployment(qmodelingobjectproperty_cast<QUmlDeployment *>(deployment));
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->setDeployment(qmodelingelementproperty_cast<QUmlDeployment *>(deployment));
 }
 
 void QUmlDeploymentSpecificationObject::setDeploymentLocation(QString deploymentLocation)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->setDeploymentLocation(deploymentLocation);
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->setDeploymentLocation(deploymentLocation);
 }
 
 void QUmlDeploymentSpecificationObject::setExecutionLocation(QString executionLocation)
 {
-    qmodelingobjectproperty_cast<QUmlDeploymentSpecification *>(this)->setExecutionLocation(executionLocation);
+    qmodelingelementproperty_cast<QUmlDeploymentSpecification *>(this)->setExecutionLocation(executionLocation);
+}
+
+
+void QUmlDeploymentSpecificationObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDeployedArtifact");
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlType");
+    d->groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generals"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
+
+    d->propertyGroups << QStringLiteral("QUmlArtifact");
+    d->groupProperties.insert(QStringLiteral("QUmlArtifact"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("fileName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlArtifact"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("manifestations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlArtifact"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedArtifacts"))));
+    d->groupProperties.insert(QStringLiteral("QUmlArtifact"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlArtifact"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDeploymentSpecification");
+    d->groupProperties.insert(QStringLiteral("QUmlDeploymentSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deployment"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDeploymentSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deploymentLocation"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDeploymentSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("executionLocation"))));
+}
+
+void QUmlDeploymentSpecificationObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeploymentSpecification, deployment, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeploymentSpecification, deployment, PropertyClassRole, QStringLiteral("QUmlDeploymentSpecification"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeploymentSpecification, deployment, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeploymentSpecification, deployment, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeploymentSpecification, deployment, DocumentationRole, QStringLiteral("The deployment with which the DeploymentSpecification is associated."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeploymentSpecification, deployment, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeploymentSpecification, deployment, SubsettedPropertiesRole, QStringLiteral("Element-owner"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeploymentSpecification, deployment, OppositeEndRole, QStringLiteral("Deployment-configuration"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeploymentSpecification, deploymentLocation, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeploymentSpecification, deploymentLocation, PropertyClassRole, QStringLiteral("QUmlDeploymentSpecification"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeploymentSpecification, deploymentLocation, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeploymentSpecification, deploymentLocation, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeploymentSpecification, deploymentLocation, DocumentationRole, QStringLiteral("The location where an Artifact is deployed onto a Node. This is typically a 'directory' or 'memory address'."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeploymentSpecification, deploymentLocation, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeploymentSpecification, deploymentLocation, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeploymentSpecification, deploymentLocation, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeploymentSpecification, executionLocation, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeploymentSpecification, executionLocation, PropertyClassRole, QStringLiteral("QUmlDeploymentSpecification"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeploymentSpecification, executionLocation, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeploymentSpecification, executionLocation, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeploymentSpecification, executionLocation, DocumentationRole, QStringLiteral("The location where a component Artifact executes. This may be a local or remote location."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeploymentSpecification, executionLocation, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeploymentSpecification, executionLocation, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDeploymentSpecification, executionLocation, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumldeploymentspecificationobject_p.h b/src/uml/qobjects/qumldeploymentspecificationobject_p.h
index 06bfef0c..98720f5b 100644
--- a/src/uml/qobjects/qumldeploymentspecificationobject_p.h
+++ b/src/uml/qobjects/qumldeploymentspecificationobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlDeploymentSpecification;
-class Q_UML_EXPORT QUmlDeploymentSpecificationObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlDeploymentSpecificationObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlDeploymentSpecificationObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -126,7 +129,7 @@ class Q_UML_EXPORT QUmlDeploymentSpecificationObject : public QObject
     Q_PROPERTY(QString executionLocation READ executionLocation WRITE setExecutionLocation)
 
 public:
-    Q_INVOKABLE explicit QUmlDeploymentSpecificationObject(QUmlDeploymentSpecification *qModelingObject);
+    Q_INVOKABLE explicit QUmlDeploymentSpecificationObject(QUmlDeploymentSpecification *qModelingElement);
     virtual ~QUmlDeploymentSpecificationObject();
 
     // Owned attributes [Element]
@@ -335,6 +338,10 @@ public Q_SLOTS:
     void setDeployment(QObject *deployment = 0);
     void setDeploymentLocation(QString deploymentLocation);
     void setExecutionLocation(QString executionLocation);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumldestroylinkactionobject.cpp b/src/uml/qobjects/qumldestroylinkactionobject.cpp
index cd3a6033..690a9ff1 100644
--- a/src/uml/qobjects/qumldestroylinkactionobject.cpp
+++ b/src/uml/qobjects/qumldestroylinkactionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumldestroylinkactionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlDestroyLinkAction>
 #include <QtUml/QUmlActivity>
@@ -67,16 +68,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlDestroyLinkActionObject::QUmlDestroyLinkActionObject(QUmlDestroyLinkAction *qModelingObject)
+QUmlDestroyLinkActionObject::QUmlDestroyLinkActionObject(QUmlDestroyLinkAction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlDestroyLinkActionObject::~QUmlDestroyLinkActionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -85,25 +88,25 @@ QUmlDestroyLinkActionObject::~QUmlDestroyLinkActionObject()
 const QSet<QObject *> QUmlDestroyLinkActionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDestroyLinkActionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlDestroyLinkActionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -111,62 +114,62 @@ QObject *QUmlDestroyLinkActionObject::owner() const
 const QSet<QObject *> QUmlDestroyLinkActionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlDestroyLinkActionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->name();
 }
 
 QObject *QUmlDestroyLinkActionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlDestroyLinkActionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlDestroyLinkActionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlDestroyLinkActionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlDestroyLinkActionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlDestroyLinkActionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDestroyLinkActionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -174,65 +177,65 @@ const QSet<QObject *> QUmlDestroyLinkActionObject::redefinitionContexts() const
 
 QObject *QUmlDestroyLinkActionObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlDestroyLinkActionObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDestroyLinkActionObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDestroyLinkActionObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlDestroyLinkActionObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlDestroyLinkActionObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDestroyLinkActionObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDestroyLinkActionObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -241,8 +244,8 @@ const QSet<QObject *> QUmlDestroyLinkActionObject::redefinedNodes() const
 const QSet<QObject *> QUmlDestroyLinkActionObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -250,46 +253,46 @@ const QSet<QObject *> QUmlDestroyLinkActionObject::handlers() const
 
 QObject *QUmlDestroyLinkActionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlDestroyLinkActionObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlDestroyLinkActionObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlDestroyLinkActionObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDestroyLinkActionObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlDestroyLinkActionObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -298,8 +301,8 @@ const QList<QObject *> QUmlDestroyLinkActionObject::outputs() const
 const QSet<QObject *> QUmlDestroyLinkActionObject::inputValues() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->inputValues())
-        set.insert(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->inputValues())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -308,8 +311,8 @@ const QSet<QObject *> QUmlDestroyLinkActionObject::inputValues() const
 const QSet<QObject *> QUmlDestroyLinkActionObject::endData() const
 {
     QSet<QObject *> set;
-    foreach (QUmlLinkEndDestructionData *element, qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->endData())
-        set.insert(element->asQObject());
+    foreach (QUmlLinkEndDestructionData *element, qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->endData())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -318,14 +321,14 @@ const QSet<QObject *> QUmlDestroyLinkActionObject::endData() const
 QSet<QObject *> QUmlDestroyLinkActionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDestroyLinkActionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -333,310 +336,382 @@ bool QUmlDestroyLinkActionObject::mustBeOwned() const
 QList<QObject *> QUmlDestroyLinkActionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlDestroyLinkActionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDestroyLinkActionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlDestroyLinkActionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlDestroyLinkActionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlDestroyLinkActionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [LinkAction]
 
 QObject *QUmlDestroyLinkActionObject::association() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->association())
+    if (!qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->association())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->association()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->association()->asQModelingObject();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlDestroyLinkActionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlDestroyLinkActionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlDestroyLinkActionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlDestroyLinkActionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlDestroyLinkActionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlDestroyLinkActionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlDestroyLinkActionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlDestroyLinkActionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->setName(name);
 }
 
 void QUmlDestroyLinkActionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlDestroyLinkActionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlDestroyLinkActionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlDestroyLinkActionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlDestroyLinkActionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlDestroyLinkActionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlDestroyLinkActionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlDestroyLinkActionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlDestroyLinkActionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlDestroyLinkActionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlDestroyLinkActionObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlDestroyLinkActionObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlDestroyLinkActionObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlDestroyLinkActionObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlDestroyLinkActionObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlDestroyLinkActionObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlDestroyLinkActionObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlDestroyLinkActionObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlDestroyLinkActionObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlDestroyLinkActionObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlDestroyLinkActionObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlDestroyLinkActionObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlDestroyLinkActionObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlDestroyLinkActionObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlDestroyLinkActionObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlDestroyLinkActionObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlDestroyLinkActionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlDestroyLinkActionObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlDestroyLinkActionObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlDestroyLinkActionObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlDestroyLinkActionObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlDestroyLinkActionObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlDestroyLinkActionObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlDestroyLinkActionObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlDestroyLinkActionObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlDestroyLinkActionObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlDestroyLinkActionObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [LinkAction]
 
 void QUmlDestroyLinkActionObject::addInputValue(QObject *inputValue)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->addInputValue(qmodelingobjectproperty_cast<QUmlInputPin *>(inputValue));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->addInputValue(qmodelingelementproperty_cast<QUmlInputPin *>(inputValue));
 }
 
 void QUmlDestroyLinkActionObject::removeInputValue(QObject *inputValue)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->removeInputValue(qmodelingobjectproperty_cast<QUmlInputPin *>(inputValue));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->removeInputValue(qmodelingelementproperty_cast<QUmlInputPin *>(inputValue));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [DestroyLinkAction]
 
 void QUmlDestroyLinkActionObject::addEndData(QObject *endData)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->addEndData(qmodelingobjectproperty_cast<QUmlLinkEndDestructionData *>(endData));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->addEndData(qmodelingelementproperty_cast<QUmlLinkEndDestructionData *>(endData));
 }
 
 void QUmlDestroyLinkActionObject::removeEndData(QObject *endData)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyLinkAction *>(this)->removeEndData(qmodelingobjectproperty_cast<QUmlLinkEndDestructionData *>(endData));
+    qmodelingelementproperty_cast<QUmlDestroyLinkAction *>(this)->removeEndData(qmodelingelementproperty_cast<QUmlLinkEndDestructionData *>(endData));
+}
+
+
+void QUmlDestroyLinkActionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlLinkAction");
+    d->groupProperties.insert(QStringLiteral("QUmlLinkAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputValues"))));
+
+    d->propertyGroups << QStringLiteral("QUmlWriteLinkAction");
+
+    d->propertyGroups << QStringLiteral("QUmlDestroyLinkAction");
+    d->groupProperties.insert(QStringLiteral("QUmlDestroyLinkAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("endData"))));
+}
+
+void QUmlDestroyLinkActionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDestroyLinkAction, endData, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDestroyLinkAction, endData, PropertyClassRole, QStringLiteral("QUmlDestroyLinkAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDestroyLinkAction, endData, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDestroyLinkAction, endData, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDestroyLinkAction, endData, DocumentationRole, QStringLiteral("Specifies ends of association and inputs."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDestroyLinkAction, endData, RedefinedPropertiesRole, QStringLiteral("LinkAction-endData"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDestroyLinkAction, endData, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDestroyLinkAction, endData, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumldestroylinkactionobject_p.h b/src/uml/qobjects/qumldestroylinkactionobject_p.h
index 8e85178c..b909ee79 100644
--- a/src/uml/qobjects/qumldestroylinkactionobject_p.h
+++ b/src/uml/qobjects/qumldestroylinkactionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlDestroyLinkAction;
-class Q_UML_EXPORT QUmlDestroyLinkActionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlDestroyLinkActionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlDestroyLinkActionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -104,7 +107,7 @@ class Q_UML_EXPORT QUmlDestroyLinkActionObject : public QObject
     Q_PROPERTY(QSet<QObject *> endData READ endData)
 
 public:
-    Q_INVOKABLE explicit QUmlDestroyLinkActionObject(QUmlDestroyLinkAction *qModelingObject);
+    Q_INVOKABLE explicit QUmlDestroyLinkActionObject(QUmlDestroyLinkAction *qModelingElement);
     virtual ~QUmlDestroyLinkActionObject();
 
     // Owned attributes [Element]
@@ -235,6 +238,10 @@ public Q_SLOTS:
     // Slots for owned attributes [DestroyLinkAction]
     void addEndData(QObject *endData);
     void removeEndData(QObject *endData);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumldestroyobjectactionobject.cpp b/src/uml/qobjects/qumldestroyobjectactionobject.cpp
index a82576dc..60be202b 100644
--- a/src/uml/qobjects/qumldestroyobjectactionobject.cpp
+++ b/src/uml/qobjects/qumldestroyobjectactionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumldestroyobjectactionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlDestroyObjectAction>
 #include <QtUml/QUmlActivity>
@@ -64,16 +65,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlDestroyObjectActionObject::QUmlDestroyObjectActionObject(QUmlDestroyObjectAction *qModelingObject)
+QUmlDestroyObjectActionObject::QUmlDestroyObjectActionObject(QUmlDestroyObjectAction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlDestroyObjectActionObject::~QUmlDestroyObjectActionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -82,25 +85,25 @@ QUmlDestroyObjectActionObject::~QUmlDestroyObjectActionObject()
 const QSet<QObject *> QUmlDestroyObjectActionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDestroyObjectActionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlDestroyObjectActionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -108,62 +111,62 @@ QObject *QUmlDestroyObjectActionObject::owner() const
 const QSet<QObject *> QUmlDestroyObjectActionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlDestroyObjectActionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->name();
 }
 
 QObject *QUmlDestroyObjectActionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlDestroyObjectActionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlDestroyObjectActionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlDestroyObjectActionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlDestroyObjectActionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlDestroyObjectActionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDestroyObjectActionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -171,65 +174,65 @@ const QSet<QObject *> QUmlDestroyObjectActionObject::redefinitionContexts() cons
 
 QObject *QUmlDestroyObjectActionObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlDestroyObjectActionObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDestroyObjectActionObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDestroyObjectActionObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlDestroyObjectActionObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlDestroyObjectActionObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDestroyObjectActionObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDestroyObjectActionObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -238,8 +241,8 @@ const QSet<QObject *> QUmlDestroyObjectActionObject::redefinedNodes() const
 const QSet<QObject *> QUmlDestroyObjectActionObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -247,46 +250,46 @@ const QSet<QObject *> QUmlDestroyObjectActionObject::handlers() const
 
 QObject *QUmlDestroyObjectActionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlDestroyObjectActionObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlDestroyObjectActionObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlDestroyObjectActionObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDestroyObjectActionObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlDestroyObjectActionObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -294,20 +297,20 @@ const QList<QObject *> QUmlDestroyObjectActionObject::outputs() const
 
 bool QUmlDestroyObjectActionObject::isDestroyLinks() const
 {
-    return qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->isDestroyLinks();
+    return qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->isDestroyLinks();
 }
 
 bool QUmlDestroyObjectActionObject::isDestroyOwnedObjects() const
 {
-    return qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->isDestroyOwnedObjects();
+    return qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->isDestroyOwnedObjects();
 }
 
 QObject *QUmlDestroyObjectActionObject::target() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->target())
+    if (!qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->target())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->target()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->target()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -315,14 +318,14 @@ QObject *QUmlDestroyObjectActionObject::target() const
 QSet<QObject *> QUmlDestroyObjectActionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDestroyObjectActionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -330,303 +333,392 @@ bool QUmlDestroyObjectActionObject::mustBeOwned() const
 QList<QObject *> QUmlDestroyObjectActionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlDestroyObjectActionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDestroyObjectActionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlDestroyObjectActionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlDestroyObjectActionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlDestroyObjectActionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlDestroyObjectActionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlDestroyObjectActionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlDestroyObjectActionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlDestroyObjectActionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlDestroyObjectActionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlDestroyObjectActionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlDestroyObjectActionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlDestroyObjectActionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->setName(name);
 }
 
 void QUmlDestroyObjectActionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlDestroyObjectActionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlDestroyObjectActionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlDestroyObjectActionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlDestroyObjectActionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlDestroyObjectActionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlDestroyObjectActionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlDestroyObjectActionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlDestroyObjectActionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlDestroyObjectActionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlDestroyObjectActionObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlDestroyObjectActionObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlDestroyObjectActionObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlDestroyObjectActionObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlDestroyObjectActionObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlDestroyObjectActionObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlDestroyObjectActionObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlDestroyObjectActionObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlDestroyObjectActionObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlDestroyObjectActionObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlDestroyObjectActionObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlDestroyObjectActionObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlDestroyObjectActionObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlDestroyObjectActionObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlDestroyObjectActionObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlDestroyObjectActionObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlDestroyObjectActionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlDestroyObjectActionObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlDestroyObjectActionObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlDestroyObjectActionObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlDestroyObjectActionObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlDestroyObjectActionObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlDestroyObjectActionObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlDestroyObjectActionObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlDestroyObjectActionObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlDestroyObjectActionObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlDestroyObjectActionObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [DestroyObjectAction]
 
 void QUmlDestroyObjectActionObject::setDestroyLinks(bool isDestroyLinks)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->setDestroyLinks(isDestroyLinks);
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->setDestroyLinks(isDestroyLinks);
 }
 
 void QUmlDestroyObjectActionObject::unsetDestroyLinks()
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("destroyLinks"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("destroyLinks"));
 }
 
 void QUmlDestroyObjectActionObject::setDestroyOwnedObjects(bool isDestroyOwnedObjects)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->setDestroyOwnedObjects(isDestroyOwnedObjects);
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->setDestroyOwnedObjects(isDestroyOwnedObjects);
 }
 
 void QUmlDestroyObjectActionObject::unsetDestroyOwnedObjects()
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("destroyOwnedObjects"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("destroyOwnedObjects"));
 }
 
 void QUmlDestroyObjectActionObject::setTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlDestroyObjectAction *>(this)->setTarget(qmodelingobjectproperty_cast<QUmlInputPin *>(target));
+    qmodelingelementproperty_cast<QUmlDestroyObjectAction *>(this)->setTarget(qmodelingelementproperty_cast<QUmlInputPin *>(target));
+}
+
+
+void QUmlDestroyObjectActionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDestroyObjectAction");
+    d->groupProperties.insert(QStringLiteral("QUmlDestroyObjectAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isDestroyLinks"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDestroyObjectAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isDestroyOwnedObjects"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDestroyObjectAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("target"))));
+}
+
+void QUmlDestroyObjectActionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDestroyObjectAction, isDestroyLinks, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDestroyObjectAction, isDestroyLinks, PropertyClassRole, QStringLiteral("QUmlDestroyObjectAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDestroyObjectAction, isDestroyLinks, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDestroyObjectAction, isDestroyLinks, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDestroyObjectAction, isDestroyLinks, DocumentationRole, QStringLiteral("Specifies whether links in which the object participates are destroyed along with the object."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDestroyObjectAction, isDestroyLinks, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDestroyObjectAction, isDestroyLinks, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDestroyObjectAction, isDestroyLinks, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDestroyObjectAction, isDestroyOwnedObjects, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDestroyObjectAction, isDestroyOwnedObjects, PropertyClassRole, QStringLiteral("QUmlDestroyObjectAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDestroyObjectAction, isDestroyOwnedObjects, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDestroyObjectAction, isDestroyOwnedObjects, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDestroyObjectAction, isDestroyOwnedObjects, DocumentationRole, QStringLiteral("Specifies whether objects owned by the object are destroyed along with the object."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDestroyObjectAction, isDestroyOwnedObjects, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDestroyObjectAction, isDestroyOwnedObjects, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDestroyObjectAction, isDestroyOwnedObjects, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDestroyObjectAction, target, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDestroyObjectAction, target, PropertyClassRole, QStringLiteral("QUmlDestroyObjectAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDestroyObjectAction, target, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDestroyObjectAction, target, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDestroyObjectAction, target, DocumentationRole, QStringLiteral("The input pin providing the object to be destroyed."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDestroyObjectAction, target, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDestroyObjectAction, target, SubsettedPropertiesRole, QStringLiteral("Action-input"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDestroyObjectAction, target, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumldestroyobjectactionobject_p.h b/src/uml/qobjects/qumldestroyobjectactionobject_p.h
index 1a66d7fa..49a19d2a 100644
--- a/src/uml/qobjects/qumldestroyobjectactionobject_p.h
+++ b/src/uml/qobjects/qumldestroyobjectactionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlDestroyObjectAction;
-class Q_UML_EXPORT QUmlDestroyObjectActionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlDestroyObjectActionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlDestroyObjectActionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -103,7 +106,7 @@ class Q_UML_EXPORT QUmlDestroyObjectActionObject : public QObject
     Q_PROPERTY(QObject * target READ target WRITE setTarget)
 
 public:
-    Q_INVOKABLE explicit QUmlDestroyObjectActionObject(QUmlDestroyObjectAction *qModelingObject);
+    Q_INVOKABLE explicit QUmlDestroyObjectActionObject(QUmlDestroyObjectAction *qModelingElement);
     virtual ~QUmlDestroyObjectActionObject();
 
     // Owned attributes [Element]
@@ -229,6 +232,10 @@ public Q_SLOTS:
     void setDestroyOwnedObjects(bool isDestroyOwnedObjects);
     void unsetDestroyOwnedObjects();
     void setTarget(QObject *target = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumldestructionoccurrencespecificationobject.cpp b/src/uml/qobjects/qumldestructionoccurrencespecificationobject.cpp
index 4132ed40..7745e6a0 100644
--- a/src/uml/qobjects/qumldestructionoccurrencespecificationobject.cpp
+++ b/src/uml/qobjects/qumldestructionoccurrencespecificationobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumldestructionoccurrencespecificationobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlDestructionOccurrenceSpecification>
 #include <QtUml/QUmlComment>
@@ -56,16 +57,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlDestructionOccurrenceSpecificationObject::QUmlDestructionOccurrenceSpecificationObject(QUmlDestructionOccurrenceSpecification *qModelingObject)
+QUmlDestructionOccurrenceSpecificationObject::QUmlDestructionOccurrenceSpecificationObject(QUmlDestructionOccurrenceSpecification *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlDestructionOccurrenceSpecificationObject::~QUmlDestructionOccurrenceSpecificationObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -74,25 +77,25 @@ QUmlDestructionOccurrenceSpecificationObject::~QUmlDestructionOccurrenceSpecific
 const QSet<QObject *> QUmlDestructionOccurrenceSpecificationObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDestructionOccurrenceSpecificationObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlDestructionOccurrenceSpecificationObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -100,65 +103,65 @@ QObject *QUmlDestructionOccurrenceSpecificationObject::owner() const
 const QSet<QObject *> QUmlDestructionOccurrenceSpecificationObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlDestructionOccurrenceSpecificationObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->name();
 }
 
 QObject *QUmlDestructionOccurrenceSpecificationObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlDestructionOccurrenceSpecificationObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlDestructionOccurrenceSpecificationObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlDestructionOccurrenceSpecificationObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [InteractionFragment]
 
 QObject *QUmlDestructionOccurrenceSpecificationObject::enclosingInteraction() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->enclosingInteraction())
+    if (!qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->enclosingInteraction())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->enclosingInteraction()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->enclosingInteraction()->asQModelingObject();
 }
 
 QObject *QUmlDestructionOccurrenceSpecificationObject::enclosingOperand() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->enclosingOperand())
+    if (!qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->enclosingOperand())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->enclosingOperand()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->enclosingOperand()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlDestructionOccurrenceSpecificationObject::generalOrderings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralOrdering *element, qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->generalOrderings())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralOrdering *element, qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->generalOrderings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -166,25 +169,25 @@ const QSet<QObject *> QUmlDestructionOccurrenceSpecificationObject::generalOrder
 
 QObject *QUmlDestructionOccurrenceSpecificationObject::covered() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->covered())
+    if (!qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->covered())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->covered()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->covered()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlDestructionOccurrenceSpecificationObject::toAfters() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralOrdering *element, qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->toAfters())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralOrdering *element, qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->toAfters())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDestructionOccurrenceSpecificationObject::toBefores() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralOrdering *element, qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->toBefores())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralOrdering *element, qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->toBefores())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -192,10 +195,10 @@ const QSet<QObject *> QUmlDestructionOccurrenceSpecificationObject::toBefores()
 
 QObject *QUmlDestructionOccurrenceSpecificationObject::message() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->message())
+    if (!qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->message())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->message()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->message()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -203,14 +206,14 @@ QObject *QUmlDestructionOccurrenceSpecificationObject::message() const
 QSet<QObject *> QUmlDestructionOccurrenceSpecificationObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDestructionOccurrenceSpecificationObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -218,147 +221,191 @@ bool QUmlDestructionOccurrenceSpecificationObject::mustBeOwned() const
 QList<QObject *> QUmlDestructionOccurrenceSpecificationObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlDestructionOccurrenceSpecificationObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDestructionOccurrenceSpecificationObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlDestructionOccurrenceSpecificationObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlDestructionOccurrenceSpecificationObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlDestructionOccurrenceSpecificationObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlDestructionOccurrenceSpecificationObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlDestructionOccurrenceSpecificationObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlDestructionOccurrenceSpecificationObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlDestructionOccurrenceSpecificationObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlDestructionOccurrenceSpecificationObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlDestructionOccurrenceSpecificationObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->setName(name);
 }
 
 void QUmlDestructionOccurrenceSpecificationObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlDestructionOccurrenceSpecificationObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlDestructionOccurrenceSpecificationObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlDestructionOccurrenceSpecificationObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [InteractionFragment]
 
 void QUmlDestructionOccurrenceSpecificationObject::setEnclosingInteraction(QObject *enclosingInteraction)
 {
-    qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->setEnclosingInteraction(qmodelingobjectproperty_cast<QUmlInteraction *>(enclosingInteraction));
+    qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->setEnclosingInteraction(qmodelingelementproperty_cast<QUmlInteraction *>(enclosingInteraction));
 }
 
 void QUmlDestructionOccurrenceSpecificationObject::setEnclosingOperand(QObject *enclosingOperand)
 {
-    qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->setEnclosingOperand(qmodelingobjectproperty_cast<QUmlInteractionOperand *>(enclosingOperand));
+    qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->setEnclosingOperand(qmodelingelementproperty_cast<QUmlInteractionOperand *>(enclosingOperand));
 }
 
 void QUmlDestructionOccurrenceSpecificationObject::addGeneralOrdering(QObject *generalOrdering)
 {
-    qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->addGeneralOrdering(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
+    qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->addGeneralOrdering(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
 }
 
 void QUmlDestructionOccurrenceSpecificationObject::removeGeneralOrdering(QObject *generalOrdering)
 {
-    qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->removeGeneralOrdering(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
+    qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->removeGeneralOrdering(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [OccurrenceSpecification]
 
 void QUmlDestructionOccurrenceSpecificationObject::setCovered(QObject *covered)
 {
-    qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->setCovered(qmodelingobjectproperty_cast<QUmlLifeline *>(covered));
+    qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->setCovered(qmodelingelementproperty_cast<QUmlLifeline *>(covered));
 }
 
 void QUmlDestructionOccurrenceSpecificationObject::addToAfter(QObject *toAfter)
 {
-    qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->addToAfter(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(toAfter));
+    qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->addToAfter(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(toAfter));
 }
 
 void QUmlDestructionOccurrenceSpecificationObject::removeToAfter(QObject *toAfter)
 {
-    qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->removeToAfter(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(toAfter));
+    qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->removeToAfter(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(toAfter));
 }
 
 void QUmlDestructionOccurrenceSpecificationObject::addToBefore(QObject *toBefore)
 {
-    qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->addToBefore(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(toBefore));
+    qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->addToBefore(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(toBefore));
 }
 
 void QUmlDestructionOccurrenceSpecificationObject::removeToBefore(QObject *toBefore)
 {
-    qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->removeToBefore(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(toBefore));
+    qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->removeToBefore(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(toBefore));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [MessageEnd]
 
 void QUmlDestructionOccurrenceSpecificationObject::setMessage(QObject *message)
 {
-    qmodelingobjectproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->setMessage(qmodelingobjectproperty_cast<QUmlMessage *>(message));
+    qmodelingelementproperty_cast<QUmlDestructionOccurrenceSpecification *>(this)->setMessage(qmodelingelementproperty_cast<QUmlMessage *>(message));
+}
+
+
+void QUmlDestructionOccurrenceSpecificationObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlInteractionFragment");
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingInteraction"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingOperand"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalOrderings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlOccurrenceSpecification");
+    d->groupProperties.insert(QStringLiteral("QUmlOccurrenceSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("covered"))));
+    d->groupProperties.insert(QStringLiteral("QUmlOccurrenceSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("toAfters"))));
+    d->groupProperties.insert(QStringLiteral("QUmlOccurrenceSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("toBefores"))));
+
+    d->propertyGroups << QStringLiteral("QUmlMessageEnd");
+    d->groupProperties.insert(QStringLiteral("QUmlMessageEnd"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("message"))));
+
+    d->propertyGroups << QStringLiteral("QUmlMessageOccurrenceSpecification");
+
+    d->propertyGroups << QStringLiteral("QUmlDestructionOccurrenceSpecification");
+}
+
+void QUmlDestructionOccurrenceSpecificationObject::setPropertyData()
+{
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumldestructionoccurrencespecificationobject_p.h b/src/uml/qobjects/qumldestructionoccurrencespecificationobject_p.h
index 833914ed..ead64e3c 100644
--- a/src/uml/qobjects/qumldestructionoccurrencespecificationobject_p.h
+++ b/src/uml/qobjects/qumldestructionoccurrencespecificationobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlDestructionOccurrenceSpecification;
-class Q_UML_EXPORT QUmlDestructionOccurrenceSpecificationObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlDestructionOccurrenceSpecificationObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlDestructionOccurrenceSpecificationObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -85,7 +88,7 @@ class Q_UML_EXPORT QUmlDestructionOccurrenceSpecificationObject : public QObject
     Q_PROPERTY(QObject * message READ message WRITE setMessage)
 
 public:
-    Q_INVOKABLE explicit QUmlDestructionOccurrenceSpecificationObject(QUmlDestructionOccurrenceSpecification *qModelingObject);
+    Q_INVOKABLE explicit QUmlDestructionOccurrenceSpecificationObject(QUmlDestructionOccurrenceSpecification *qModelingElement);
     virtual ~QUmlDestructionOccurrenceSpecificationObject();
 
     // Owned attributes [Element]
@@ -157,6 +160,10 @@ public Q_SLOTS:
 
     // Slots for owned attributes [MessageEnd]
     void setMessage(QObject *message = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumldeviceobject.cpp b/src/uml/qobjects/qumldeviceobject.cpp
index 1624129c..5b34d7c7 100644
--- a/src/uml/qobjects/qumldeviceobject.cpp
+++ b/src/uml/qobjects/qumldeviceobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumldeviceobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlDevice>
 #include <QtUml/QUmlBehavior>
@@ -82,16 +83,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlDeviceObject::QUmlDeviceObject(QUmlDevice *qModelingObject)
+QUmlDeviceObject::QUmlDeviceObject(QUmlDevice *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlDeviceObject::~QUmlDeviceObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlDevice *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlDevice *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -100,25 +103,25 @@ QUmlDeviceObject::~QUmlDeviceObject()
 const QSet<QObject *> QUmlDeviceObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDeviceObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlDeviceObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDevice *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlDevice *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDevice *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDevice *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -126,35 +129,35 @@ QObject *QUmlDeviceObject::owner() const
 const QSet<QObject *> QUmlDeviceObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlDeviceObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlDevice *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlDevice *>(this)->name();
 }
 
 QObject *QUmlDeviceObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDevice *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlDevice *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDevice *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDevice *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlDeviceObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDevice *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlDevice *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDevice *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDevice *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlDeviceObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlDevice *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlDevice *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [Namespace]
@@ -162,48 +165,48 @@ QString QUmlDeviceObject::qualifiedName() const
 const QSet<QObject *> QUmlDeviceObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDeviceObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDeviceObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDeviceObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDeviceObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDeviceObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -211,49 +214,49 @@ const QSet<QObject *> QUmlDeviceObject::packageImports() const
 
 QObject *QUmlDeviceObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDevice *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlDevice *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDevice *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDevice *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlDeviceObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlDevice *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlDevice *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Type]
 
 QObject *QUmlDeviceObject::package() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDevice *>(this)->package())
+    if (!qmodelingelementproperty_cast<QUmlDevice *>(this)->package())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDevice *>(this)->package()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDevice *>(this)->package()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlDeviceObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlDevice *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlDevice *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlDeviceObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDeviceObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -262,8 +265,8 @@ const QSet<QObject *> QUmlDeviceObject::redefinitionContexts() const
 const QSet<QObject *> QUmlDeviceObject::templateBindings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTemplateBinding *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->templateBindings())
-        set.insert(element->asQObject());
+    foreach (QUmlTemplateBinding *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->templateBindings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -272,109 +275,109 @@ const QSet<QObject *> QUmlDeviceObject::templateBindings() const
 const QSet<QObject *> QUmlDeviceObject::attributes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->attributes())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->attributes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDeviceObject::collaborationUses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlCollaborationUse *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->collaborationUses())
-        set.insert(element->asQObject());
+    foreach (QUmlCollaborationUse *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->collaborationUses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDeviceObject::features() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->features())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->features())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDeviceObject::generalizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralization *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->generalizations())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralization *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->generalizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDeviceObject::inheritedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->inheritedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->inheritedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDeviceObject::isFinalSpecialization() const
 {
-    return qmodelingobjectproperty_cast<QUmlDevice *>(this)->isFinalSpecialization();
+    return qmodelingelementproperty_cast<QUmlDevice *>(this)->isFinalSpecialization();
 }
 
 QObject *QUmlDeviceObject::ownedTemplateSignature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDevice *>(this)->ownedTemplateSignature())
+    if (!qmodelingelementproperty_cast<QUmlDevice *>(this)->ownedTemplateSignature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDevice *>(this)->ownedTemplateSignature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDevice *>(this)->ownedTemplateSignature()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlDeviceObject::ownedUseCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->ownedUseCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->ownedUseCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDeviceObject::powertypeExtents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralizationSet *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->powertypeExtents())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralizationSet *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->powertypeExtents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDeviceObject::redefinedClassifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->redefinedClassifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->redefinedClassifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlDeviceObject::representation() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDevice *>(this)->representation())
+    if (!qmodelingelementproperty_cast<QUmlDevice *>(this)->representation())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDevice *>(this)->representation()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDevice *>(this)->representation()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlDeviceObject::substitutions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlSubstitution *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->substitutions())
-        set.insert(element->asQObject());
+    foreach (QUmlSubstitution *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->substitutions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlDeviceObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDevice *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlDevice *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDevice *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDevice *>(this)->templateParameter()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlDeviceObject::useCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->useCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->useCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -383,24 +386,24 @@ const QSet<QObject *> QUmlDeviceObject::useCases() const
 const QSet<QObject *> QUmlDeviceObject::ownedConnectors() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConnector *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->ownedConnectors())
-        set.insert(element->asQObject());
+    foreach (QUmlConnector *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->ownedConnectors())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDeviceObject::parts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->parts())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->parts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDeviceObject::roles() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConnectableElement *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->roles())
-        set.insert(element->asQObject());
+    foreach (QUmlConnectableElement *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->roles())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -409,8 +412,8 @@ const QSet<QObject *> QUmlDeviceObject::roles() const
 const QSet<QObject *> QUmlDeviceObject::ownedPorts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPort *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->ownedPorts())
-        set.insert(element->asQObject());
+    foreach (QUmlPort *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->ownedPorts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -418,25 +421,25 @@ const QSet<QObject *> QUmlDeviceObject::ownedPorts() const
 
 QObject *QUmlDeviceObject::classifierBehavior() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDevice *>(this)->classifierBehavior())
+    if (!qmodelingelementproperty_cast<QUmlDevice *>(this)->classifierBehavior())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDevice *>(this)->classifierBehavior()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDevice *>(this)->classifierBehavior()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlDeviceObject::interfaceRealizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterfaceRealization *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->interfaceRealizations())
-        set.insert(element->asQObject());
+    foreach (QUmlInterfaceRealization *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->interfaceRealizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDeviceObject::ownedBehaviors() const
 {
     QSet<QObject *> set;
-    foreach (QUmlBehavior *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->ownedBehaviors())
-        set.insert(element->asQObject());
+    foreach (QUmlBehavior *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->ownedBehaviors())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -445,58 +448,58 @@ const QSet<QObject *> QUmlDeviceObject::ownedBehaviors() const
 const QSet<QObject *> QUmlDeviceObject::extensions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExtension *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->extensions())
-        set.insert(element->asQObject());
+    foreach (QUmlExtension *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->extensions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDeviceObject::isAbstract() const
 {
-    return qmodelingobjectproperty_cast<QUmlDevice *>(this)->isAbstract();
+    return qmodelingelementproperty_cast<QUmlDevice *>(this)->isAbstract();
 }
 
 bool QUmlDeviceObject::isActive() const
 {
-    return qmodelingobjectproperty_cast<QUmlDevice *>(this)->isActive();
+    return qmodelingelementproperty_cast<QUmlDevice *>(this)->isActive();
 }
 
 const QList<QObject *> QUmlDeviceObject::nestedClassifiers() const
 {
     QList<QObject *> list;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->nestedClassifiers())
-        list.append(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->nestedClassifiers())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QList<QObject *> QUmlDeviceObject::ownedAttributes() const
 {
     QList<QObject *> list;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->ownedAttributes())
-        list.append(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->ownedAttributes())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QList<QObject *> QUmlDeviceObject::ownedOperations() const
 {
     QList<QObject *> list;
-    foreach (QUmlOperation *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->ownedOperations())
-        list.append(element->asQObject());
+    foreach (QUmlOperation *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->ownedOperations())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QSet<QObject *> QUmlDeviceObject::ownedReceptions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlReception *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->ownedReceptions())
-        set.insert(element->asQObject());
+    foreach (QUmlReception *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->ownedReceptions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDeviceObject::superClasses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClass *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->superClasses())
-        set.insert(element->asQObject());
+    foreach (QUmlClass *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->superClasses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -505,16 +508,16 @@ const QSet<QObject *> QUmlDeviceObject::superClasses() const
 const QSet<QObject *> QUmlDeviceObject::deployedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->deployedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->deployedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDeviceObject::deployments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDeployment *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->deployments())
-        set.insert(element->asQObject());
+    foreach (QUmlDeployment *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->deployments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -523,8 +526,8 @@ const QSet<QObject *> QUmlDeviceObject::deployments() const
 const QSet<QObject *> QUmlDeviceObject::nestedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNode *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->nestedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlNode *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->nestedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -533,14 +536,14 @@ const QSet<QObject *> QUmlDeviceObject::nestedNodes() const
 QSet<QObject *> QUmlDeviceObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDeviceObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlDevice *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlDevice *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -548,27 +551,27 @@ bool QUmlDeviceObject::mustBeOwned() const
 QList<QObject *> QUmlDeviceObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlDeviceObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDeviceObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlDevice *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlDevice *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlDeviceObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlDevice *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlDevice *>(this)->separator();
 }
 
 // OPERATIONS [Namespace]
@@ -577,44 +580,44 @@ QSet<QObject *> QUmlDeviceObject::excludeCollisions(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlDeviceObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlDevice *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlDevice *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlDeviceObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDeviceObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlDevice *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlDevice *>(this)->membersAreDistinguishable();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlDeviceObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlDevice *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlDevice *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlDeviceObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlDevice *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlDevice *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [Type]
@@ -622,12 +625,12 @@ bool QUmlDeviceObject::isTemplateParameter() const
 
 bool QUmlDeviceObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlDevice *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlDevice *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlDeviceObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlDevice *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlDevice *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [TemplateableElement]
@@ -635,8 +638,8 @@ bool QUmlDeviceObject::isRedefinitionContextValid(QObject *redefined) const
 QSet<QObject *> QUmlDeviceObject::parameterableElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterableElement *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->parameterableElements())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterableElement *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->parameterableElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -645,52 +648,52 @@ QSet<QObject *> QUmlDeviceObject::parameterableElements() const
 QSet<QObject *> QUmlDeviceObject::allFeatures() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->allFeatures())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->allFeatures())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlDeviceObject::allParents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->allParents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->allParents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDeviceObject::conformsTo(QObject *other) const
 {
-    return qmodelingobjectproperty_cast<QUmlDevice *>(this)->conformsTo(qmodelingobjectproperty_cast<QUmlClassifier *>(other));
+    return qmodelingelementproperty_cast<QUmlDevice *>(this)->conformsTo(qmodelingelementproperty_cast<QUmlClassifier *>(other));
 }
 
 bool QUmlDeviceObject::hasVisibilityOf(QObject *n) const
 {
-    return qmodelingobjectproperty_cast<QUmlDevice *>(this)->hasVisibilityOf(qmodelingobjectproperty_cast<QUmlNamedElement *>(n));
+    return qmodelingelementproperty_cast<QUmlDevice *>(this)->hasVisibilityOf(qmodelingelementproperty_cast<QUmlNamedElement *>(n));
 }
 
 QSet<QObject *> QUmlDeviceObject::inheritableMembers(QObject *c) const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->inheritableMembers(qmodelingobjectproperty_cast<QUmlClassifier *>(c)))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->inheritableMembers(qmodelingelementproperty_cast<QUmlClassifier *>(c)))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDeviceObject::isTemplate() const
 {
-    return qmodelingobjectproperty_cast<QUmlDevice *>(this)->isTemplate();
+    return qmodelingelementproperty_cast<QUmlDevice *>(this)->isTemplate();
 }
 
 bool QUmlDeviceObject::maySpecializeType(QObject *c) const
 {
-    return qmodelingobjectproperty_cast<QUmlDevice *>(this)->maySpecializeType(qmodelingobjectproperty_cast<QUmlClassifier *>(c));
+    return qmodelingelementproperty_cast<QUmlDevice *>(this)->maySpecializeType(qmodelingelementproperty_cast<QUmlClassifier *>(c));
 }
 
 QSet<QObject *> QUmlDeviceObject::parents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->parents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->parents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -700,10 +703,10 @@ QSet<QObject *> QUmlDeviceObject::inherit(QSet<QObject *> inhs) const
 {
     QSet<QUmlNamedElement *> inhsConverted;
     foreach (QObject *object, inhs)
-        inhsConverted.insert(qmodelingobjectproperty_cast<QUmlNamedElement *>(object));
+        inhsConverted.insert(qmodelingelementproperty_cast<QUmlNamedElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlDevice *>(this)->inherit(inhsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlDevice *>(this)->inherit(inhsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -711,503 +714,607 @@ QSet<QObject *> QUmlDeviceObject::inherit(QSet<QObject *> inhs) const
 
 void QUmlDeviceObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlDeviceObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlDeviceObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlDeviceObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlDeviceObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlDeviceObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlDeviceObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlDeviceObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->setName(name);
 }
 
 void QUmlDeviceObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlDeviceObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlDeviceObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlDeviceObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlDeviceObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlDeviceObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlDeviceObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlDeviceObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlDeviceObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlDeviceObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlDeviceObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlDeviceObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlDeviceObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlDeviceObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlDeviceObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlDeviceObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlDeviceObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->setVisibility(visibility);
 }
 
 void QUmlDeviceObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Type]
 
 void QUmlDeviceObject::setPackage(QObject *package)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->setPackage(qmodelingobjectproperty_cast<QUmlPackage *>(package));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->setPackage(qmodelingelementproperty_cast<QUmlPackage *>(package));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlDeviceObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlDeviceObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlDeviceObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlDeviceObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlDeviceObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlDeviceObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateableElement]
 
 void QUmlDeviceObject::addTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->addTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->addTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 void QUmlDeviceObject::removeTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->removeTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->removeTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Classifier]
 
 void QUmlDeviceObject::addAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->addAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->addAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlDeviceObject::removeAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->removeAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->removeAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlDeviceObject::addCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->addCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->addCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlDeviceObject::removeCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->removeCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->removeCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlDeviceObject::addFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->addFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->addFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlDeviceObject::removeFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->removeFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->removeFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlDeviceObject::addGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->addGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->addGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlDeviceObject::removeGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->removeGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->removeGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlDeviceObject::addInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->addInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->addInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlDeviceObject::removeInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->removeInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->removeInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlDeviceObject::setFinalSpecialization(bool isFinalSpecialization)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->setFinalSpecialization(isFinalSpecialization);
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->setFinalSpecialization(isFinalSpecialization);
 }
 
 void QUmlDeviceObject::unsetFinalSpecialization()
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("finalSpecialization"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
 void QUmlDeviceObject::setOwnedTemplateSignature(QObject *ownedTemplateSignature)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->setOwnedTemplateSignature(qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->setOwnedTemplateSignature(qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
 }
 
 void QUmlDeviceObject::addOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->addOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->addOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlDeviceObject::removeOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->removeOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->removeOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlDeviceObject::addPowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->addPowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->addPowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlDeviceObject::removePowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->removePowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->removePowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlDeviceObject::addRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->addRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->addRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlDeviceObject::removeRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->removeRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->removeRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlDeviceObject::setRepresentation(QObject *representation)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->setRepresentation(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(representation));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->setRepresentation(qmodelingelementproperty_cast<QUmlCollaborationUse *>(representation));
 }
 
 void QUmlDeviceObject::addSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->addSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->addSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlDeviceObject::removeSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->removeSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->removeSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlDeviceObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
 }
 
 void QUmlDeviceObject::addUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->addUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->addUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 void QUmlDeviceObject::removeUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->removeUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->removeUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [StructuredClassifier]
 
 void QUmlDeviceObject::addOwnedConnector(QObject *ownedConnector)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->addOwnedConnector(qmodelingobjectproperty_cast<QUmlConnector *>(ownedConnector));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->addOwnedConnector(qmodelingelementproperty_cast<QUmlConnector *>(ownedConnector));
 }
 
 void QUmlDeviceObject::removeOwnedConnector(QObject *ownedConnector)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->removeOwnedConnector(qmodelingobjectproperty_cast<QUmlConnector *>(ownedConnector));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->removeOwnedConnector(qmodelingelementproperty_cast<QUmlConnector *>(ownedConnector));
 }
 
 void QUmlDeviceObject::addPart(QObject *part)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->addPart(qmodelingobjectproperty_cast<QUmlProperty *>(part));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->addPart(qmodelingelementproperty_cast<QUmlProperty *>(part));
 }
 
 void QUmlDeviceObject::removePart(QObject *part)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->removePart(qmodelingobjectproperty_cast<QUmlProperty *>(part));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->removePart(qmodelingelementproperty_cast<QUmlProperty *>(part));
 }
 
 void QUmlDeviceObject::addRole(QObject *role)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->addRole(qmodelingobjectproperty_cast<QUmlConnectableElement *>(role));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->addRole(qmodelingelementproperty_cast<QUmlConnectableElement *>(role));
 }
 
 void QUmlDeviceObject::removeRole(QObject *role)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->removeRole(qmodelingobjectproperty_cast<QUmlConnectableElement *>(role));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->removeRole(qmodelingelementproperty_cast<QUmlConnectableElement *>(role));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [EncapsulatedClassifier]
 
 void QUmlDeviceObject::addOwnedPort(QObject *ownedPort)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->addOwnedPort(qmodelingobjectproperty_cast<QUmlPort *>(ownedPort));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->addOwnedPort(qmodelingelementproperty_cast<QUmlPort *>(ownedPort));
 }
 
 void QUmlDeviceObject::removeOwnedPort(QObject *ownedPort)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->removeOwnedPort(qmodelingobjectproperty_cast<QUmlPort *>(ownedPort));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->removeOwnedPort(qmodelingelementproperty_cast<QUmlPort *>(ownedPort));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [BehavioredClassifier]
 
 void QUmlDeviceObject::setClassifierBehavior(QObject *classifierBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->setClassifierBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(classifierBehavior));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->setClassifierBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(classifierBehavior));
 }
 
 void QUmlDeviceObject::addInterfaceRealization(QObject *interfaceRealization)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->addInterfaceRealization(qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->addInterfaceRealization(qmodelingelementproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
 }
 
 void QUmlDeviceObject::removeInterfaceRealization(QObject *interfaceRealization)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->removeInterfaceRealization(qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->removeInterfaceRealization(qmodelingelementproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
 }
 
 void QUmlDeviceObject::addOwnedBehavior(QObject *ownedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->addOwnedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(ownedBehavior));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->addOwnedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(ownedBehavior));
 }
 
 void QUmlDeviceObject::removeOwnedBehavior(QObject *ownedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->removeOwnedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(ownedBehavior));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->removeOwnedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(ownedBehavior));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Class]
 
 void QUmlDeviceObject::addExtension(QObject *extension)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->addExtension(qmodelingobjectproperty_cast<QUmlExtension *>(extension));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->addExtension(qmodelingelementproperty_cast<QUmlExtension *>(extension));
 }
 
 void QUmlDeviceObject::removeExtension(QObject *extension)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->removeExtension(qmodelingobjectproperty_cast<QUmlExtension *>(extension));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->removeExtension(qmodelingelementproperty_cast<QUmlExtension *>(extension));
 }
 
 void QUmlDeviceObject::setAbstract(bool isAbstract)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->setAbstract(isAbstract);
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->setAbstract(isAbstract);
 }
 
 void QUmlDeviceObject::unsetAbstract()
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("abstract"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
 void QUmlDeviceObject::setActive(bool isActive)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->setActive(isActive);
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->setActive(isActive);
 }
 
 void QUmlDeviceObject::unsetActive()
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("active"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("active"));
 }
 
 void QUmlDeviceObject::addNestedClassifier(QObject *nestedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->addNestedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(nestedClassifier));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->addNestedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(nestedClassifier));
 }
 
 void QUmlDeviceObject::removeNestedClassifier(QObject *nestedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->removeNestedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(nestedClassifier));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->removeNestedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(nestedClassifier));
 }
 
 void QUmlDeviceObject::addOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->addOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->addOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlDeviceObject::removeOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->removeOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->removeOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlDeviceObject::addOwnedOperation(QObject *ownedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->addOwnedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(ownedOperation));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->addOwnedOperation(qmodelingelementproperty_cast<QUmlOperation *>(ownedOperation));
 }
 
 void QUmlDeviceObject::removeOwnedOperation(QObject *ownedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->removeOwnedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(ownedOperation));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->removeOwnedOperation(qmodelingelementproperty_cast<QUmlOperation *>(ownedOperation));
 }
 
 void QUmlDeviceObject::addOwnedReception(QObject *ownedReception)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->addOwnedReception(qmodelingobjectproperty_cast<QUmlReception *>(ownedReception));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->addOwnedReception(qmodelingelementproperty_cast<QUmlReception *>(ownedReception));
 }
 
 void QUmlDeviceObject::removeOwnedReception(QObject *ownedReception)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->removeOwnedReception(qmodelingobjectproperty_cast<QUmlReception *>(ownedReception));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->removeOwnedReception(qmodelingelementproperty_cast<QUmlReception *>(ownedReception));
 }
 
 void QUmlDeviceObject::addSuperClass(QObject *superClass)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->addSuperClass(qmodelingobjectproperty_cast<QUmlClass *>(superClass));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->addSuperClass(qmodelingelementproperty_cast<QUmlClass *>(superClass));
 }
 
 void QUmlDeviceObject::removeSuperClass(QObject *superClass)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->removeSuperClass(qmodelingobjectproperty_cast<QUmlClass *>(superClass));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->removeSuperClass(qmodelingelementproperty_cast<QUmlClass *>(superClass));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [DeploymentTarget]
 
 void QUmlDeviceObject::addDeployedElement(QObject *deployedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->addDeployedElement(qmodelingobjectproperty_cast<QUmlPackageableElement *>(deployedElement));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->addDeployedElement(qmodelingelementproperty_cast<QUmlPackageableElement *>(deployedElement));
 }
 
 void QUmlDeviceObject::removeDeployedElement(QObject *deployedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->removeDeployedElement(qmodelingobjectproperty_cast<QUmlPackageableElement *>(deployedElement));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->removeDeployedElement(qmodelingelementproperty_cast<QUmlPackageableElement *>(deployedElement));
 }
 
 void QUmlDeviceObject::addDeployment(QObject *deployment)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->addDeployment(qmodelingobjectproperty_cast<QUmlDeployment *>(deployment));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->addDeployment(qmodelingelementproperty_cast<QUmlDeployment *>(deployment));
 }
 
 void QUmlDeviceObject::removeDeployment(QObject *deployment)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->removeDeployment(qmodelingobjectproperty_cast<QUmlDeployment *>(deployment));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->removeDeployment(qmodelingelementproperty_cast<QUmlDeployment *>(deployment));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Node]
 
 void QUmlDeviceObject::addNestedNode(QObject *nestedNode)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->addNestedNode(qmodelingobjectproperty_cast<QUmlNode *>(nestedNode));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->addNestedNode(qmodelingelementproperty_cast<QUmlNode *>(nestedNode));
 }
 
 void QUmlDeviceObject::removeNestedNode(QObject *nestedNode)
 {
-    qmodelingobjectproperty_cast<QUmlDevice *>(this)->removeNestedNode(qmodelingobjectproperty_cast<QUmlNode *>(nestedNode));
+    qmodelingelementproperty_cast<QUmlDevice *>(this)->removeNestedNode(qmodelingelementproperty_cast<QUmlNode *>(nestedNode));
+}
+
+
+void QUmlDeviceObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlType");
+    d->groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
+
+    d->propertyGroups << QStringLiteral("QUmlStructuredClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedConnectors"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parts"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("roles"))));
+
+    d->propertyGroups << QStringLiteral("QUmlEncapsulatedClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlEncapsulatedClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedPorts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlBehavioredClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifierBehavior"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interfaceRealizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedBehaviors"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClass");
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extensions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isActive"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedReceptions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superClasses"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDeploymentTarget");
+    d->groupProperties.insert(QStringLiteral("QUmlDeploymentTarget"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deployedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDeploymentTarget"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deployments"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNode");
+    d->groupProperties.insert(QStringLiteral("QUmlNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDevice");
+}
+
+void QUmlDeviceObject::setPropertyData()
+{
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumldeviceobject_p.h b/src/uml/qobjects/qumldeviceobject_p.h
index 0ecde8f1..3a4821cc 100644
--- a/src/uml/qobjects/qumldeviceobject_p.h
+++ b/src/uml/qobjects/qumldeviceobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlDevice;
-class Q_UML_EXPORT QUmlDeviceObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlDeviceObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlDeviceObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -142,7 +145,7 @@ class Q_UML_EXPORT QUmlDeviceObject : public QObject
     Q_PROPERTY(QSet<QObject *> nestedNodes READ nestedNodes)
 
 public:
-    Q_INVOKABLE explicit QUmlDeviceObject(QUmlDevice *qModelingObject);
+    Q_INVOKABLE explicit QUmlDeviceObject(QUmlDevice *qModelingElement);
     virtual ~QUmlDeviceObject();
 
     // Owned attributes [Element]
@@ -396,6 +399,10 @@ public Q_SLOTS:
     // Slots for owned attributes [Node]
     void addNestedNode(QObject *nestedNode);
     void removeNestedNode(QObject *nestedNode);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumldurationconstraintobject.cpp b/src/uml/qobjects/qumldurationconstraintobject.cpp
index d176117d..10cad441 100644
--- a/src/uml/qobjects/qumldurationconstraintobject.cpp
+++ b/src/uml/qobjects/qumldurationconstraintobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumldurationconstraintobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlDurationConstraint>
 #include <QtUml/QUmlComment>
@@ -56,16 +57,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlDurationConstraintObject::QUmlDurationConstraintObject(QUmlDurationConstraint *qModelingObject)
+QUmlDurationConstraintObject::QUmlDurationConstraintObject(QUmlDurationConstraint *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlDurationConstraintObject::~QUmlDurationConstraintObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -74,43 +77,43 @@ QUmlDurationConstraintObject::~QUmlDurationConstraintObject()
 const QSet<QObject *> QUmlDurationConstraintObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDurationConstraintObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlDurationConstraintObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlDurationConstraintObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlDurationConstraintObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -118,42 +121,42 @@ QObject *QUmlDurationConstraintObject::templateParameter() const
 const QSet<QObject *> QUmlDurationConstraintObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlDurationConstraintObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->name();
 }
 
 QObject *QUmlDurationConstraintObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlDurationConstraintObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlDurationConstraintObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlDurationConstraintObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Constraint]
@@ -161,32 +164,32 @@ QtUml::VisibilityKind QUmlDurationConstraintObject::visibility() const
 const QList<QObject *> QUmlDurationConstraintObject::constrainedElements() const
 {
     QList<QObject *> list;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->constrainedElements())
-        list.append(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->constrainedElements())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 QObject *QUmlDurationConstraintObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->context()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [DurationConstraint]
 
 bool QUmlDurationConstraintObject::firstEvent() const
 {
-    return qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->firstEvent();
+    return qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->firstEvent();
 }
 
 QObject *QUmlDurationConstraintObject::specification() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->specification())
+    if (!qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->specification())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->specification()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->specification()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -194,26 +197,26 @@ QObject *QUmlDurationConstraintObject::specification() const
 QSet<QObject *> QUmlDurationConstraintObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDurationConstraintObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlDurationConstraintObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlDurationConstraintObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [NamedElement]
@@ -221,137 +224,199 @@ bool QUmlDurationConstraintObject::isTemplateParameter() const
 QList<QObject *> QUmlDurationConstraintObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlDurationConstraintObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDurationConstraintObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlDurationConstraintObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlDurationConstraintObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlDurationConstraintObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlDurationConstraintObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlDurationConstraintObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlDurationConstraintObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlDurationConstraintObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlDurationConstraintObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlDurationConstraintObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlDurationConstraintObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlDurationConstraintObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->setName(name);
 }
 
 void QUmlDurationConstraintObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlDurationConstraintObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlDurationConstraintObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlDurationConstraintObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->setVisibility(visibility);
 }
 
 void QUmlDurationConstraintObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Constraint]
 
 void QUmlDurationConstraintObject::addConstrainedElement(QObject *constrainedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->addConstrainedElement(qmodelingobjectproperty_cast<QUmlElement *>(constrainedElement));
+    qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->addConstrainedElement(qmodelingelementproperty_cast<QUmlElement *>(constrainedElement));
 }
 
 void QUmlDurationConstraintObject::removeConstrainedElement(QObject *constrainedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->removeConstrainedElement(qmodelingobjectproperty_cast<QUmlElement *>(constrainedElement));
+    qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->removeConstrainedElement(qmodelingelementproperty_cast<QUmlElement *>(constrainedElement));
 }
 
 void QUmlDurationConstraintObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->setContext(qmodelingobjectproperty_cast<QUmlNamespace *>(context));
+    qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->setContext(qmodelingelementproperty_cast<QUmlNamespace *>(context));
 }
 // SLOTS FOR OWNED ATTRIBUTES [DurationConstraint]
 
 void QUmlDurationConstraintObject::setFirstEvent(bool firstEvent)
 {
-    qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->setFirstEvent(firstEvent);
+    qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->setFirstEvent(firstEvent);
 }
 
 void QUmlDurationConstraintObject::setSpecification(QObject *specification)
 {
-    qmodelingobjectproperty_cast<QUmlDurationConstraint *>(this)->setSpecification(qmodelingobjectproperty_cast<QUmlDurationInterval *>(specification));
+    qmodelingelementproperty_cast<QUmlDurationConstraint *>(this)->setSpecification(qmodelingelementproperty_cast<QUmlDurationInterval *>(specification));
+}
+
+
+void QUmlDurationConstraintObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlConstraint");
+    d->groupProperties.insert(QStringLiteral("QUmlConstraint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("constrainedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlConstraint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+
+    d->propertyGroups << QStringLiteral("QUmlIntervalConstraint");
+
+    d->propertyGroups << QStringLiteral("QUmlDurationConstraint");
+    d->groupProperties.insert(QStringLiteral("QUmlDurationConstraint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("firstEvent"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDurationConstraint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("specification"))));
+}
+
+void QUmlDurationConstraintObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationConstraint, firstEvent, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationConstraint, firstEvent, PropertyClassRole, QStringLiteral("QUmlDurationConstraint"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationConstraint, firstEvent, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationConstraint, firstEvent, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationConstraint, firstEvent, DocumentationRole, QStringLiteral("The value of firstEvent[i] is related to constrainedElement[i] (where i is 1 or 2). If firstEvent[i] is true, then the corresponding observation event is the first time instant the execution enters constrainedElement[i]. If firstEvent[i] is false, then the corresponding observation event is the last time instant the execution is within constrainedElement[i]. Default value is true applied when constrainedElement[i] refers an element that represents only one time instant."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationConstraint, firstEvent, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationConstraint, firstEvent, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationConstraint, firstEvent, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationConstraint, specification, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationConstraint, specification, PropertyClassRole, QStringLiteral("QUmlDurationConstraint"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationConstraint, specification, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationConstraint, specification, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationConstraint, specification, DocumentationRole, QStringLiteral("The interval constraining the duration."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationConstraint, specification, RedefinedPropertiesRole, QStringLiteral("IntervalConstraint-specification"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationConstraint, specification, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationConstraint, specification, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumldurationconstraintobject_p.h b/src/uml/qobjects/qumldurationconstraintobject_p.h
index f48c5d31..87d6d5d1 100644
--- a/src/uml/qobjects/qumldurationconstraintobject_p.h
+++ b/src/uml/qobjects/qumldurationconstraintobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlDurationConstraint;
-class Q_UML_EXPORT QUmlDurationConstraintObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlDurationConstraintObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlDurationConstraintObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -88,7 +91,7 @@ class Q_UML_EXPORT QUmlDurationConstraintObject : public QObject
     Q_PROPERTY(QObject * specification READ specification WRITE setSpecification)
 
 public:
-    Q_INVOKABLE explicit QUmlDurationConstraintObject(QUmlDurationConstraint *qModelingObject);
+    Q_INVOKABLE explicit QUmlDurationConstraintObject(QUmlDurationConstraint *qModelingElement);
     virtual ~QUmlDurationConstraintObject();
 
     // Owned attributes [Element]
@@ -169,6 +172,10 @@ public Q_SLOTS:
     // Slots for owned attributes [DurationConstraint]
     void setFirstEvent(bool firstEvent);
     void setSpecification(QObject *specification = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumldurationintervalobject.cpp b/src/uml/qobjects/qumldurationintervalobject.cpp
index 418abddb..7da52128 100644
--- a/src/uml/qobjects/qumldurationintervalobject.cpp
+++ b/src/uml/qobjects/qumldurationintervalobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumldurationintervalobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlDurationInterval>
 #include <QtUml/QUmlComment>
@@ -56,16 +57,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlDurationIntervalObject::QUmlDurationIntervalObject(QUmlDurationInterval *qModelingObject)
+QUmlDurationIntervalObject::QUmlDurationIntervalObject(QUmlDurationInterval *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlDurationIntervalObject::~QUmlDurationIntervalObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -74,25 +77,25 @@ QUmlDurationIntervalObject::~QUmlDurationIntervalObject()
 const QSet<QObject *> QUmlDurationIntervalObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDurationIntervalObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlDurationIntervalObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -100,88 +103,88 @@ QObject *QUmlDurationIntervalObject::owner() const
 const QSet<QObject *> QUmlDurationIntervalObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlDurationIntervalObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->name();
 }
 
 QObject *QUmlDurationIntervalObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlDurationIntervalObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlDurationIntervalObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [TypedElement]
 
 QObject *QUmlDurationIntervalObject::type() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->type())
+    if (!qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->type())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->type()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->type()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlDurationIntervalObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlDurationIntervalObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlDurationIntervalObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [DurationInterval]
 
 QObject *QUmlDurationIntervalObject::max() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->max())
+    if (!qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->max())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->max()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->max()->asQModelingObject();
 }
 
 QObject *QUmlDurationIntervalObject::min() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->min())
+    if (!qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->min())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->min()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->min()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -189,14 +192,14 @@ QObject *QUmlDurationIntervalObject::min() const
 QSet<QObject *> QUmlDurationIntervalObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDurationIntervalObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -204,177 +207,240 @@ bool QUmlDurationIntervalObject::mustBeOwned() const
 QList<QObject *> QUmlDurationIntervalObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlDurationIntervalObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDurationIntervalObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlDurationIntervalObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->separator();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlDurationIntervalObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [ValueSpecification]
 
 bool QUmlDurationIntervalObject::booleanValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->booleanValue();
+    return qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->booleanValue();
 }
 
 int QUmlDurationIntervalObject::integerValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->integerValue();
+    return qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->integerValue();
 }
 
 bool QUmlDurationIntervalObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlDurationIntervalObject::isComputable() const
 {
-    return qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->isComputable();
+    return qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->isComputable();
 }
 
 bool QUmlDurationIntervalObject::isNull() const
 {
-    return qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->isNull();
+    return qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->isNull();
 }
 
 double QUmlDurationIntervalObject::realValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->realValue();
+    return qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->realValue();
 }
 
 QString QUmlDurationIntervalObject::stringValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->stringValue();
+    return qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->stringValue();
 }
 
 int QUmlDurationIntervalObject::unlimitedValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->unlimitedValue();
+    return qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->unlimitedValue();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlDurationIntervalObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlDurationIntervalObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlDurationIntervalObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlDurationIntervalObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlDurationIntervalObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlDurationIntervalObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlDurationIntervalObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlDurationIntervalObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->setName(name);
 }
 
 void QUmlDurationIntervalObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlDurationIntervalObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlDurationIntervalObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [TypedElement]
 
 void QUmlDurationIntervalObject::setType(QObject *type)
 {
-    qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->setType(qmodelingobjectproperty_cast<QUmlType *>(type));
+    qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->setType(qmodelingelementproperty_cast<QUmlType *>(type));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlDurationIntervalObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlDurationIntervalObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlDurationIntervalObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->setVisibility(visibility);
 }
 
 void QUmlDurationIntervalObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [DurationInterval]
 
 void QUmlDurationIntervalObject::setMax(QObject *max)
 {
-    qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->setMax(qmodelingobjectproperty_cast<QUmlDuration *>(max));
+    qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->setMax(qmodelingelementproperty_cast<QUmlDuration *>(max));
 }
 
 void QUmlDurationIntervalObject::setMin(QObject *min)
 {
-    qmodelingobjectproperty_cast<QUmlDurationInterval *>(this)->setMin(qmodelingobjectproperty_cast<QUmlDuration *>(min));
+    qmodelingelementproperty_cast<QUmlDurationInterval *>(this)->setMin(qmodelingelementproperty_cast<QUmlDuration *>(min));
+}
+
+
+void QUmlDurationIntervalObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTypedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlValueSpecification");
+
+    d->propertyGroups << QStringLiteral("QUmlInterval");
+
+    d->propertyGroups << QStringLiteral("QUmlDurationInterval");
+    d->groupProperties.insert(QStringLiteral("QUmlDurationInterval"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("max"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDurationInterval"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("min"))));
+}
+
+void QUmlDurationIntervalObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationInterval, max, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationInterval, max, PropertyClassRole, QStringLiteral("QUmlDurationInterval"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationInterval, max, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationInterval, max, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationInterval, max, DocumentationRole, QStringLiteral("Refers to the Duration denoting the maximum value of the range."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationInterval, max, RedefinedPropertiesRole, QStringLiteral("Interval-max"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationInterval, max, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationInterval, max, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationInterval, min, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationInterval, min, PropertyClassRole, QStringLiteral("QUmlDurationInterval"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationInterval, min, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationInterval, min, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationInterval, min, DocumentationRole, QStringLiteral("Refers to the Duration denoting the minimum value of the range."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationInterval, min, RedefinedPropertiesRole, QStringLiteral("Interval-min"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationInterval, min, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationInterval, min, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumldurationintervalobject_p.h b/src/uml/qobjects/qumldurationintervalobject_p.h
index f29fdca3..413b3f61 100644
--- a/src/uml/qobjects/qumldurationintervalobject_p.h
+++ b/src/uml/qobjects/qumldurationintervalobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlDurationInterval;
-class Q_UML_EXPORT QUmlDurationIntervalObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlDurationIntervalObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlDurationIntervalObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -87,7 +90,7 @@ class Q_UML_EXPORT QUmlDurationIntervalObject : public QObject
     Q_PROPERTY(QObject * min READ min WRITE setMin)
 
 public:
-    Q_INVOKABLE explicit QUmlDurationIntervalObject(QUmlDurationInterval *qModelingObject);
+    Q_INVOKABLE explicit QUmlDurationIntervalObject(QUmlDurationInterval *qModelingElement);
     virtual ~QUmlDurationIntervalObject();
 
     // Owned attributes [Element]
@@ -174,6 +177,10 @@ public Q_SLOTS:
     // Slots for owned attributes [DurationInterval]
     void setMax(QObject *max = 0);
     void setMin(QObject *min = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumldurationobject.cpp b/src/uml/qobjects/qumldurationobject.cpp
index d6a911bf..051e5622 100644
--- a/src/uml/qobjects/qumldurationobject.cpp
+++ b/src/uml/qobjects/qumldurationobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumldurationobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlDuration>
 #include <QtUml/QUmlComment>
@@ -56,16 +57,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlDurationObject::QUmlDurationObject(QUmlDuration *qModelingObject)
+QUmlDurationObject::QUmlDurationObject(QUmlDuration *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlDurationObject::~QUmlDurationObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlDuration *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlDuration *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -74,25 +77,25 @@ QUmlDurationObject::~QUmlDurationObject()
 const QSet<QObject *> QUmlDurationObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlDuration *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlDuration *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDurationObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlDuration *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlDuration *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlDurationObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDuration *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlDuration *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDuration *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDuration *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -100,87 +103,87 @@ QObject *QUmlDurationObject::owner() const
 const QSet<QObject *> QUmlDurationObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlDuration *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlDuration *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlDurationObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlDuration *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlDuration *>(this)->name();
 }
 
 QObject *QUmlDurationObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDuration *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlDuration *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDuration *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDuration *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlDurationObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDuration *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlDuration *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDuration *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDuration *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlDurationObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlDuration *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlDuration *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [TypedElement]
 
 QObject *QUmlDurationObject::type() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDuration *>(this)->type())
+    if (!qmodelingelementproperty_cast<QUmlDuration *>(this)->type())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDuration *>(this)->type()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDuration *>(this)->type()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlDurationObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDuration *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlDuration *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDuration *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDuration *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlDurationObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDuration *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlDuration *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDuration *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDuration *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlDurationObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlDuration *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlDuration *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Duration]
 
 QObject *QUmlDurationObject::expr() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDuration *>(this)->expr())
+    if (!qmodelingelementproperty_cast<QUmlDuration *>(this)->expr())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDuration *>(this)->expr()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDuration *>(this)->expr()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlDurationObject::observations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlObservation *element, qmodelingobjectproperty_cast<QUmlDuration *>(this)->observations())
-        set.insert(element->asQObject());
+    foreach (QUmlObservation *element, qmodelingelementproperty_cast<QUmlDuration *>(this)->observations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -189,14 +192,14 @@ const QSet<QObject *> QUmlDurationObject::observations() const
 QSet<QObject *> QUmlDurationObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlDuration *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlDuration *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDurationObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlDuration *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlDuration *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -204,182 +207,243 @@ bool QUmlDurationObject::mustBeOwned() const
 QList<QObject *> QUmlDurationObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlDuration *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlDuration *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlDurationObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlDuration *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlDuration *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDurationObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlDuration *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlDuration *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlDurationObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlDuration *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlDuration *>(this)->separator();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlDurationObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlDuration *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlDuration *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [ValueSpecification]
 
 bool QUmlDurationObject::booleanValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlDuration *>(this)->booleanValue();
+    return qmodelingelementproperty_cast<QUmlDuration *>(this)->booleanValue();
 }
 
 int QUmlDurationObject::integerValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlDuration *>(this)->integerValue();
+    return qmodelingelementproperty_cast<QUmlDuration *>(this)->integerValue();
 }
 
 bool QUmlDurationObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlDuration *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlDuration *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlDurationObject::isComputable() const
 {
-    return qmodelingobjectproperty_cast<QUmlDuration *>(this)->isComputable();
+    return qmodelingelementproperty_cast<QUmlDuration *>(this)->isComputable();
 }
 
 bool QUmlDurationObject::isNull() const
 {
-    return qmodelingobjectproperty_cast<QUmlDuration *>(this)->isNull();
+    return qmodelingelementproperty_cast<QUmlDuration *>(this)->isNull();
 }
 
 double QUmlDurationObject::realValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlDuration *>(this)->realValue();
+    return qmodelingelementproperty_cast<QUmlDuration *>(this)->realValue();
 }
 
 QString QUmlDurationObject::stringValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlDuration *>(this)->stringValue();
+    return qmodelingelementproperty_cast<QUmlDuration *>(this)->stringValue();
 }
 
 int QUmlDurationObject::unlimitedValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlDuration *>(this)->unlimitedValue();
+    return qmodelingelementproperty_cast<QUmlDuration *>(this)->unlimitedValue();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlDurationObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlDuration *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlDuration *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlDurationObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlDuration *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlDuration *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlDurationObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDuration *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlDuration *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlDurationObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDuration *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlDuration *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlDurationObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlDuration *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlDuration *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlDurationObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlDuration *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlDuration *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlDurationObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlDuration *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlDuration *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlDurationObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlDuration *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlDuration *>(this)->setName(name);
 }
 
 void QUmlDurationObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlDuration *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlDuration *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlDurationObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlDuration *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlDuration *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlDurationObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlDuration *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlDuration *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [TypedElement]
 
 void QUmlDurationObject::setType(QObject *type)
 {
-    qmodelingobjectproperty_cast<QUmlDuration *>(this)->setType(qmodelingobjectproperty_cast<QUmlType *>(type));
+    qmodelingelementproperty_cast<QUmlDuration *>(this)->setType(qmodelingelementproperty_cast<QUmlType *>(type));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlDurationObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlDuration *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlDuration *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlDurationObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlDuration *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlDuration *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlDurationObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlDuration *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlDuration *>(this)->setVisibility(visibility);
 }
 
 void QUmlDurationObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlDuration *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Duration]
 
 void QUmlDurationObject::setExpr(QObject *expr)
 {
-    qmodelingobjectproperty_cast<QUmlDuration *>(this)->setExpr(qmodelingobjectproperty_cast<QUmlValueSpecification *>(expr));
+    qmodelingelementproperty_cast<QUmlDuration *>(this)->setExpr(qmodelingelementproperty_cast<QUmlValueSpecification *>(expr));
 }
 
 void QUmlDurationObject::addObservation(QObject *observation)
 {
-    qmodelingobjectproperty_cast<QUmlDuration *>(this)->addObservation(qmodelingobjectproperty_cast<QUmlObservation *>(observation));
+    qmodelingelementproperty_cast<QUmlDuration *>(this)->addObservation(qmodelingelementproperty_cast<QUmlObservation *>(observation));
 }
 
 void QUmlDurationObject::removeObservation(QObject *observation)
 {
-    qmodelingobjectproperty_cast<QUmlDuration *>(this)->removeObservation(qmodelingobjectproperty_cast<QUmlObservation *>(observation));
+    qmodelingelementproperty_cast<QUmlDuration *>(this)->removeObservation(qmodelingelementproperty_cast<QUmlObservation *>(observation));
+}
+
+
+void QUmlDurationObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTypedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlValueSpecification");
+
+    d->propertyGroups << QStringLiteral("QUmlDuration");
+    d->groupProperties.insert(QStringLiteral("QUmlDuration"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("expr"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDuration"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("observations"))));
+}
+
+void QUmlDurationObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDuration, expr, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDuration, expr, PropertyClassRole, QStringLiteral("QUmlDuration"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDuration, expr, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDuration, expr, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDuration, expr, DocumentationRole, QStringLiteral("The value of the Duration."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDuration, expr, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDuration, expr, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDuration, expr, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDuration, observations, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDuration, observations, PropertyClassRole, QStringLiteral("QUmlDuration"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDuration, observations, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDuration, observations, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDuration, observations, DocumentationRole, QStringLiteral("Refers to the time and duration observations that are involved in expr."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDuration, observations, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDuration, observations, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDuration, observations, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumldurationobject_p.h b/src/uml/qobjects/qumldurationobject_p.h
index 6b678f38..8c81bbc4 100644
--- a/src/uml/qobjects/qumldurationobject_p.h
+++ b/src/uml/qobjects/qumldurationobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlDuration;
-class Q_UML_EXPORT QUmlDurationObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlDurationObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlDurationObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -85,7 +88,7 @@ class Q_UML_EXPORT QUmlDurationObject : public QObject
     Q_PROPERTY(QSet<QObject *> observations READ observations)
 
 public:
-    Q_INVOKABLE explicit QUmlDurationObject(QUmlDuration *qModelingObject);
+    Q_INVOKABLE explicit QUmlDurationObject(QUmlDuration *qModelingElement);
     virtual ~QUmlDurationObject();
 
     // Owned attributes [Element]
@@ -169,6 +172,10 @@ public Q_SLOTS:
     void setExpr(QObject *expr = 0);
     void addObservation(QObject *observation);
     void removeObservation(QObject *observation);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumldurationobservationobject.cpp b/src/uml/qobjects/qumldurationobservationobject.cpp
index 577bd6d3..956f8f74 100644
--- a/src/uml/qobjects/qumldurationobservationobject.cpp
+++ b/src/uml/qobjects/qumldurationobservationobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumldurationobservationobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlDurationObservation>
 #include <QtUml/QUmlComment>
@@ -53,16 +54,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlDurationObservationObject::QUmlDurationObservationObject(QUmlDurationObservation *qModelingObject)
+QUmlDurationObservationObject::QUmlDurationObservationObject(QUmlDurationObservation *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlDurationObservationObject::~QUmlDurationObservationObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -71,43 +74,43 @@ QUmlDurationObservationObject::~QUmlDurationObservationObject()
 const QSet<QObject *> QUmlDurationObservationObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlDurationObservationObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlDurationObservationObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlDurationObservationObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlDurationObservationObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -115,57 +118,57 @@ QObject *QUmlDurationObservationObject::templateParameter() const
 const QSet<QObject *> QUmlDurationObservationObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlDurationObservationObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->name();
 }
 
 QObject *QUmlDurationObservationObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlDurationObservationObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlDurationObservationObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlDurationObservationObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [DurationObservation]
 
 QObject *QUmlDurationObservationObject::event() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->event())
+    if (!qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->event())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->event()->asQObject();
+        return qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->event()->asQModelingObject();
 }
 
 bool QUmlDurationObservationObject::firstEvent() const
 {
-    return qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->firstEvent();
+    return qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->firstEvent();
 }
 
 // OPERATIONS [Element]
@@ -173,26 +176,26 @@ bool QUmlDurationObservationObject::firstEvent() const
 QSet<QObject *> QUmlDurationObservationObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDurationObservationObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlDurationObservationObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlDurationObservationObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [NamedElement]
@@ -200,121 +203,179 @@ bool QUmlDurationObservationObject::isTemplateParameter() const
 QList<QObject *> QUmlDurationObservationObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlDurationObservationObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlDurationObservationObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlDurationObservationObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlDurationObservationObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlDurationObservationObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlDurationObservationObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlDurationObservationObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlDurationObservationObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlDurationObservationObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlDurationObservationObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlDurationObservationObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlDurationObservationObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlDurationObservationObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->setName(name);
 }
 
 void QUmlDurationObservationObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlDurationObservationObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlDurationObservationObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlDurationObservationObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->setVisibility(visibility);
 }
 
 void QUmlDurationObservationObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [DurationObservation]
 
 void QUmlDurationObservationObject::setEvent(QObject *event)
 {
-    qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->setEvent(qmodelingobjectproperty_cast<QUmlNamedElement *>(event));
+    qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->setEvent(qmodelingelementproperty_cast<QUmlNamedElement *>(event));
 }
 
 void QUmlDurationObservationObject::setFirstEvent(bool firstEvent)
 {
-    qmodelingobjectproperty_cast<QUmlDurationObservation *>(this)->setFirstEvent(firstEvent);
+    qmodelingelementproperty_cast<QUmlDurationObservation *>(this)->setFirstEvent(firstEvent);
+}
+
+
+void QUmlDurationObservationObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlObservation");
+
+    d->propertyGroups << QStringLiteral("QUmlDurationObservation");
+    d->groupProperties.insert(QStringLiteral("QUmlDurationObservation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("event"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDurationObservation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("firstEvent"))));
+}
+
+void QUmlDurationObservationObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationObservation, event, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationObservation, event, PropertyClassRole, QStringLiteral("QUmlDurationObservation"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationObservation, event, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationObservation, event, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationObservation, event, DocumentationRole, QStringLiteral("The observation is determined by the entering or exiting of the event element during execution."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationObservation, event, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationObservation, event, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationObservation, event, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationObservation, firstEvent, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationObservation, firstEvent, PropertyClassRole, QStringLiteral("QUmlDurationObservation"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationObservation, firstEvent, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationObservation, firstEvent, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationObservation, firstEvent, DocumentationRole, QStringLiteral("The value of firstEvent[i] is related to event[i] (where i is 1 or 2). If firstEvent[i] is true, then the corresponding observation event is the first time instant the execution enters event[i]. If firstEvent[i] is false, then the corresponding observation event is the time instant the execution exits event[i]. Default value is true applied when event[i] refers an element that represents only one time instant."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationObservation, firstEvent, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationObservation, firstEvent, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlDurationObservation, firstEvent, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumldurationobservationobject_p.h b/src/uml/qobjects/qumldurationobservationobject_p.h
index 37065877..6fa0c9d3 100644
--- a/src/uml/qobjects/qumldurationobservationobject_p.h
+++ b/src/uml/qobjects/qumldurationobservationobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlDurationObservation;
-class Q_UML_EXPORT QUmlDurationObservationObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlDurationObservationObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlDurationObservationObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -82,7 +85,7 @@ class Q_UML_EXPORT QUmlDurationObservationObject : public QObject
     Q_PROPERTY(bool firstEvent READ firstEvent WRITE setFirstEvent)
 
 public:
-    Q_INVOKABLE explicit QUmlDurationObservationObject(QUmlDurationObservation *qModelingObject);
+    Q_INVOKABLE explicit QUmlDurationObservationObject(QUmlDurationObservation *qModelingElement);
     virtual ~QUmlDurationObservationObject();
 
     // Owned attributes [Element]
@@ -150,6 +153,10 @@ public Q_SLOTS:
     // Slots for owned attributes [DurationObservation]
     void setEvent(QObject *event = 0);
     void setFirstEvent(bool firstEvent);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlelementimportobject.cpp b/src/uml/qobjects/qumlelementimportobject.cpp
index 3caf87af..6cf90d62 100644
--- a/src/uml/qobjects/qumlelementimportobject.cpp
+++ b/src/uml/qobjects/qumlelementimportobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlelementimportobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlElementImport>
 #include <QtUml/QUmlComment>
@@ -48,16 +49,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlElementImportObject::QUmlElementImportObject(QUmlElementImport *qModelingObject)
+QUmlElementImportObject::QUmlElementImportObject(QUmlElementImport *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlElementImportObject::~QUmlElementImportObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlElementImport *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlElementImport *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -66,25 +69,25 @@ QUmlElementImportObject::~QUmlElementImportObject()
 const QSet<QObject *> QUmlElementImportObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlElementImport *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlElementImport *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlElementImportObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlElementImport *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlElementImport *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlElementImportObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlElementImport *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlElementImport *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlElementImport *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlElementImport *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [Relationship]
@@ -92,8 +95,8 @@ QObject *QUmlElementImportObject::owner() const
 const QSet<QObject *> QUmlElementImportObject::relatedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlElementImport *>(this)->relatedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlElementImport *>(this)->relatedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -102,16 +105,16 @@ const QSet<QObject *> QUmlElementImportObject::relatedElements() const
 const QSet<QObject *> QUmlElementImportObject::sources() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlElementImport *>(this)->sources())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlElementImport *>(this)->sources())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlElementImportObject::targets() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlElementImport *>(this)->targets())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlElementImport *>(this)->targets())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -119,28 +122,28 @@ const QSet<QObject *> QUmlElementImportObject::targets() const
 
 QString QUmlElementImportObject::alias() const
 {
-    return qmodelingobjectproperty_cast<QUmlElementImport *>(this)->alias();
+    return qmodelingelementproperty_cast<QUmlElementImport *>(this)->alias();
 }
 
 QObject *QUmlElementImportObject::importedElement() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlElementImport *>(this)->importedElement())
+    if (!qmodelingelementproperty_cast<QUmlElementImport *>(this)->importedElement())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlElementImport *>(this)->importedElement()->asQObject();
+        return qmodelingelementproperty_cast<QUmlElementImport *>(this)->importedElement()->asQModelingObject();
 }
 
 QObject *QUmlElementImportObject::importingNamespace() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlElementImport *>(this)->importingNamespace())
+    if (!qmodelingelementproperty_cast<QUmlElementImport *>(this)->importingNamespace())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlElementImport *>(this)->importingNamespace()->asQObject();
+        return qmodelingelementproperty_cast<QUmlElementImport *>(this)->importingNamespace()->asQModelingObject();
 }
 
 QtUml::VisibilityKind QUmlElementImportObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlElementImport *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlElementImport *>(this)->visibility();
 }
 
 // OPERATIONS [Element]
@@ -148,109 +151,178 @@ QtUml::VisibilityKind QUmlElementImportObject::visibility() const
 QSet<QObject *> QUmlElementImportObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlElementImport *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlElementImport *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlElementImportObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlElementImport *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlElementImport *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [ElementImport]
 
 QString QUmlElementImportObject::getName() const
 {
-    return qmodelingobjectproperty_cast<QUmlElementImport *>(this)->getName();
+    return qmodelingelementproperty_cast<QUmlElementImport *>(this)->getName();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlElementImportObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlElementImport *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlElementImport *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlElementImportObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlElementImport *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlElementImport *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlElementImportObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlElementImport *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlElementImport *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlElementImportObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlElementImport *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlElementImport *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlElementImportObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlElementImport *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlElementImport *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Relationship]
 
 void QUmlElementImportObject::addRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlElementImport *>(this)->addRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlElementImport *>(this)->addRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 void QUmlElementImportObject::removeRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlElementImport *>(this)->removeRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlElementImport *>(this)->removeRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [DirectedRelationship]
 
 void QUmlElementImportObject::addSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlElementImport *>(this)->addSource(qmodelingobjectproperty_cast<QUmlElement *>(source));
+    qmodelingelementproperty_cast<QUmlElementImport *>(this)->addSource(qmodelingelementproperty_cast<QUmlElement *>(source));
 }
 
 void QUmlElementImportObject::removeSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlElementImport *>(this)->removeSource(qmodelingobjectproperty_cast<QUmlElement *>(source));
+    qmodelingelementproperty_cast<QUmlElementImport *>(this)->removeSource(qmodelingelementproperty_cast<QUmlElement *>(source));
 }
 
 void QUmlElementImportObject::addTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlElementImport *>(this)->addTarget(qmodelingobjectproperty_cast<QUmlElement *>(target));
+    qmodelingelementproperty_cast<QUmlElementImport *>(this)->addTarget(qmodelingelementproperty_cast<QUmlElement *>(target));
 }
 
 void QUmlElementImportObject::removeTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlElementImport *>(this)->removeTarget(qmodelingobjectproperty_cast<QUmlElement *>(target));
+    qmodelingelementproperty_cast<QUmlElementImport *>(this)->removeTarget(qmodelingelementproperty_cast<QUmlElement *>(target));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ElementImport]
 
 void QUmlElementImportObject::setAlias(QString alias)
 {
-    qmodelingobjectproperty_cast<QUmlElementImport *>(this)->setAlias(alias);
+    qmodelingelementproperty_cast<QUmlElementImport *>(this)->setAlias(alias);
 }
 
 void QUmlElementImportObject::setImportedElement(QObject *importedElement)
 {
-    qmodelingobjectproperty_cast<QUmlElementImport *>(this)->setImportedElement(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedElement));
+    qmodelingelementproperty_cast<QUmlElementImport *>(this)->setImportedElement(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedElement));
 }
 
 void QUmlElementImportObject::setImportingNamespace(QObject *importingNamespace)
 {
-    qmodelingobjectproperty_cast<QUmlElementImport *>(this)->setImportingNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(importingNamespace));
+    qmodelingelementproperty_cast<QUmlElementImport *>(this)->setImportingNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(importingNamespace));
 }
 
 void QUmlElementImportObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlElementImport *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlElementImport *>(this)->setVisibility(visibility);
 }
 
 void QUmlElementImportObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlElementImport *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
+}
+
+
+void QUmlElementImportObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDirectedRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElementImport");
+    d->groupProperties.insert(QStringLiteral("QUmlElementImport"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("alias"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElementImport"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedElement"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElementImport"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importingNamespace"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElementImport"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+}
+
+void QUmlElementImportObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlElementImport, alias, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlElementImport, alias, PropertyClassRole, QStringLiteral("QUmlElementImport"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlElementImport, alias, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlElementImport, alias, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlElementImport, alias, DocumentationRole, QStringLiteral("Specifies the name that should be added to the namespace of the importing package in lieu of the name of the imported packagable element. The aliased name must not clash with any other member name in the importing package. By default, no alias is used."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlElementImport, alias, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlElementImport, alias, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlElementImport, alias, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlElementImport, importedElement, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlElementImport, importedElement, PropertyClassRole, QStringLiteral("QUmlElementImport"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlElementImport, importedElement, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlElementImport, importedElement, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlElementImport, importedElement, DocumentationRole, QStringLiteral("Specifies the PackageableElement whose name is to be added to a Namespace."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlElementImport, importedElement, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlElementImport, importedElement, SubsettedPropertiesRole, QStringLiteral("DirectedRelationship-target"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlElementImport, importedElement, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlElementImport, importingNamespace, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlElementImport, importingNamespace, PropertyClassRole, QStringLiteral("QUmlElementImport"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlElementImport, importingNamespace, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlElementImport, importingNamespace, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlElementImport, importingNamespace, DocumentationRole, QStringLiteral("Specifies the Namespace that imports a PackageableElement from another Package."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlElementImport, importingNamespace, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlElementImport, importingNamespace, SubsettedPropertiesRole, QStringLiteral("Element-owner DirectedRelationship-source"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlElementImport, importingNamespace, OppositeEndRole, QStringLiteral("Namespace-elementImport"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlElementImport, visibility, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlElementImport, visibility, PropertyClassRole, QStringLiteral("QUmlElementImport"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlElementImport, visibility, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlElementImport, visibility, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlElementImport, visibility, DocumentationRole, QStringLiteral("Specifies the visibility of the imported PackageableElement within the importing Package. The default visibility is the same as that of the imported element. If the imported element does not have a visibility, it is possible to add visibility to the element import."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlElementImport, visibility, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlElementImport, visibility, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlElementImport, visibility, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlelementimportobject_p.h b/src/uml/qobjects/qumlelementimportobject_p.h
index 2a521b35..272c9f3f 100644
--- a/src/uml/qobjects/qumlelementimportobject_p.h
+++ b/src/uml/qobjects/qumlelementimportobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlElementImport;
-class Q_UML_EXPORT QUmlElementImportObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlElementImportObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlElementImportObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -77,7 +80,7 @@ class Q_UML_EXPORT QUmlElementImportObject : public QObject
     Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
 public:
-    Q_INVOKABLE explicit QUmlElementImportObject(QUmlElementImport *qModelingObject);
+    Q_INVOKABLE explicit QUmlElementImportObject(QUmlElementImport *qModelingElement);
     virtual ~QUmlElementImportObject();
 
     // Owned attributes [Element]
@@ -130,6 +133,10 @@ public Q_SLOTS:
     void setImportingNamespace(QObject *importingNamespace = 0);
     void setVisibility(QtUml::VisibilityKind visibility);
     void unsetVisibility();
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlenumerationliteralobject.cpp b/src/uml/qobjects/qumlenumerationliteralobject.cpp
index ad3d232e..b8f5a30c 100644
--- a/src/uml/qobjects/qumlenumerationliteralobject.cpp
+++ b/src/uml/qobjects/qumlenumerationliteralobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlenumerationliteralobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlEnumerationLiteral>
 #include <QtUml/QUmlClassifier>
@@ -59,16 +60,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlEnumerationLiteralObject::QUmlEnumerationLiteralObject(QUmlEnumerationLiteral *qModelingObject)
+QUmlEnumerationLiteralObject::QUmlEnumerationLiteralObject(QUmlEnumerationLiteral *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlEnumerationLiteralObject::~QUmlEnumerationLiteralObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -77,25 +80,25 @@ QUmlEnumerationLiteralObject::~QUmlEnumerationLiteralObject()
 const QSet<QObject *> QUmlEnumerationLiteralObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlEnumerationLiteralObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlEnumerationLiteralObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -103,60 +106,60 @@ QObject *QUmlEnumerationLiteralObject::owner() const
 const QSet<QObject *> QUmlEnumerationLiteralObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlEnumerationLiteralObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->name();
 }
 
 QObject *QUmlEnumerationLiteralObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlEnumerationLiteralObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlEnumerationLiteralObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlEnumerationLiteralObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlEnumerationLiteralObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlEnumerationLiteralObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [DeploymentTarget]
@@ -164,16 +167,16 @@ QtUml::VisibilityKind QUmlEnumerationLiteralObject::visibility() const
 const QSet<QObject *> QUmlEnumerationLiteralObject::deployedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->deployedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->deployedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlEnumerationLiteralObject::deployments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDeployment *element, qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->deployments())
-        set.insert(element->asQObject());
+    foreach (QUmlDeployment *element, qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->deployments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -182,35 +185,35 @@ const QSet<QObject *> QUmlEnumerationLiteralObject::deployments() const
 const QSet<QObject *> QUmlEnumerationLiteralObject::slots_() const
 {
     QSet<QObject *> set;
-    foreach (QUmlSlot *element, qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->slots_())
-        set.insert(element->asQObject());
+    foreach (QUmlSlot *element, qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->slots_())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlEnumerationLiteralObject::specification() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->specification())
+    if (!qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->specification())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->specification()->asQObject();
+        return qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->specification()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [EnumerationLiteral]
 
 QObject *QUmlEnumerationLiteralObject::classifier() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->classifier())
+    if (!qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->classifier())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->classifier()->asQObject();
+        return qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->classifier()->asQModelingObject();
 }
 
 QObject *QUmlEnumerationLiteralObject::enumeration() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->enumeration())
+    if (!qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->enumeration())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->enumeration()->asQObject();
+        return qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->enumeration()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -218,14 +221,14 @@ QObject *QUmlEnumerationLiteralObject::enumeration() const
 QSet<QObject *> QUmlEnumerationLiteralObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlEnumerationLiteralObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -233,172 +236,238 @@ bool QUmlEnumerationLiteralObject::mustBeOwned() const
 QList<QObject *> QUmlEnumerationLiteralObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlEnumerationLiteralObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlEnumerationLiteralObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlEnumerationLiteralObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->separator();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlEnumerationLiteralObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlEnumerationLiteralObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->isTemplateParameter();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlEnumerationLiteralObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlEnumerationLiteralObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlEnumerationLiteralObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlEnumerationLiteralObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlEnumerationLiteralObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlEnumerationLiteralObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlEnumerationLiteralObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlEnumerationLiteralObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->setName(name);
 }
 
 void QUmlEnumerationLiteralObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlEnumerationLiteralObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlEnumerationLiteralObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlEnumerationLiteralObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlEnumerationLiteralObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlEnumerationLiteralObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->setVisibility(visibility);
 }
 
 void QUmlEnumerationLiteralObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [DeploymentTarget]
 
 void QUmlEnumerationLiteralObject::addDeployedElement(QObject *deployedElement)
 {
-    qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->addDeployedElement(qmodelingobjectproperty_cast<QUmlPackageableElement *>(deployedElement));
+    qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->addDeployedElement(qmodelingelementproperty_cast<QUmlPackageableElement *>(deployedElement));
 }
 
 void QUmlEnumerationLiteralObject::removeDeployedElement(QObject *deployedElement)
 {
-    qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->removeDeployedElement(qmodelingobjectproperty_cast<QUmlPackageableElement *>(deployedElement));
+    qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->removeDeployedElement(qmodelingelementproperty_cast<QUmlPackageableElement *>(deployedElement));
 }
 
 void QUmlEnumerationLiteralObject::addDeployment(QObject *deployment)
 {
-    qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->addDeployment(qmodelingobjectproperty_cast<QUmlDeployment *>(deployment));
+    qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->addDeployment(qmodelingelementproperty_cast<QUmlDeployment *>(deployment));
 }
 
 void QUmlEnumerationLiteralObject::removeDeployment(QObject *deployment)
 {
-    qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->removeDeployment(qmodelingobjectproperty_cast<QUmlDeployment *>(deployment));
+    qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->removeDeployment(qmodelingelementproperty_cast<QUmlDeployment *>(deployment));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [InstanceSpecification]
 
 void QUmlEnumerationLiteralObject::addSlot(QObject *slot_)
 {
-    qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->addSlot(qmodelingobjectproperty_cast<QUmlSlot *>(slot_));
+    qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->addSlot(qmodelingelementproperty_cast<QUmlSlot *>(slot_));
 }
 
 void QUmlEnumerationLiteralObject::removeSlot(QObject *slot_)
 {
-    qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->removeSlot(qmodelingobjectproperty_cast<QUmlSlot *>(slot_));
+    qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->removeSlot(qmodelingelementproperty_cast<QUmlSlot *>(slot_));
 }
 
 void QUmlEnumerationLiteralObject::setSpecification(QObject *specification)
 {
-    qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->setSpecification(qmodelingobjectproperty_cast<QUmlValueSpecification *>(specification));
+    qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->setSpecification(qmodelingelementproperty_cast<QUmlValueSpecification *>(specification));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [EnumerationLiteral]
 
 void QUmlEnumerationLiteralObject::setClassifier(QObject *classifier)
 {
-    qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->setClassifier(qmodelingobjectproperty_cast<QUmlEnumeration *>(classifier));
+    qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->setClassifier(qmodelingelementproperty_cast<QUmlEnumeration *>(classifier));
 }
 
 void QUmlEnumerationLiteralObject::setEnumeration(QObject *enumeration)
 {
-    qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(this)->setEnumeration(qmodelingobjectproperty_cast<QUmlEnumeration *>(enumeration));
+    qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(this)->setEnumeration(qmodelingelementproperty_cast<QUmlEnumeration *>(enumeration));
+}
+
+
+void QUmlEnumerationLiteralObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDeployedArtifact");
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDeploymentTarget");
+    d->groupProperties.insert(QStringLiteral("QUmlDeploymentTarget"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deployedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDeploymentTarget"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deployments"))));
+
+    d->propertyGroups << QStringLiteral("QUmlInstanceSpecification");
+    d->groupProperties.insert(QStringLiteral("QUmlInstanceSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("slots_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInstanceSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("specification"))));
+
+    d->propertyGroups << QStringLiteral("QUmlEnumerationLiteral");
+    d->groupProperties.insert(QStringLiteral("QUmlEnumerationLiteral"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifier"))));
+    d->groupProperties.insert(QStringLiteral("QUmlEnumerationLiteral"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enumeration"))));
+}
+
+void QUmlEnumerationLiteralObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlEnumerationLiteral, classifier, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlEnumerationLiteral, classifier, PropertyClassRole, QStringLiteral("QUmlEnumerationLiteral"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlEnumerationLiteral, classifier, IsDerivedRole, true);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlEnumerationLiteral, classifier, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlEnumerationLiteral, classifier, DocumentationRole, QStringLiteral("The classifier of this EnumerationLiteral derived to be equal to its enumeration."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlEnumerationLiteral, classifier, RedefinedPropertiesRole, QStringLiteral("InstanceSpecification-classifier"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlEnumerationLiteral, classifier, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlEnumerationLiteral, classifier, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlEnumerationLiteral, enumeration, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlEnumerationLiteral, enumeration, PropertyClassRole, QStringLiteral("QUmlEnumerationLiteral"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlEnumerationLiteral, enumeration, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlEnumerationLiteral, enumeration, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlEnumerationLiteral, enumeration, DocumentationRole, QStringLiteral("The Enumeration that this EnumerationLiteral is a member of."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlEnumerationLiteral, enumeration, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlEnumerationLiteral, enumeration, SubsettedPropertiesRole, QStringLiteral("NamedElement-namespace"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlEnumerationLiteral, enumeration, OppositeEndRole, QStringLiteral("Enumeration-ownedLiteral"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlenumerationliteralobject_p.h b/src/uml/qobjects/qumlenumerationliteralobject_p.h
index ffb40e5e..b5b60b0d 100644
--- a/src/uml/qobjects/qumlenumerationliteralobject_p.h
+++ b/src/uml/qobjects/qumlenumerationliteralobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlEnumerationLiteral;
-class Q_UML_EXPORT QUmlEnumerationLiteralObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlEnumerationLiteralObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlEnumerationLiteralObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -90,7 +93,7 @@ class Q_UML_EXPORT QUmlEnumerationLiteralObject : public QObject
     Q_PROPERTY(QObject * enumeration READ enumeration WRITE setEnumeration)
 
 public:
-    Q_INVOKABLE explicit QUmlEnumerationLiteralObject(QUmlEnumerationLiteral *qModelingObject);
+    Q_INVOKABLE explicit QUmlEnumerationLiteralObject(QUmlEnumerationLiteral *qModelingElement);
     virtual ~QUmlEnumerationLiteralObject();
 
     // Owned attributes [Element]
@@ -177,6 +180,10 @@ public Q_SLOTS:
     // Slots for owned attributes [EnumerationLiteral]
     void Q_DECL_HIDDEN setClassifier(QObject *classifier = 0);
     void setEnumeration(QObject *enumeration = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlenumerationobject.cpp b/src/uml/qobjects/qumlenumerationobject.cpp
index a7378b71..f48afbed 100644
--- a/src/uml/qobjects/qumlenumerationobject.cpp
+++ b/src/uml/qobjects/qumlenumerationobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlenumerationobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlEnumeration>
 #include <QtUml/QUmlClassifier>
@@ -73,16 +74,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlEnumerationObject::QUmlEnumerationObject(QUmlEnumeration *qModelingObject)
+QUmlEnumerationObject::QUmlEnumerationObject(QUmlEnumeration *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlEnumerationObject::~QUmlEnumerationObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlEnumeration *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -91,25 +94,25 @@ QUmlEnumerationObject::~QUmlEnumerationObject()
 const QSet<QObject *> QUmlEnumerationObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlEnumeration *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlEnumerationObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlEnumeration *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlEnumerationObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlEnumeration *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlEnumeration *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -117,35 +120,35 @@ QObject *QUmlEnumerationObject::owner() const
 const QSet<QObject *> QUmlEnumerationObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlEnumeration *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlEnumerationObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlEnumeration *>(this)->name();
 }
 
 QObject *QUmlEnumerationObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlEnumeration *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlEnumeration *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlEnumerationObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlEnumeration *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlEnumeration *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlEnumerationObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlEnumeration *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [Namespace]
@@ -153,48 +156,48 @@ QString QUmlEnumerationObject::qualifiedName() const
 const QSet<QObject *> QUmlEnumerationObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlEnumeration *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlEnumerationObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlEnumeration *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlEnumerationObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlEnumeration *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlEnumerationObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlEnumeration *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlEnumerationObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlEnumeration *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlEnumerationObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlEnumeration *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -202,49 +205,49 @@ const QSet<QObject *> QUmlEnumerationObject::packageImports() const
 
 QObject *QUmlEnumerationObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlEnumeration *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlEnumeration *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlEnumerationObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlEnumeration *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Type]
 
 QObject *QUmlEnumerationObject::package() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->package())
+    if (!qmodelingelementproperty_cast<QUmlEnumeration *>(this)->package())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->package()->asQObject();
+        return qmodelingelementproperty_cast<QUmlEnumeration *>(this)->package()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlEnumerationObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlEnumeration *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlEnumerationObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlEnumeration *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlEnumerationObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlEnumeration *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -253,8 +256,8 @@ const QSet<QObject *> QUmlEnumerationObject::redefinitionContexts() const
 const QSet<QObject *> QUmlEnumerationObject::templateBindings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTemplateBinding *element, qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->templateBindings())
-        set.insert(element->asQObject());
+    foreach (QUmlTemplateBinding *element, qmodelingelementproperty_cast<QUmlEnumeration *>(this)->templateBindings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -263,122 +266,122 @@ const QSet<QObject *> QUmlEnumerationObject::templateBindings() const
 const QSet<QObject *> QUmlEnumerationObject::attributes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->attributes())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlEnumeration *>(this)->attributes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlEnumerationObject::collaborationUses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlCollaborationUse *element, qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->collaborationUses())
-        set.insert(element->asQObject());
+    foreach (QUmlCollaborationUse *element, qmodelingelementproperty_cast<QUmlEnumeration *>(this)->collaborationUses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlEnumerationObject::features() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->features())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlEnumeration *>(this)->features())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlEnumerationObject::generals() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->generals())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlEnumeration *>(this)->generals())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlEnumerationObject::generalizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralization *element, qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->generalizations())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralization *element, qmodelingelementproperty_cast<QUmlEnumeration *>(this)->generalizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlEnumerationObject::inheritedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->inheritedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlEnumeration *>(this)->inheritedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlEnumerationObject::isAbstract() const
 {
-    return qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->isAbstract();
+    return qmodelingelementproperty_cast<QUmlEnumeration *>(this)->isAbstract();
 }
 
 bool QUmlEnumerationObject::isFinalSpecialization() const
 {
-    return qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->isFinalSpecialization();
+    return qmodelingelementproperty_cast<QUmlEnumeration *>(this)->isFinalSpecialization();
 }
 
 QObject *QUmlEnumerationObject::ownedTemplateSignature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->ownedTemplateSignature())
+    if (!qmodelingelementproperty_cast<QUmlEnumeration *>(this)->ownedTemplateSignature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->ownedTemplateSignature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlEnumeration *>(this)->ownedTemplateSignature()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlEnumerationObject::ownedUseCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->ownedUseCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlEnumeration *>(this)->ownedUseCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlEnumerationObject::powertypeExtents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralizationSet *element, qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->powertypeExtents())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralizationSet *element, qmodelingelementproperty_cast<QUmlEnumeration *>(this)->powertypeExtents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlEnumerationObject::redefinedClassifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->redefinedClassifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlEnumeration *>(this)->redefinedClassifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlEnumerationObject::representation() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->representation())
+    if (!qmodelingelementproperty_cast<QUmlEnumeration *>(this)->representation())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->representation()->asQObject();
+        return qmodelingelementproperty_cast<QUmlEnumeration *>(this)->representation()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlEnumerationObject::substitutions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlSubstitution *element, qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->substitutions())
-        set.insert(element->asQObject());
+    foreach (QUmlSubstitution *element, qmodelingelementproperty_cast<QUmlEnumeration *>(this)->substitutions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlEnumerationObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlEnumeration *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlEnumeration *>(this)->templateParameter()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlEnumerationObject::useCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->useCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlEnumeration *>(this)->useCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -387,16 +390,16 @@ const QSet<QObject *> QUmlEnumerationObject::useCases() const
 const QList<QObject *> QUmlEnumerationObject::ownedAttributes() const
 {
     QList<QObject *> list;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->ownedAttributes())
-        list.append(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlEnumeration *>(this)->ownedAttributes())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QList<QObject *> QUmlEnumerationObject::ownedOperations() const
 {
     QList<QObject *> list;
-    foreach (QUmlOperation *element, qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->ownedOperations())
-        list.append(element->asQObject());
+    foreach (QUmlOperation *element, qmodelingelementproperty_cast<QUmlEnumeration *>(this)->ownedOperations())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -405,8 +408,8 @@ const QList<QObject *> QUmlEnumerationObject::ownedOperations() const
 const QList<QObject *> QUmlEnumerationObject::ownedLiterals() const
 {
     QList<QObject *> list;
-    foreach (QUmlEnumerationLiteral *element, qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->ownedLiterals())
-        list.append(element->asQObject());
+    foreach (QUmlEnumerationLiteral *element, qmodelingelementproperty_cast<QUmlEnumeration *>(this)->ownedLiterals())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -415,14 +418,14 @@ const QList<QObject *> QUmlEnumerationObject::ownedLiterals() const
 QSet<QObject *> QUmlEnumerationObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlEnumeration *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlEnumerationObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlEnumeration *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -430,27 +433,27 @@ bool QUmlEnumerationObject::mustBeOwned() const
 QList<QObject *> QUmlEnumerationObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlEnumeration *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlEnumerationObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlEnumeration *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlEnumerationObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlEnumeration *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlEnumerationObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlEnumeration *>(this)->separator();
 }
 
 // OPERATIONS [Namespace]
@@ -459,44 +462,44 @@ QSet<QObject *> QUmlEnumerationObject::excludeCollisions(QSet<QObject *> imps) c
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlEnumeration *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlEnumerationObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlEnumeration *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlEnumerationObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlEnumeration *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlEnumerationObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlEnumeration *>(this)->membersAreDistinguishable();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlEnumerationObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlEnumeration *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlEnumerationObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlEnumeration *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [Type]
@@ -504,12 +507,12 @@ bool QUmlEnumerationObject::isTemplateParameter() const
 
 bool QUmlEnumerationObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlEnumeration *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlEnumerationObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlEnumeration *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [TemplateableElement]
@@ -517,8 +520,8 @@ bool QUmlEnumerationObject::isRedefinitionContextValid(QObject *redefined) const
 QSet<QObject *> QUmlEnumerationObject::parameterableElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterableElement *element, qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->parameterableElements())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterableElement *element, qmodelingelementproperty_cast<QUmlEnumeration *>(this)->parameterableElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -527,52 +530,52 @@ QSet<QObject *> QUmlEnumerationObject::parameterableElements() const
 QSet<QObject *> QUmlEnumerationObject::allFeatures() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->allFeatures())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlEnumeration *>(this)->allFeatures())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlEnumerationObject::allParents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->allParents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlEnumeration *>(this)->allParents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlEnumerationObject::conformsTo(QObject *other) const
 {
-    return qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->conformsTo(qmodelingobjectproperty_cast<QUmlClassifier *>(other));
+    return qmodelingelementproperty_cast<QUmlEnumeration *>(this)->conformsTo(qmodelingelementproperty_cast<QUmlClassifier *>(other));
 }
 
 bool QUmlEnumerationObject::hasVisibilityOf(QObject *n) const
 {
-    return qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->hasVisibilityOf(qmodelingobjectproperty_cast<QUmlNamedElement *>(n));
+    return qmodelingelementproperty_cast<QUmlEnumeration *>(this)->hasVisibilityOf(qmodelingelementproperty_cast<QUmlNamedElement *>(n));
 }
 
 QSet<QObject *> QUmlEnumerationObject::inheritableMembers(QObject *c) const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->inheritableMembers(qmodelingobjectproperty_cast<QUmlClassifier *>(c)))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlEnumeration *>(this)->inheritableMembers(qmodelingelementproperty_cast<QUmlClassifier *>(c)))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlEnumerationObject::isTemplate() const
 {
-    return qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->isTemplate();
+    return qmodelingelementproperty_cast<QUmlEnumeration *>(this)->isTemplate();
 }
 
 bool QUmlEnumerationObject::maySpecializeType(QObject *c) const
 {
-    return qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->maySpecializeType(qmodelingobjectproperty_cast<QUmlClassifier *>(c));
+    return qmodelingelementproperty_cast<QUmlEnumeration *>(this)->maySpecializeType(qmodelingelementproperty_cast<QUmlClassifier *>(c));
 }
 
 QSet<QObject *> QUmlEnumerationObject::parents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->parents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlEnumeration *>(this)->parents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -582,10 +585,10 @@ QSet<QObject *> QUmlEnumerationObject::inherit(QSet<QObject *> inhs) const
 {
     QSet<QUmlNamedElement *> inhsConverted;
     foreach (QObject *object, inhs)
-        inhsConverted.insert(qmodelingobjectproperty_cast<QUmlNamedElement *>(object));
+        inhsConverted.insert(qmodelingelementproperty_cast<QUmlNamedElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->inherit(inhsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlEnumeration *>(this)->inherit(inhsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -593,370 +596,459 @@ QSet<QObject *> QUmlEnumerationObject::inherit(QSet<QObject *> inhs) const
 
 void QUmlEnumerationObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlEnumerationObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlEnumerationObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlEnumerationObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlEnumerationObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlEnumerationObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlEnumerationObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlEnumerationObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->setName(name);
 }
 
 void QUmlEnumerationObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlEnumerationObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlEnumerationObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlEnumerationObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlEnumerationObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlEnumerationObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlEnumerationObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlEnumerationObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlEnumerationObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlEnumerationObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlEnumerationObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlEnumerationObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlEnumerationObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlEnumerationObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlEnumerationObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlEnumerationObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlEnumerationObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->setVisibility(visibility);
 }
 
 void QUmlEnumerationObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Type]
 
 void QUmlEnumerationObject::setPackage(QObject *package)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->setPackage(qmodelingobjectproperty_cast<QUmlPackage *>(package));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->setPackage(qmodelingelementproperty_cast<QUmlPackage *>(package));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlEnumerationObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlEnumerationObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlEnumerationObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlEnumerationObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlEnumerationObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlEnumerationObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateableElement]
 
 void QUmlEnumerationObject::addTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->addTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->addTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 void QUmlEnumerationObject::removeTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->removeTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->removeTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Classifier]
 
 void QUmlEnumerationObject::addAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->addAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->addAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlEnumerationObject::removeAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->removeAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->removeAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlEnumerationObject::addCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->addCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->addCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlEnumerationObject::removeCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->removeCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->removeCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlEnumerationObject::addFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->addFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->addFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlEnumerationObject::removeFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->removeFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->removeFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlEnumerationObject::addGeneral(QObject *general)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->addGeneral(qmodelingobjectproperty_cast<QUmlClassifier *>(general));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->addGeneral(qmodelingelementproperty_cast<QUmlClassifier *>(general));
 }
 
 void QUmlEnumerationObject::removeGeneral(QObject *general)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->removeGeneral(qmodelingobjectproperty_cast<QUmlClassifier *>(general));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->removeGeneral(qmodelingelementproperty_cast<QUmlClassifier *>(general));
 }
 
 void QUmlEnumerationObject::addGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->addGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->addGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlEnumerationObject::removeGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->removeGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->removeGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlEnumerationObject::addInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->addInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->addInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlEnumerationObject::removeInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->removeInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->removeInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlEnumerationObject::setAbstract(bool isAbstract)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->setAbstract(isAbstract);
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->setAbstract(isAbstract);
 }
 
 void QUmlEnumerationObject::unsetAbstract()
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("abstract"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
 void QUmlEnumerationObject::setFinalSpecialization(bool isFinalSpecialization)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->setFinalSpecialization(isFinalSpecialization);
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->setFinalSpecialization(isFinalSpecialization);
 }
 
 void QUmlEnumerationObject::unsetFinalSpecialization()
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("finalSpecialization"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
 void QUmlEnumerationObject::setOwnedTemplateSignature(QObject *ownedTemplateSignature)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->setOwnedTemplateSignature(qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->setOwnedTemplateSignature(qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
 }
 
 void QUmlEnumerationObject::addOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->addOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->addOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlEnumerationObject::removeOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->removeOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->removeOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlEnumerationObject::addPowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->addPowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->addPowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlEnumerationObject::removePowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->removePowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->removePowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlEnumerationObject::addRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->addRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->addRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlEnumerationObject::removeRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->removeRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->removeRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlEnumerationObject::setRepresentation(QObject *representation)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->setRepresentation(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(representation));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->setRepresentation(qmodelingelementproperty_cast<QUmlCollaborationUse *>(representation));
 }
 
 void QUmlEnumerationObject::addSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->addSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->addSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlEnumerationObject::removeSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->removeSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->removeSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlEnumerationObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
 }
 
 void QUmlEnumerationObject::addUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->addUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->addUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 void QUmlEnumerationObject::removeUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->removeUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->removeUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [DataType]
 
 void QUmlEnumerationObject::addOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->addOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->addOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlEnumerationObject::removeOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->removeOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->removeOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlEnumerationObject::addOwnedOperation(QObject *ownedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->addOwnedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(ownedOperation));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->addOwnedOperation(qmodelingelementproperty_cast<QUmlOperation *>(ownedOperation));
 }
 
 void QUmlEnumerationObject::removeOwnedOperation(QObject *ownedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->removeOwnedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(ownedOperation));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->removeOwnedOperation(qmodelingelementproperty_cast<QUmlOperation *>(ownedOperation));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Enumeration]
 
 void QUmlEnumerationObject::addOwnedLiteral(QObject *ownedLiteral)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->addOwnedLiteral(qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(ownedLiteral));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->addOwnedLiteral(qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(ownedLiteral));
 }
 
 void QUmlEnumerationObject::removeOwnedLiteral(QObject *ownedLiteral)
 {
-    qmodelingobjectproperty_cast<QUmlEnumeration *>(this)->removeOwnedLiteral(qmodelingobjectproperty_cast<QUmlEnumerationLiteral *>(ownedLiteral));
+    qmodelingelementproperty_cast<QUmlEnumeration *>(this)->removeOwnedLiteral(qmodelingelementproperty_cast<QUmlEnumerationLiteral *>(ownedLiteral));
+}
+
+
+void QUmlEnumerationObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlType");
+    d->groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generals"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDataType");
+    d->groupProperties.insert(QStringLiteral("QUmlDataType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDataType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
+
+    d->propertyGroups << QStringLiteral("QUmlEnumeration");
+    d->groupProperties.insert(QStringLiteral("QUmlEnumeration"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedLiterals"))));
+}
+
+void QUmlEnumerationObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlEnumeration, ownedLiterals, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlEnumeration, ownedLiterals, PropertyClassRole, QStringLiteral("QUmlEnumeration"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlEnumeration, ownedLiterals, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlEnumeration, ownedLiterals, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlEnumeration, ownedLiterals, DocumentationRole, QStringLiteral("The ordered set of literals for this Enumeration."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlEnumeration, ownedLiterals, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlEnumeration, ownedLiterals, SubsettedPropertiesRole, QStringLiteral("Namespace-ownedMember"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlEnumeration, ownedLiterals, OppositeEndRole, QStringLiteral("EnumerationLiteral-enumeration"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlenumerationobject_p.h b/src/uml/qobjects/qumlenumerationobject_p.h
index 7dc53cb7..e03f244a 100644
--- a/src/uml/qobjects/qumlenumerationobject_p.h
+++ b/src/uml/qobjects/qumlenumerationobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlEnumeration;
-class Q_UML_EXPORT QUmlEnumerationObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlEnumerationObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlEnumerationObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -121,7 +124,7 @@ class Q_UML_EXPORT QUmlEnumerationObject : public QObject
     Q_PROPERTY(QList<QObject *> ownedLiterals READ ownedLiterals)
 
 public:
-    Q_INVOKABLE explicit QUmlEnumerationObject(QUmlEnumeration *qModelingObject);
+    Q_INVOKABLE explicit QUmlEnumerationObject(QUmlEnumeration *qModelingElement);
     virtual ~QUmlEnumerationObject();
 
     // Owned attributes [Element]
@@ -321,6 +324,10 @@ public Q_SLOTS:
     // Slots for owned attributes [Enumeration]
     void addOwnedLiteral(QObject *ownedLiteral);
     void removeOwnedLiteral(QObject *ownedLiteral);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlexceptionhandlerobject.cpp b/src/uml/qobjects/qumlexceptionhandlerobject.cpp
index d2794b3b..23b9e6fd 100644
--- a/src/uml/qobjects/qumlexceptionhandlerobject.cpp
+++ b/src/uml/qobjects/qumlexceptionhandlerobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlexceptionhandlerobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlExceptionHandler>
 #include <QtUml/QUmlClassifier>
@@ -49,16 +50,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlExceptionHandlerObject::QUmlExceptionHandlerObject(QUmlExceptionHandler *qModelingObject)
+QUmlExceptionHandlerObject::QUmlExceptionHandlerObject(QUmlExceptionHandler *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlExceptionHandlerObject::~QUmlExceptionHandlerObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlExceptionHandler *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlExceptionHandler *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -67,59 +70,59 @@ QUmlExceptionHandlerObject::~QUmlExceptionHandlerObject()
 const QSet<QObject *> QUmlExceptionHandlerObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlExceptionHandler *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlExceptionHandler *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExceptionHandlerObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlExceptionHandler *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlExceptionHandler *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlExceptionHandlerObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExceptionHandler *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlExceptionHandler *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExceptionHandler *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExceptionHandler *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ExceptionHandler]
 
 QObject *QUmlExceptionHandlerObject::exceptionInput() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExceptionHandler *>(this)->exceptionInput())
+    if (!qmodelingelementproperty_cast<QUmlExceptionHandler *>(this)->exceptionInput())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExceptionHandler *>(this)->exceptionInput()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExceptionHandler *>(this)->exceptionInput()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlExceptionHandlerObject::exceptionTypes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlExceptionHandler *>(this)->exceptionTypes())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlExceptionHandler *>(this)->exceptionTypes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlExceptionHandlerObject::handlerBody() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExceptionHandler *>(this)->handlerBody())
+    if (!qmodelingelementproperty_cast<QUmlExceptionHandler *>(this)->handlerBody())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExceptionHandler *>(this)->handlerBody()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExceptionHandler *>(this)->handlerBody()->asQModelingObject();
 }
 
 QObject *QUmlExceptionHandlerObject::protectedNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExceptionHandler *>(this)->protectedNode())
+    if (!qmodelingelementproperty_cast<QUmlExceptionHandler *>(this)->protectedNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExceptionHandler *>(this)->protectedNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExceptionHandler *>(this)->protectedNode()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -127,68 +130,129 @@ QObject *QUmlExceptionHandlerObject::protectedNode() const
 QSet<QObject *> QUmlExceptionHandlerObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlExceptionHandler *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlExceptionHandler *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlExceptionHandlerObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlExceptionHandler *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlExceptionHandler *>(this)->mustBeOwned();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlExceptionHandlerObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlExceptionHandler *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlExceptionHandler *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlExceptionHandlerObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlExceptionHandler *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlExceptionHandler *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlExceptionHandlerObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExceptionHandler *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlExceptionHandler *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlExceptionHandlerObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExceptionHandler *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlExceptionHandler *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlExceptionHandlerObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlExceptionHandler *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlExceptionHandler *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExceptionHandler]
 
 void QUmlExceptionHandlerObject::setExceptionInput(QObject *exceptionInput)
 {
-    qmodelingobjectproperty_cast<QUmlExceptionHandler *>(this)->setExceptionInput(qmodelingobjectproperty_cast<QUmlObjectNode *>(exceptionInput));
+    qmodelingelementproperty_cast<QUmlExceptionHandler *>(this)->setExceptionInput(qmodelingelementproperty_cast<QUmlObjectNode *>(exceptionInput));
 }
 
 void QUmlExceptionHandlerObject::addExceptionType(QObject *exceptionType)
 {
-    qmodelingobjectproperty_cast<QUmlExceptionHandler *>(this)->addExceptionType(qmodelingobjectproperty_cast<QUmlClassifier *>(exceptionType));
+    qmodelingelementproperty_cast<QUmlExceptionHandler *>(this)->addExceptionType(qmodelingelementproperty_cast<QUmlClassifier *>(exceptionType));
 }
 
 void QUmlExceptionHandlerObject::removeExceptionType(QObject *exceptionType)
 {
-    qmodelingobjectproperty_cast<QUmlExceptionHandler *>(this)->removeExceptionType(qmodelingobjectproperty_cast<QUmlClassifier *>(exceptionType));
+    qmodelingelementproperty_cast<QUmlExceptionHandler *>(this)->removeExceptionType(qmodelingelementproperty_cast<QUmlClassifier *>(exceptionType));
 }
 
 void QUmlExceptionHandlerObject::setHandlerBody(QObject *handlerBody)
 {
-    qmodelingobjectproperty_cast<QUmlExceptionHandler *>(this)->setHandlerBody(qmodelingobjectproperty_cast<QUmlExecutableNode *>(handlerBody));
+    qmodelingelementproperty_cast<QUmlExceptionHandler *>(this)->setHandlerBody(qmodelingelementproperty_cast<QUmlExecutableNode *>(handlerBody));
 }
 
 void QUmlExceptionHandlerObject::setProtectedNode(QObject *protectedNode)
 {
-    qmodelingobjectproperty_cast<QUmlExceptionHandler *>(this)->setProtectedNode(qmodelingobjectproperty_cast<QUmlExecutableNode *>(protectedNode));
+    qmodelingelementproperty_cast<QUmlExceptionHandler *>(this)->setProtectedNode(qmodelingelementproperty_cast<QUmlExecutableNode *>(protectedNode));
+}
+
+
+void QUmlExceptionHandlerObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExceptionHandler");
+    d->groupProperties.insert(QStringLiteral("QUmlExceptionHandler"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("exceptionInput"))));
+    d->groupProperties.insert(QStringLiteral("QUmlExceptionHandler"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("exceptionTypes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlExceptionHandler"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlerBody"))));
+    d->groupProperties.insert(QStringLiteral("QUmlExceptionHandler"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("protectedNode"))));
+}
+
+void QUmlExceptionHandlerObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExceptionHandler, exceptionInput, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExceptionHandler, exceptionInput, PropertyClassRole, QStringLiteral("QUmlExceptionHandler"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExceptionHandler, exceptionInput, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExceptionHandler, exceptionInput, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExceptionHandler, exceptionInput, DocumentationRole, QStringLiteral("An object node within the handler body. When the handler catches an exception, the exception token is placed in this node, causing the body to execute."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExceptionHandler, exceptionInput, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExceptionHandler, exceptionInput, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExceptionHandler, exceptionInput, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExceptionHandler, exceptionTypes, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExceptionHandler, exceptionTypes, PropertyClassRole, QStringLiteral("QUmlExceptionHandler"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExceptionHandler, exceptionTypes, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExceptionHandler, exceptionTypes, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExceptionHandler, exceptionTypes, DocumentationRole, QStringLiteral("The kind of instances that the handler catches. If an exception occurs whose type is any of the classifiers in the set, the handler catches the exception and executes its body."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExceptionHandler, exceptionTypes, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExceptionHandler, exceptionTypes, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExceptionHandler, exceptionTypes, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExceptionHandler, handlerBody, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExceptionHandler, handlerBody, PropertyClassRole, QStringLiteral("QUmlExceptionHandler"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExceptionHandler, handlerBody, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExceptionHandler, handlerBody, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExceptionHandler, handlerBody, DocumentationRole, QStringLiteral("A node that is executed if the handler satisfies an uncaught exception."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExceptionHandler, handlerBody, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExceptionHandler, handlerBody, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExceptionHandler, handlerBody, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExceptionHandler, protectedNode, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExceptionHandler, protectedNode, PropertyClassRole, QStringLiteral("QUmlExceptionHandler"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExceptionHandler, protectedNode, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExceptionHandler, protectedNode, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExceptionHandler, protectedNode, DocumentationRole, QStringLiteral("The node protected by the handler. The handler is examined if an exception propagates to the outside of the node."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExceptionHandler, protectedNode, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExceptionHandler, protectedNode, SubsettedPropertiesRole, QStringLiteral("Element-owner"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExceptionHandler, protectedNode, OppositeEndRole, QStringLiteral("ExecutableNode-handler"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlexceptionhandlerobject_p.h b/src/uml/qobjects/qumlexceptionhandlerobject_p.h
index 51fa7133..786e5b38 100644
--- a/src/uml/qobjects/qumlexceptionhandlerobject_p.h
+++ b/src/uml/qobjects/qumlexceptionhandlerobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 QT_BEGIN_HEADER
 
@@ -52,9 +52,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlExceptionHandler;
-class Q_UML_EXPORT QUmlExceptionHandlerObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlExceptionHandlerObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlExceptionHandlerObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -68,7 +71,7 @@ class Q_UML_EXPORT QUmlExceptionHandlerObject : public QObject
     Q_PROPERTY(QObject * protectedNode READ protectedNode WRITE setProtectedNode)
 
 public:
-    Q_INVOKABLE explicit QUmlExceptionHandlerObject(QUmlExceptionHandler *qModelingObject);
+    Q_INVOKABLE explicit QUmlExceptionHandlerObject(QUmlExceptionHandler *qModelingElement);
     virtual ~QUmlExceptionHandlerObject();
 
     // Owned attributes [Element]
@@ -101,6 +104,10 @@ public Q_SLOTS:
     void removeExceptionType(QObject *exceptionType);
     void setHandlerBody(QObject *handlerBody = 0);
     void setProtectedNode(QObject *protectedNode = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlexecutionenvironmentobject.cpp b/src/uml/qobjects/qumlexecutionenvironmentobject.cpp
index 0b659a17..ad01a116 100644
--- a/src/uml/qobjects/qumlexecutionenvironmentobject.cpp
+++ b/src/uml/qobjects/qumlexecutionenvironmentobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlexecutionenvironmentobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlExecutionEnvironment>
 #include <QtUml/QUmlBehavior>
@@ -82,16 +83,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlExecutionEnvironmentObject::QUmlExecutionEnvironmentObject(QUmlExecutionEnvironment *qModelingObject)
+QUmlExecutionEnvironmentObject::QUmlExecutionEnvironmentObject(QUmlExecutionEnvironment *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlExecutionEnvironmentObject::~QUmlExecutionEnvironmentObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -100,25 +103,25 @@ QUmlExecutionEnvironmentObject::~QUmlExecutionEnvironmentObject()
 const QSet<QObject *> QUmlExecutionEnvironmentObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExecutionEnvironmentObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlExecutionEnvironmentObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -126,35 +129,35 @@ QObject *QUmlExecutionEnvironmentObject::owner() const
 const QSet<QObject *> QUmlExecutionEnvironmentObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlExecutionEnvironmentObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->name();
 }
 
 QObject *QUmlExecutionEnvironmentObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlExecutionEnvironmentObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlExecutionEnvironmentObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [Namespace]
@@ -162,48 +165,48 @@ QString QUmlExecutionEnvironmentObject::qualifiedName() const
 const QSet<QObject *> QUmlExecutionEnvironmentObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExecutionEnvironmentObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExecutionEnvironmentObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExecutionEnvironmentObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExecutionEnvironmentObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExecutionEnvironmentObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -211,49 +214,49 @@ const QSet<QObject *> QUmlExecutionEnvironmentObject::packageImports() const
 
 QObject *QUmlExecutionEnvironmentObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlExecutionEnvironmentObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Type]
 
 QObject *QUmlExecutionEnvironmentObject::package() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->package())
+    if (!qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->package())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->package()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->package()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlExecutionEnvironmentObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlExecutionEnvironmentObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExecutionEnvironmentObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -262,8 +265,8 @@ const QSet<QObject *> QUmlExecutionEnvironmentObject::redefinitionContexts() con
 const QSet<QObject *> QUmlExecutionEnvironmentObject::templateBindings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTemplateBinding *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->templateBindings())
-        set.insert(element->asQObject());
+    foreach (QUmlTemplateBinding *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->templateBindings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -272,109 +275,109 @@ const QSet<QObject *> QUmlExecutionEnvironmentObject::templateBindings() const
 const QSet<QObject *> QUmlExecutionEnvironmentObject::attributes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->attributes())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->attributes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExecutionEnvironmentObject::collaborationUses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlCollaborationUse *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->collaborationUses())
-        set.insert(element->asQObject());
+    foreach (QUmlCollaborationUse *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->collaborationUses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExecutionEnvironmentObject::features() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->features())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->features())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExecutionEnvironmentObject::generalizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralization *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->generalizations())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralization *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->generalizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExecutionEnvironmentObject::inheritedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->inheritedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->inheritedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlExecutionEnvironmentObject::isFinalSpecialization() const
 {
-    return qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->isFinalSpecialization();
+    return qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->isFinalSpecialization();
 }
 
 QObject *QUmlExecutionEnvironmentObject::ownedTemplateSignature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->ownedTemplateSignature())
+    if (!qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->ownedTemplateSignature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->ownedTemplateSignature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->ownedTemplateSignature()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlExecutionEnvironmentObject::ownedUseCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->ownedUseCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->ownedUseCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExecutionEnvironmentObject::powertypeExtents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralizationSet *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->powertypeExtents())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralizationSet *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->powertypeExtents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExecutionEnvironmentObject::redefinedClassifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->redefinedClassifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->redefinedClassifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlExecutionEnvironmentObject::representation() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->representation())
+    if (!qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->representation())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->representation()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->representation()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlExecutionEnvironmentObject::substitutions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlSubstitution *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->substitutions())
-        set.insert(element->asQObject());
+    foreach (QUmlSubstitution *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->substitutions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlExecutionEnvironmentObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->templateParameter()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlExecutionEnvironmentObject::useCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->useCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->useCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -383,24 +386,24 @@ const QSet<QObject *> QUmlExecutionEnvironmentObject::useCases() const
 const QSet<QObject *> QUmlExecutionEnvironmentObject::ownedConnectors() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConnector *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->ownedConnectors())
-        set.insert(element->asQObject());
+    foreach (QUmlConnector *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->ownedConnectors())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExecutionEnvironmentObject::parts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->parts())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->parts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExecutionEnvironmentObject::roles() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConnectableElement *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->roles())
-        set.insert(element->asQObject());
+    foreach (QUmlConnectableElement *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->roles())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -409,8 +412,8 @@ const QSet<QObject *> QUmlExecutionEnvironmentObject::roles() const
 const QSet<QObject *> QUmlExecutionEnvironmentObject::ownedPorts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPort *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->ownedPorts())
-        set.insert(element->asQObject());
+    foreach (QUmlPort *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->ownedPorts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -418,25 +421,25 @@ const QSet<QObject *> QUmlExecutionEnvironmentObject::ownedPorts() const
 
 QObject *QUmlExecutionEnvironmentObject::classifierBehavior() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->classifierBehavior())
+    if (!qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->classifierBehavior())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->classifierBehavior()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->classifierBehavior()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlExecutionEnvironmentObject::interfaceRealizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterfaceRealization *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->interfaceRealizations())
-        set.insert(element->asQObject());
+    foreach (QUmlInterfaceRealization *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->interfaceRealizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExecutionEnvironmentObject::ownedBehaviors() const
 {
     QSet<QObject *> set;
-    foreach (QUmlBehavior *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->ownedBehaviors())
-        set.insert(element->asQObject());
+    foreach (QUmlBehavior *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->ownedBehaviors())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -445,58 +448,58 @@ const QSet<QObject *> QUmlExecutionEnvironmentObject::ownedBehaviors() const
 const QSet<QObject *> QUmlExecutionEnvironmentObject::extensions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExtension *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->extensions())
-        set.insert(element->asQObject());
+    foreach (QUmlExtension *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->extensions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlExecutionEnvironmentObject::isAbstract() const
 {
-    return qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->isAbstract();
+    return qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->isAbstract();
 }
 
 bool QUmlExecutionEnvironmentObject::isActive() const
 {
-    return qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->isActive();
+    return qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->isActive();
 }
 
 const QList<QObject *> QUmlExecutionEnvironmentObject::nestedClassifiers() const
 {
     QList<QObject *> list;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->nestedClassifiers())
-        list.append(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->nestedClassifiers())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QList<QObject *> QUmlExecutionEnvironmentObject::ownedAttributes() const
 {
     QList<QObject *> list;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->ownedAttributes())
-        list.append(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->ownedAttributes())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QList<QObject *> QUmlExecutionEnvironmentObject::ownedOperations() const
 {
     QList<QObject *> list;
-    foreach (QUmlOperation *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->ownedOperations())
-        list.append(element->asQObject());
+    foreach (QUmlOperation *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->ownedOperations())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QSet<QObject *> QUmlExecutionEnvironmentObject::ownedReceptions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlReception *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->ownedReceptions())
-        set.insert(element->asQObject());
+    foreach (QUmlReception *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->ownedReceptions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExecutionEnvironmentObject::superClasses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClass *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->superClasses())
-        set.insert(element->asQObject());
+    foreach (QUmlClass *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->superClasses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -505,16 +508,16 @@ const QSet<QObject *> QUmlExecutionEnvironmentObject::superClasses() const
 const QSet<QObject *> QUmlExecutionEnvironmentObject::deployedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->deployedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->deployedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExecutionEnvironmentObject::deployments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDeployment *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->deployments())
-        set.insert(element->asQObject());
+    foreach (QUmlDeployment *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->deployments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -523,8 +526,8 @@ const QSet<QObject *> QUmlExecutionEnvironmentObject::deployments() const
 const QSet<QObject *> QUmlExecutionEnvironmentObject::nestedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNode *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->nestedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlNode *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->nestedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -533,14 +536,14 @@ const QSet<QObject *> QUmlExecutionEnvironmentObject::nestedNodes() const
 QSet<QObject *> QUmlExecutionEnvironmentObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlExecutionEnvironmentObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -548,27 +551,27 @@ bool QUmlExecutionEnvironmentObject::mustBeOwned() const
 QList<QObject *> QUmlExecutionEnvironmentObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlExecutionEnvironmentObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlExecutionEnvironmentObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlExecutionEnvironmentObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->separator();
 }
 
 // OPERATIONS [Namespace]
@@ -577,44 +580,44 @@ QSet<QObject *> QUmlExecutionEnvironmentObject::excludeCollisions(QSet<QObject *
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlExecutionEnvironmentObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlExecutionEnvironmentObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlExecutionEnvironmentObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->membersAreDistinguishable();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlExecutionEnvironmentObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlExecutionEnvironmentObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [Type]
@@ -622,12 +625,12 @@ bool QUmlExecutionEnvironmentObject::isTemplateParameter() const
 
 bool QUmlExecutionEnvironmentObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlExecutionEnvironmentObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [TemplateableElement]
@@ -635,8 +638,8 @@ bool QUmlExecutionEnvironmentObject::isRedefinitionContextValid(QObject *redefin
 QSet<QObject *> QUmlExecutionEnvironmentObject::parameterableElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterableElement *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->parameterableElements())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterableElement *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->parameterableElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -645,52 +648,52 @@ QSet<QObject *> QUmlExecutionEnvironmentObject::parameterableElements() const
 QSet<QObject *> QUmlExecutionEnvironmentObject::allFeatures() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->allFeatures())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->allFeatures())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlExecutionEnvironmentObject::allParents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->allParents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->allParents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlExecutionEnvironmentObject::conformsTo(QObject *other) const
 {
-    return qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->conformsTo(qmodelingobjectproperty_cast<QUmlClassifier *>(other));
+    return qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->conformsTo(qmodelingelementproperty_cast<QUmlClassifier *>(other));
 }
 
 bool QUmlExecutionEnvironmentObject::hasVisibilityOf(QObject *n) const
 {
-    return qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->hasVisibilityOf(qmodelingobjectproperty_cast<QUmlNamedElement *>(n));
+    return qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->hasVisibilityOf(qmodelingelementproperty_cast<QUmlNamedElement *>(n));
 }
 
 QSet<QObject *> QUmlExecutionEnvironmentObject::inheritableMembers(QObject *c) const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->inheritableMembers(qmodelingobjectproperty_cast<QUmlClassifier *>(c)))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->inheritableMembers(qmodelingelementproperty_cast<QUmlClassifier *>(c)))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlExecutionEnvironmentObject::isTemplate() const
 {
-    return qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->isTemplate();
+    return qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->isTemplate();
 }
 
 bool QUmlExecutionEnvironmentObject::maySpecializeType(QObject *c) const
 {
-    return qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->maySpecializeType(qmodelingobjectproperty_cast<QUmlClassifier *>(c));
+    return qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->maySpecializeType(qmodelingelementproperty_cast<QUmlClassifier *>(c));
 }
 
 QSet<QObject *> QUmlExecutionEnvironmentObject::parents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->parents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->parents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -700,10 +703,10 @@ QSet<QObject *> QUmlExecutionEnvironmentObject::inherit(QSet<QObject *> inhs) co
 {
     QSet<QUmlNamedElement *> inhsConverted;
     foreach (QObject *object, inhs)
-        inhsConverted.insert(qmodelingobjectproperty_cast<QUmlNamedElement *>(object));
+        inhsConverted.insert(qmodelingelementproperty_cast<QUmlNamedElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->inherit(inhsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->inherit(inhsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -711,503 +714,607 @@ QSet<QObject *> QUmlExecutionEnvironmentObject::inherit(QSet<QObject *> inhs) co
 
 void QUmlExecutionEnvironmentObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlExecutionEnvironmentObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlExecutionEnvironmentObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlExecutionEnvironmentObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlExecutionEnvironmentObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlExecutionEnvironmentObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlExecutionEnvironmentObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlExecutionEnvironmentObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->setName(name);
 }
 
 void QUmlExecutionEnvironmentObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlExecutionEnvironmentObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlExecutionEnvironmentObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlExecutionEnvironmentObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlExecutionEnvironmentObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlExecutionEnvironmentObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlExecutionEnvironmentObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlExecutionEnvironmentObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlExecutionEnvironmentObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlExecutionEnvironmentObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlExecutionEnvironmentObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlExecutionEnvironmentObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlExecutionEnvironmentObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlExecutionEnvironmentObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlExecutionEnvironmentObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlExecutionEnvironmentObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlExecutionEnvironmentObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->setVisibility(visibility);
 }
 
 void QUmlExecutionEnvironmentObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Type]
 
 void QUmlExecutionEnvironmentObject::setPackage(QObject *package)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->setPackage(qmodelingobjectproperty_cast<QUmlPackage *>(package));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->setPackage(qmodelingelementproperty_cast<QUmlPackage *>(package));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlExecutionEnvironmentObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlExecutionEnvironmentObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlExecutionEnvironmentObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlExecutionEnvironmentObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlExecutionEnvironmentObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlExecutionEnvironmentObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateableElement]
 
 void QUmlExecutionEnvironmentObject::addTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->addTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->addTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 void QUmlExecutionEnvironmentObject::removeTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->removeTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->removeTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Classifier]
 
 void QUmlExecutionEnvironmentObject::addAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->addAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->addAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlExecutionEnvironmentObject::removeAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->removeAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->removeAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlExecutionEnvironmentObject::addCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->addCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->addCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlExecutionEnvironmentObject::removeCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->removeCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->removeCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlExecutionEnvironmentObject::addFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->addFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->addFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlExecutionEnvironmentObject::removeFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->removeFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->removeFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlExecutionEnvironmentObject::addGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->addGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->addGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlExecutionEnvironmentObject::removeGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->removeGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->removeGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlExecutionEnvironmentObject::addInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->addInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->addInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlExecutionEnvironmentObject::removeInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->removeInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->removeInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlExecutionEnvironmentObject::setFinalSpecialization(bool isFinalSpecialization)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->setFinalSpecialization(isFinalSpecialization);
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->setFinalSpecialization(isFinalSpecialization);
 }
 
 void QUmlExecutionEnvironmentObject::unsetFinalSpecialization()
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("finalSpecialization"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
 void QUmlExecutionEnvironmentObject::setOwnedTemplateSignature(QObject *ownedTemplateSignature)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->setOwnedTemplateSignature(qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->setOwnedTemplateSignature(qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
 }
 
 void QUmlExecutionEnvironmentObject::addOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->addOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->addOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlExecutionEnvironmentObject::removeOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->removeOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->removeOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlExecutionEnvironmentObject::addPowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->addPowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->addPowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlExecutionEnvironmentObject::removePowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->removePowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->removePowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlExecutionEnvironmentObject::addRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->addRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->addRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlExecutionEnvironmentObject::removeRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->removeRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->removeRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlExecutionEnvironmentObject::setRepresentation(QObject *representation)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->setRepresentation(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(representation));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->setRepresentation(qmodelingelementproperty_cast<QUmlCollaborationUse *>(representation));
 }
 
 void QUmlExecutionEnvironmentObject::addSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->addSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->addSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlExecutionEnvironmentObject::removeSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->removeSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->removeSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlExecutionEnvironmentObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
 }
 
 void QUmlExecutionEnvironmentObject::addUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->addUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->addUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 void QUmlExecutionEnvironmentObject::removeUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->removeUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->removeUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [StructuredClassifier]
 
 void QUmlExecutionEnvironmentObject::addOwnedConnector(QObject *ownedConnector)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->addOwnedConnector(qmodelingobjectproperty_cast<QUmlConnector *>(ownedConnector));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->addOwnedConnector(qmodelingelementproperty_cast<QUmlConnector *>(ownedConnector));
 }
 
 void QUmlExecutionEnvironmentObject::removeOwnedConnector(QObject *ownedConnector)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->removeOwnedConnector(qmodelingobjectproperty_cast<QUmlConnector *>(ownedConnector));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->removeOwnedConnector(qmodelingelementproperty_cast<QUmlConnector *>(ownedConnector));
 }
 
 void QUmlExecutionEnvironmentObject::addPart(QObject *part)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->addPart(qmodelingobjectproperty_cast<QUmlProperty *>(part));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->addPart(qmodelingelementproperty_cast<QUmlProperty *>(part));
 }
 
 void QUmlExecutionEnvironmentObject::removePart(QObject *part)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->removePart(qmodelingobjectproperty_cast<QUmlProperty *>(part));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->removePart(qmodelingelementproperty_cast<QUmlProperty *>(part));
 }
 
 void QUmlExecutionEnvironmentObject::addRole(QObject *role)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->addRole(qmodelingobjectproperty_cast<QUmlConnectableElement *>(role));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->addRole(qmodelingelementproperty_cast<QUmlConnectableElement *>(role));
 }
 
 void QUmlExecutionEnvironmentObject::removeRole(QObject *role)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->removeRole(qmodelingobjectproperty_cast<QUmlConnectableElement *>(role));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->removeRole(qmodelingelementproperty_cast<QUmlConnectableElement *>(role));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [EncapsulatedClassifier]
 
 void QUmlExecutionEnvironmentObject::addOwnedPort(QObject *ownedPort)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->addOwnedPort(qmodelingobjectproperty_cast<QUmlPort *>(ownedPort));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->addOwnedPort(qmodelingelementproperty_cast<QUmlPort *>(ownedPort));
 }
 
 void QUmlExecutionEnvironmentObject::removeOwnedPort(QObject *ownedPort)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->removeOwnedPort(qmodelingobjectproperty_cast<QUmlPort *>(ownedPort));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->removeOwnedPort(qmodelingelementproperty_cast<QUmlPort *>(ownedPort));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [BehavioredClassifier]
 
 void QUmlExecutionEnvironmentObject::setClassifierBehavior(QObject *classifierBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->setClassifierBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(classifierBehavior));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->setClassifierBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(classifierBehavior));
 }
 
 void QUmlExecutionEnvironmentObject::addInterfaceRealization(QObject *interfaceRealization)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->addInterfaceRealization(qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->addInterfaceRealization(qmodelingelementproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
 }
 
 void QUmlExecutionEnvironmentObject::removeInterfaceRealization(QObject *interfaceRealization)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->removeInterfaceRealization(qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->removeInterfaceRealization(qmodelingelementproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
 }
 
 void QUmlExecutionEnvironmentObject::addOwnedBehavior(QObject *ownedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->addOwnedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(ownedBehavior));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->addOwnedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(ownedBehavior));
 }
 
 void QUmlExecutionEnvironmentObject::removeOwnedBehavior(QObject *ownedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->removeOwnedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(ownedBehavior));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->removeOwnedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(ownedBehavior));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Class]
 
 void QUmlExecutionEnvironmentObject::addExtension(QObject *extension)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->addExtension(qmodelingobjectproperty_cast<QUmlExtension *>(extension));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->addExtension(qmodelingelementproperty_cast<QUmlExtension *>(extension));
 }
 
 void QUmlExecutionEnvironmentObject::removeExtension(QObject *extension)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->removeExtension(qmodelingobjectproperty_cast<QUmlExtension *>(extension));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->removeExtension(qmodelingelementproperty_cast<QUmlExtension *>(extension));
 }
 
 void QUmlExecutionEnvironmentObject::setAbstract(bool isAbstract)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->setAbstract(isAbstract);
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->setAbstract(isAbstract);
 }
 
 void QUmlExecutionEnvironmentObject::unsetAbstract()
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("abstract"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
 void QUmlExecutionEnvironmentObject::setActive(bool isActive)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->setActive(isActive);
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->setActive(isActive);
 }
 
 void QUmlExecutionEnvironmentObject::unsetActive()
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("active"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("active"));
 }
 
 void QUmlExecutionEnvironmentObject::addNestedClassifier(QObject *nestedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->addNestedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(nestedClassifier));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->addNestedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(nestedClassifier));
 }
 
 void QUmlExecutionEnvironmentObject::removeNestedClassifier(QObject *nestedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->removeNestedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(nestedClassifier));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->removeNestedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(nestedClassifier));
 }
 
 void QUmlExecutionEnvironmentObject::addOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->addOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->addOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlExecutionEnvironmentObject::removeOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->removeOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->removeOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlExecutionEnvironmentObject::addOwnedOperation(QObject *ownedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->addOwnedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(ownedOperation));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->addOwnedOperation(qmodelingelementproperty_cast<QUmlOperation *>(ownedOperation));
 }
 
 void QUmlExecutionEnvironmentObject::removeOwnedOperation(QObject *ownedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->removeOwnedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(ownedOperation));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->removeOwnedOperation(qmodelingelementproperty_cast<QUmlOperation *>(ownedOperation));
 }
 
 void QUmlExecutionEnvironmentObject::addOwnedReception(QObject *ownedReception)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->addOwnedReception(qmodelingobjectproperty_cast<QUmlReception *>(ownedReception));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->addOwnedReception(qmodelingelementproperty_cast<QUmlReception *>(ownedReception));
 }
 
 void QUmlExecutionEnvironmentObject::removeOwnedReception(QObject *ownedReception)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->removeOwnedReception(qmodelingobjectproperty_cast<QUmlReception *>(ownedReception));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->removeOwnedReception(qmodelingelementproperty_cast<QUmlReception *>(ownedReception));
 }
 
 void QUmlExecutionEnvironmentObject::addSuperClass(QObject *superClass)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->addSuperClass(qmodelingobjectproperty_cast<QUmlClass *>(superClass));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->addSuperClass(qmodelingelementproperty_cast<QUmlClass *>(superClass));
 }
 
 void QUmlExecutionEnvironmentObject::removeSuperClass(QObject *superClass)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->removeSuperClass(qmodelingobjectproperty_cast<QUmlClass *>(superClass));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->removeSuperClass(qmodelingelementproperty_cast<QUmlClass *>(superClass));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [DeploymentTarget]
 
 void QUmlExecutionEnvironmentObject::addDeployedElement(QObject *deployedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->addDeployedElement(qmodelingobjectproperty_cast<QUmlPackageableElement *>(deployedElement));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->addDeployedElement(qmodelingelementproperty_cast<QUmlPackageableElement *>(deployedElement));
 }
 
 void QUmlExecutionEnvironmentObject::removeDeployedElement(QObject *deployedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->removeDeployedElement(qmodelingobjectproperty_cast<QUmlPackageableElement *>(deployedElement));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->removeDeployedElement(qmodelingelementproperty_cast<QUmlPackageableElement *>(deployedElement));
 }
 
 void QUmlExecutionEnvironmentObject::addDeployment(QObject *deployment)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->addDeployment(qmodelingobjectproperty_cast<QUmlDeployment *>(deployment));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->addDeployment(qmodelingelementproperty_cast<QUmlDeployment *>(deployment));
 }
 
 void QUmlExecutionEnvironmentObject::removeDeployment(QObject *deployment)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->removeDeployment(qmodelingobjectproperty_cast<QUmlDeployment *>(deployment));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->removeDeployment(qmodelingelementproperty_cast<QUmlDeployment *>(deployment));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Node]
 
 void QUmlExecutionEnvironmentObject::addNestedNode(QObject *nestedNode)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->addNestedNode(qmodelingobjectproperty_cast<QUmlNode *>(nestedNode));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->addNestedNode(qmodelingelementproperty_cast<QUmlNode *>(nestedNode));
 }
 
 void QUmlExecutionEnvironmentObject::removeNestedNode(QObject *nestedNode)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionEnvironment *>(this)->removeNestedNode(qmodelingobjectproperty_cast<QUmlNode *>(nestedNode));
+    qmodelingelementproperty_cast<QUmlExecutionEnvironment *>(this)->removeNestedNode(qmodelingelementproperty_cast<QUmlNode *>(nestedNode));
+}
+
+
+void QUmlExecutionEnvironmentObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlType");
+    d->groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
+
+    d->propertyGroups << QStringLiteral("QUmlStructuredClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedConnectors"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parts"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("roles"))));
+
+    d->propertyGroups << QStringLiteral("QUmlEncapsulatedClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlEncapsulatedClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedPorts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlBehavioredClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifierBehavior"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interfaceRealizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedBehaviors"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClass");
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extensions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isActive"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedReceptions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superClasses"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDeploymentTarget");
+    d->groupProperties.insert(QStringLiteral("QUmlDeploymentTarget"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deployedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDeploymentTarget"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deployments"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNode");
+    d->groupProperties.insert(QStringLiteral("QUmlNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutionEnvironment");
+}
+
+void QUmlExecutionEnvironmentObject::setPropertyData()
+{
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlexecutionenvironmentobject_p.h b/src/uml/qobjects/qumlexecutionenvironmentobject_p.h
index 022a53ee..058dfd16 100644
--- a/src/uml/qobjects/qumlexecutionenvironmentobject_p.h
+++ b/src/uml/qobjects/qumlexecutionenvironmentobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlExecutionEnvironment;
-class Q_UML_EXPORT QUmlExecutionEnvironmentObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlExecutionEnvironmentObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlExecutionEnvironmentObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -142,7 +145,7 @@ class Q_UML_EXPORT QUmlExecutionEnvironmentObject : public QObject
     Q_PROPERTY(QSet<QObject *> nestedNodes READ nestedNodes)
 
 public:
-    Q_INVOKABLE explicit QUmlExecutionEnvironmentObject(QUmlExecutionEnvironment *qModelingObject);
+    Q_INVOKABLE explicit QUmlExecutionEnvironmentObject(QUmlExecutionEnvironment *qModelingElement);
     virtual ~QUmlExecutionEnvironmentObject();
 
     // Owned attributes [Element]
@@ -396,6 +399,10 @@ public Q_SLOTS:
     // Slots for owned attributes [Node]
     void addNestedNode(QObject *nestedNode);
     void removeNestedNode(QObject *nestedNode);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlexecutionoccurrencespecificationobject.cpp b/src/uml/qobjects/qumlexecutionoccurrencespecificationobject.cpp
index 00c4c55c..6e077a82 100644
--- a/src/uml/qobjects/qumlexecutionoccurrencespecificationobject.cpp
+++ b/src/uml/qobjects/qumlexecutionoccurrencespecificationobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlexecutionoccurrencespecificationobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlExecutionOccurrenceSpecification>
 #include <QtUml/QUmlComment>
@@ -56,16 +57,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlExecutionOccurrenceSpecificationObject::QUmlExecutionOccurrenceSpecificationObject(QUmlExecutionOccurrenceSpecification *qModelingObject)
+QUmlExecutionOccurrenceSpecificationObject::QUmlExecutionOccurrenceSpecificationObject(QUmlExecutionOccurrenceSpecification *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlExecutionOccurrenceSpecificationObject::~QUmlExecutionOccurrenceSpecificationObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -74,25 +77,25 @@ QUmlExecutionOccurrenceSpecificationObject::~QUmlExecutionOccurrenceSpecificatio
 const QSet<QObject *> QUmlExecutionOccurrenceSpecificationObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExecutionOccurrenceSpecificationObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlExecutionOccurrenceSpecificationObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -100,65 +103,65 @@ QObject *QUmlExecutionOccurrenceSpecificationObject::owner() const
 const QSet<QObject *> QUmlExecutionOccurrenceSpecificationObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlExecutionOccurrenceSpecificationObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->name();
 }
 
 QObject *QUmlExecutionOccurrenceSpecificationObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlExecutionOccurrenceSpecificationObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlExecutionOccurrenceSpecificationObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlExecutionOccurrenceSpecificationObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [InteractionFragment]
 
 QObject *QUmlExecutionOccurrenceSpecificationObject::enclosingInteraction() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->enclosingInteraction())
+    if (!qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->enclosingInteraction())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->enclosingInteraction()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->enclosingInteraction()->asQModelingObject();
 }
 
 QObject *QUmlExecutionOccurrenceSpecificationObject::enclosingOperand() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->enclosingOperand())
+    if (!qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->enclosingOperand())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->enclosingOperand()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->enclosingOperand()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlExecutionOccurrenceSpecificationObject::generalOrderings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralOrdering *element, qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->generalOrderings())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralOrdering *element, qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->generalOrderings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -166,25 +169,25 @@ const QSet<QObject *> QUmlExecutionOccurrenceSpecificationObject::generalOrderin
 
 QObject *QUmlExecutionOccurrenceSpecificationObject::covered() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->covered())
+    if (!qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->covered())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->covered()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->covered()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlExecutionOccurrenceSpecificationObject::toAfters() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralOrdering *element, qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->toAfters())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralOrdering *element, qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->toAfters())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExecutionOccurrenceSpecificationObject::toBefores() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralOrdering *element, qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->toBefores())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralOrdering *element, qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->toBefores())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -192,10 +195,10 @@ const QSet<QObject *> QUmlExecutionOccurrenceSpecificationObject::toBefores() co
 
 QObject *QUmlExecutionOccurrenceSpecificationObject::execution() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->execution())
+    if (!qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->execution())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->execution()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->execution()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -203,14 +206,14 @@ QObject *QUmlExecutionOccurrenceSpecificationObject::execution() const
 QSet<QObject *> QUmlExecutionOccurrenceSpecificationObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlExecutionOccurrenceSpecificationObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -218,147 +221,196 @@ bool QUmlExecutionOccurrenceSpecificationObject::mustBeOwned() const
 QList<QObject *> QUmlExecutionOccurrenceSpecificationObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlExecutionOccurrenceSpecificationObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlExecutionOccurrenceSpecificationObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlExecutionOccurrenceSpecificationObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlExecutionOccurrenceSpecificationObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlExecutionOccurrenceSpecificationObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlExecutionOccurrenceSpecificationObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlExecutionOccurrenceSpecificationObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlExecutionOccurrenceSpecificationObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlExecutionOccurrenceSpecificationObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlExecutionOccurrenceSpecificationObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlExecutionOccurrenceSpecificationObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->setName(name);
 }
 
 void QUmlExecutionOccurrenceSpecificationObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlExecutionOccurrenceSpecificationObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlExecutionOccurrenceSpecificationObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlExecutionOccurrenceSpecificationObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [InteractionFragment]
 
 void QUmlExecutionOccurrenceSpecificationObject::setEnclosingInteraction(QObject *enclosingInteraction)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->setEnclosingInteraction(qmodelingobjectproperty_cast<QUmlInteraction *>(enclosingInteraction));
+    qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->setEnclosingInteraction(qmodelingelementproperty_cast<QUmlInteraction *>(enclosingInteraction));
 }
 
 void QUmlExecutionOccurrenceSpecificationObject::setEnclosingOperand(QObject *enclosingOperand)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->setEnclosingOperand(qmodelingobjectproperty_cast<QUmlInteractionOperand *>(enclosingOperand));
+    qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->setEnclosingOperand(qmodelingelementproperty_cast<QUmlInteractionOperand *>(enclosingOperand));
 }
 
 void QUmlExecutionOccurrenceSpecificationObject::addGeneralOrdering(QObject *generalOrdering)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->addGeneralOrdering(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
+    qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->addGeneralOrdering(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
 }
 
 void QUmlExecutionOccurrenceSpecificationObject::removeGeneralOrdering(QObject *generalOrdering)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->removeGeneralOrdering(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
+    qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->removeGeneralOrdering(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [OccurrenceSpecification]
 
 void QUmlExecutionOccurrenceSpecificationObject::setCovered(QObject *covered)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->setCovered(qmodelingobjectproperty_cast<QUmlLifeline *>(covered));
+    qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->setCovered(qmodelingelementproperty_cast<QUmlLifeline *>(covered));
 }
 
 void QUmlExecutionOccurrenceSpecificationObject::addToAfter(QObject *toAfter)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->addToAfter(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(toAfter));
+    qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->addToAfter(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(toAfter));
 }
 
 void QUmlExecutionOccurrenceSpecificationObject::removeToAfter(QObject *toAfter)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->removeToAfter(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(toAfter));
+    qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->removeToAfter(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(toAfter));
 }
 
 void QUmlExecutionOccurrenceSpecificationObject::addToBefore(QObject *toBefore)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->addToBefore(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(toBefore));
+    qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->addToBefore(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(toBefore));
 }
 
 void QUmlExecutionOccurrenceSpecificationObject::removeToBefore(QObject *toBefore)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->removeToBefore(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(toBefore));
+    qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->removeToBefore(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(toBefore));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutionOccurrenceSpecification]
 
 void QUmlExecutionOccurrenceSpecificationObject::setExecution(QObject *execution)
 {
-    qmodelingobjectproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->setExecution(qmodelingobjectproperty_cast<QUmlExecutionSpecification *>(execution));
+    qmodelingelementproperty_cast<QUmlExecutionOccurrenceSpecification *>(this)->setExecution(qmodelingelementproperty_cast<QUmlExecutionSpecification *>(execution));
+}
+
+
+void QUmlExecutionOccurrenceSpecificationObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlInteractionFragment");
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingInteraction"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingOperand"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalOrderings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlOccurrenceSpecification");
+    d->groupProperties.insert(QStringLiteral("QUmlOccurrenceSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("covered"))));
+    d->groupProperties.insert(QStringLiteral("QUmlOccurrenceSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("toAfters"))));
+    d->groupProperties.insert(QStringLiteral("QUmlOccurrenceSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("toBefores"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutionOccurrenceSpecification");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutionOccurrenceSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("execution"))));
+}
+
+void QUmlExecutionOccurrenceSpecificationObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExecutionOccurrenceSpecification, execution, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExecutionOccurrenceSpecification, execution, PropertyClassRole, QStringLiteral("QUmlExecutionOccurrenceSpecification"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExecutionOccurrenceSpecification, execution, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExecutionOccurrenceSpecification, execution, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExecutionOccurrenceSpecification, execution, DocumentationRole, QStringLiteral("References the execution specification describing the execution that is started or finished at this execution event."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExecutionOccurrenceSpecification, execution, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExecutionOccurrenceSpecification, execution, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExecutionOccurrenceSpecification, execution, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlexecutionoccurrencespecificationobject_p.h b/src/uml/qobjects/qumlexecutionoccurrencespecificationobject_p.h
index 95875bcc..fe4a037a 100644
--- a/src/uml/qobjects/qumlexecutionoccurrencespecificationobject_p.h
+++ b/src/uml/qobjects/qumlexecutionoccurrencespecificationobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlExecutionOccurrenceSpecification;
-class Q_UML_EXPORT QUmlExecutionOccurrenceSpecificationObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlExecutionOccurrenceSpecificationObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlExecutionOccurrenceSpecificationObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -85,7 +88,7 @@ class Q_UML_EXPORT QUmlExecutionOccurrenceSpecificationObject : public QObject
     Q_PROPERTY(QObject * execution READ execution WRITE setExecution)
 
 public:
-    Q_INVOKABLE explicit QUmlExecutionOccurrenceSpecificationObject(QUmlExecutionOccurrenceSpecification *qModelingObject);
+    Q_INVOKABLE explicit QUmlExecutionOccurrenceSpecificationObject(QUmlExecutionOccurrenceSpecification *qModelingElement);
     virtual ~QUmlExecutionOccurrenceSpecificationObject();
 
     // Owned attributes [Element]
@@ -157,6 +160,10 @@ public Q_SLOTS:
 
     // Slots for owned attributes [ExecutionOccurrenceSpecification]
     void setExecution(QObject *execution = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlexpansionnodeobject.cpp b/src/uml/qobjects/qumlexpansionnodeobject.cpp
index 30854d09..74d7d487 100644
--- a/src/uml/qobjects/qumlexpansionnodeobject.cpp
+++ b/src/uml/qobjects/qumlexpansionnodeobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlexpansionnodeobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlExpansionNode>
 #include <QtUml/QUmlActivity>
@@ -65,16 +66,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlExpansionNodeObject::QUmlExpansionNodeObject(QUmlExpansionNode *qModelingObject)
+QUmlExpansionNodeObject::QUmlExpansionNodeObject(QUmlExpansionNode *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlExpansionNodeObject::~QUmlExpansionNodeObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -83,25 +86,25 @@ QUmlExpansionNodeObject::~QUmlExpansionNodeObject()
 const QSet<QObject *> QUmlExpansionNodeObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExpansionNodeObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlExpansionNodeObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -109,62 +112,62 @@ QObject *QUmlExpansionNodeObject::owner() const
 const QSet<QObject *> QUmlExpansionNodeObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlExpansionNodeObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->name();
 }
 
 QObject *QUmlExpansionNodeObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlExpansionNodeObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlExpansionNodeObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlExpansionNodeObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlExpansionNodeObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlExpansionNodeObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExpansionNodeObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -172,65 +175,65 @@ const QSet<QObject *> QUmlExpansionNodeObject::redefinitionContexts() const
 
 QObject *QUmlExpansionNodeObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlExpansionNodeObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExpansionNodeObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExpansionNodeObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlExpansionNodeObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlExpansionNodeObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExpansionNodeObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExpansionNodeObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -238,10 +241,10 @@ const QSet<QObject *> QUmlExpansionNodeObject::redefinedNodes() const
 
 QObject *QUmlExpansionNodeObject::type() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->type())
+    if (!qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->type())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->type()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->type()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ObjectNode]
@@ -249,53 +252,53 @@ QObject *QUmlExpansionNodeObject::type() const
 const QSet<QObject *> QUmlExpansionNodeObject::inStates() const
 {
     QSet<QObject *> set;
-    foreach (QUmlState *element, qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->inStates())
-        set.insert(element->asQObject());
+    foreach (QUmlState *element, qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->inStates())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlExpansionNodeObject::isControlType() const
 {
-    return qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->isControlType();
+    return qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->isControlType();
 }
 
 QtUml::ObjectNodeOrderingKind QUmlExpansionNodeObject::ordering() const
 {
-    return qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->ordering();
+    return qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->ordering();
 }
 
 QObject *QUmlExpansionNodeObject::selection() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->selection())
+    if (!qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->selection())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->selection()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->selection()->asQModelingObject();
 }
 
 QObject *QUmlExpansionNodeObject::upperBound() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->upperBound())
+    if (!qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->upperBound())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->upperBound()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->upperBound()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ExpansionNode]
 
 QObject *QUmlExpansionNodeObject::regionAsInput() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->regionAsInput())
+    if (!qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->regionAsInput())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->regionAsInput()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->regionAsInput()->asQModelingObject();
 }
 
 QObject *QUmlExpansionNodeObject::regionAsOutput() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->regionAsOutput())
+    if (!qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->regionAsOutput())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->regionAsOutput()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->regionAsOutput()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -303,14 +306,14 @@ QObject *QUmlExpansionNodeObject::regionAsOutput() const
 QSet<QObject *> QUmlExpansionNodeObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlExpansionNodeObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -318,268 +321,345 @@ bool QUmlExpansionNodeObject::mustBeOwned() const
 QList<QObject *> QUmlExpansionNodeObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlExpansionNodeObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlExpansionNodeObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlExpansionNodeObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlExpansionNodeObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlExpansionNodeObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlExpansionNodeObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlExpansionNodeObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlExpansionNodeObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlExpansionNodeObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlExpansionNodeObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlExpansionNodeObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlExpansionNodeObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlExpansionNodeObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->setName(name);
 }
 
 void QUmlExpansionNodeObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlExpansionNodeObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlExpansionNodeObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlExpansionNodeObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlExpansionNodeObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlExpansionNodeObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlExpansionNodeObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlExpansionNodeObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlExpansionNodeObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlExpansionNodeObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlExpansionNodeObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlExpansionNodeObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlExpansionNodeObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlExpansionNodeObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlExpansionNodeObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlExpansionNodeObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlExpansionNodeObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlExpansionNodeObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlExpansionNodeObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlExpansionNodeObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlExpansionNodeObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlExpansionNodeObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlExpansionNodeObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlExpansionNodeObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TypedElement]
 
 void QUmlExpansionNodeObject::setType(QObject *type)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->setType(qmodelingobjectproperty_cast<QUmlType *>(type));
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->setType(qmodelingelementproperty_cast<QUmlType *>(type));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ObjectNode]
 
 void QUmlExpansionNodeObject::addInState(QObject *inState)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->addInState(qmodelingobjectproperty_cast<QUmlState *>(inState));
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->addInState(qmodelingelementproperty_cast<QUmlState *>(inState));
 }
 
 void QUmlExpansionNodeObject::removeInState(QObject *inState)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->removeInState(qmodelingobjectproperty_cast<QUmlState *>(inState));
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->removeInState(qmodelingelementproperty_cast<QUmlState *>(inState));
 }
 
 void QUmlExpansionNodeObject::setControlType(bool isControlType)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->setControlType(isControlType);
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->setControlType(isControlType);
 }
 
 void QUmlExpansionNodeObject::unsetControlType()
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("controlType"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("controlType"));
 }
 
 void QUmlExpansionNodeObject::setOrdering(QtUml::ObjectNodeOrderingKind ordering)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->setOrdering(ordering);
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->setOrdering(ordering);
 }
 
 void QUmlExpansionNodeObject::unsetOrdering()
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("ordering"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("ordering"));
 }
 
 void QUmlExpansionNodeObject::setSelection(QObject *selection)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->setSelection(qmodelingobjectproperty_cast<QUmlBehavior *>(selection));
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->setSelection(qmodelingelementproperty_cast<QUmlBehavior *>(selection));
 }
 
 void QUmlExpansionNodeObject::setUpperBound(QObject *upperBound)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->setUpperBound(qmodelingobjectproperty_cast<QUmlValueSpecification *>(upperBound));
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->setUpperBound(qmodelingelementproperty_cast<QUmlValueSpecification *>(upperBound));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExpansionNode]
 
 void QUmlExpansionNodeObject::setRegionAsInput(QObject *regionAsInput)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->setRegionAsInput(qmodelingobjectproperty_cast<QUmlExpansionRegion *>(regionAsInput));
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->setRegionAsInput(qmodelingelementproperty_cast<QUmlExpansionRegion *>(regionAsInput));
 }
 
 void QUmlExpansionNodeObject::setRegionAsOutput(QObject *regionAsOutput)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionNode *>(this)->setRegionAsOutput(qmodelingobjectproperty_cast<QUmlExpansionRegion *>(regionAsOutput));
+    qmodelingelementproperty_cast<QUmlExpansionNode *>(this)->setRegionAsOutput(qmodelingelementproperty_cast<QUmlExpansionRegion *>(regionAsOutput));
+}
+
+
+void QUmlExpansionNodeObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTypedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
+
+    d->propertyGroups << QStringLiteral("QUmlObjectNode");
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStates"))));
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isControlType"))));
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ordering"))));
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("selection"))));
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperBound"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExpansionNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExpansionNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("regionAsInput"))));
+    d->groupProperties.insert(QStringLiteral("QUmlExpansionNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("regionAsOutput"))));
+}
+
+void QUmlExpansionNodeObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionNode, regionAsInput, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionNode, regionAsInput, PropertyClassRole, QStringLiteral("QUmlExpansionNode"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionNode, regionAsInput, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionNode, regionAsInput, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionNode, regionAsInput, DocumentationRole, QStringLiteral("The expansion region for which the node is an input."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionNode, regionAsInput, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionNode, regionAsInput, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionNode, regionAsInput, OppositeEndRole, QStringLiteral("ExpansionRegion-inputElement"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionNode, regionAsOutput, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionNode, regionAsOutput, PropertyClassRole, QStringLiteral("QUmlExpansionNode"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionNode, regionAsOutput, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionNode, regionAsOutput, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionNode, regionAsOutput, DocumentationRole, QStringLiteral("The expansion region for which the node is an output."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionNode, regionAsOutput, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionNode, regionAsOutput, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionNode, regionAsOutput, OppositeEndRole, QStringLiteral("ExpansionRegion-outputElement"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlexpansionnodeobject_p.h b/src/uml/qobjects/qumlexpansionnodeobject_p.h
index 140bfeb9..3636c779 100644
--- a/src/uml/qobjects/qumlexpansionnodeobject_p.h
+++ b/src/uml/qobjects/qumlexpansionnodeobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlExpansionNode;
-class Q_UML_EXPORT QUmlExpansionNodeObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlExpansionNodeObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlExpansionNodeObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -101,7 +104,7 @@ class Q_UML_EXPORT QUmlExpansionNodeObject : public QObject
     Q_PROPERTY(QObject * regionAsOutput READ regionAsOutput WRITE setRegionAsOutput)
 
 public:
-    Q_INVOKABLE explicit QUmlExpansionNodeObject(QUmlExpansionNode *qModelingObject);
+    Q_INVOKABLE explicit QUmlExpansionNodeObject(QUmlExpansionNode *qModelingElement);
     virtual ~QUmlExpansionNodeObject();
 
     // Owned attributes [Element]
@@ -218,6 +221,10 @@ public Q_SLOTS:
     // Slots for owned attributes [ExpansionNode]
     void setRegionAsInput(QObject *regionAsInput = 0);
     void setRegionAsOutput(QObject *regionAsOutput = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlexpansionregionobject.cpp b/src/uml/qobjects/qumlexpansionregionobject.cpp
index d1925510..46ee96e1 100644
--- a/src/uml/qobjects/qumlexpansionregionobject.cpp
+++ b/src/uml/qobjects/qumlexpansionregionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlexpansionregionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlExpansionRegion>
 #include <QtUml/QUmlActivity>
@@ -69,16 +70,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlExpansionRegionObject::QUmlExpansionRegionObject(QUmlExpansionRegion *qModelingObject)
+QUmlExpansionRegionObject::QUmlExpansionRegionObject(QUmlExpansionRegion *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlExpansionRegionObject::~QUmlExpansionRegionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -87,25 +90,25 @@ QUmlExpansionRegionObject::~QUmlExpansionRegionObject()
 const QSet<QObject *> QUmlExpansionRegionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExpansionRegionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlExpansionRegionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -113,62 +116,62 @@ QObject *QUmlExpansionRegionObject::owner() const
 const QSet<QObject *> QUmlExpansionRegionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlExpansionRegionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->name();
 }
 
 QObject *QUmlExpansionRegionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlExpansionRegionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlExpansionRegionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlExpansionRegionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlExpansionRegionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlExpansionRegionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExpansionRegionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -177,56 +180,56 @@ const QSet<QObject *> QUmlExpansionRegionObject::redefinitionContexts() const
 const QSet<QObject *> QUmlExpansionRegionObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExpansionRegionObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExpansionRegionObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlExpansionRegionObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlExpansionRegionObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExpansionRegionObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExpansionRegionObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -235,8 +238,8 @@ const QSet<QObject *> QUmlExpansionRegionObject::redefinedNodes() const
 const QSet<QObject *> QUmlExpansionRegionObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -244,46 +247,46 @@ const QSet<QObject *> QUmlExpansionRegionObject::handlers() const
 
 QObject *QUmlExpansionRegionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlExpansionRegionObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlExpansionRegionObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlExpansionRegionObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExpansionRegionObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlExpansionRegionObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -292,48 +295,48 @@ const QList<QObject *> QUmlExpansionRegionObject::outputs() const
 const QSet<QObject *> QUmlExpansionRegionObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExpansionRegionObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExpansionRegionObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExpansionRegionObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExpansionRegionObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExpansionRegionObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -342,87 +345,87 @@ const QSet<QObject *> QUmlExpansionRegionObject::packageImports() const
 const QSet<QObject *> QUmlExpansionRegionObject::containedEdges() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->containedEdges())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->containedEdges())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExpansionRegionObject::containedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->containedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->containedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExpansionRegionObject::subgroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->subgroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->subgroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlExpansionRegionObject::superGroup() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->superGroup())
+    if (!qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->superGroup())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->superGroup()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->superGroup()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [StructuredActivityNode]
 
 QObject *QUmlExpansionRegionObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlExpansionRegionObject::edges() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->edges())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->edges())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlExpansionRegionObject::mustIsolate() const
 {
-    return qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->mustIsolate();
+    return qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->mustIsolate();
 }
 
 const QSet<QObject *> QUmlExpansionRegionObject::nodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->nodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->nodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExpansionRegionObject::structuredNodeInputs() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->structuredNodeInputs())
-        set.insert(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->structuredNodeInputs())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExpansionRegionObject::structuredNodeOutputs() const
 {
     QSet<QObject *> set;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->structuredNodeOutputs())
-        set.insert(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->structuredNodeOutputs())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExpansionRegionObject::variables() const
 {
     QSet<QObject *> set;
-    foreach (QUmlVariable *element, qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->variables())
-        set.insert(element->asQObject());
+    foreach (QUmlVariable *element, qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->variables())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -431,21 +434,21 @@ const QSet<QObject *> QUmlExpansionRegionObject::variables() const
 const QSet<QObject *> QUmlExpansionRegionObject::inputElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExpansionNode *element, qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->inputElements())
-        set.insert(element->asQObject());
+    foreach (QUmlExpansionNode *element, qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->inputElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QtUml::ExpansionKind QUmlExpansionRegionObject::mode() const
 {
-    return qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->mode();
+    return qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->mode();
 }
 
 const QSet<QObject *> QUmlExpansionRegionObject::outputElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExpansionNode *element, qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->outputElements())
-        set.insert(element->asQObject());
+    foreach (QUmlExpansionNode *element, qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->outputElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -454,14 +457,14 @@ const QSet<QObject *> QUmlExpansionRegionObject::outputElements() const
 QSet<QObject *> QUmlExpansionRegionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlExpansionRegionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -469,39 +472,39 @@ bool QUmlExpansionRegionObject::mustBeOwned() const
 QList<QObject *> QUmlExpansionRegionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlExpansionRegionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlExpansionRegionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlExpansionRegionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlExpansionRegionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlExpansionRegionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [Namespace]
@@ -510,462 +513,573 @@ QSet<QObject *> QUmlExpansionRegionObject::excludeCollisions(QSet<QObject *> imp
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlExpansionRegionObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlExpansionRegionObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlExpansionRegionObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->membersAreDistinguishable();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlExpansionRegionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlExpansionRegionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlExpansionRegionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlExpansionRegionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlExpansionRegionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlExpansionRegionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlExpansionRegionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlExpansionRegionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->setName(name);
 }
 
 void QUmlExpansionRegionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlExpansionRegionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlExpansionRegionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlExpansionRegionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlExpansionRegionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlExpansionRegionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlExpansionRegionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlExpansionRegionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlExpansionRegionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlExpansionRegionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlExpansionRegionObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlExpansionRegionObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlExpansionRegionObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlExpansionRegionObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlExpansionRegionObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlExpansionRegionObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlExpansionRegionObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlExpansionRegionObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlExpansionRegionObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlExpansionRegionObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlExpansionRegionObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlExpansionRegionObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlExpansionRegionObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlExpansionRegionObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlExpansionRegionObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlExpansionRegionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlExpansionRegionObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlExpansionRegionObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlExpansionRegionObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlExpansionRegionObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlExpansionRegionObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlExpansionRegionObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlExpansionRegionObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlExpansionRegionObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlExpansionRegionObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlExpansionRegionObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlExpansionRegionObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlExpansionRegionObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlExpansionRegionObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlExpansionRegionObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlExpansionRegionObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlExpansionRegionObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlExpansionRegionObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlExpansionRegionObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlExpansionRegionObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlExpansionRegionObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlExpansionRegionObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlExpansionRegionObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityGroup]
 
 void QUmlExpansionRegionObject::addContainedEdge(QObject *containedEdge)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->addContainedEdge(qmodelingobjectproperty_cast<QUmlActivityEdge *>(containedEdge));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->addContainedEdge(qmodelingelementproperty_cast<QUmlActivityEdge *>(containedEdge));
 }
 
 void QUmlExpansionRegionObject::removeContainedEdge(QObject *containedEdge)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->removeContainedEdge(qmodelingobjectproperty_cast<QUmlActivityEdge *>(containedEdge));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->removeContainedEdge(qmodelingelementproperty_cast<QUmlActivityEdge *>(containedEdge));
 }
 
 void QUmlExpansionRegionObject::addContainedNode(QObject *containedNode)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->addContainedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(containedNode));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->addContainedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(containedNode));
 }
 
 void QUmlExpansionRegionObject::removeContainedNode(QObject *containedNode)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->removeContainedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(containedNode));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->removeContainedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(containedNode));
 }
 
 void QUmlExpansionRegionObject::addSubgroup(QObject *subgroup)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->addSubgroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(subgroup));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->addSubgroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(subgroup));
 }
 
 void QUmlExpansionRegionObject::removeSubgroup(QObject *subgroup)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->removeSubgroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(subgroup));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->removeSubgroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(subgroup));
 }
 
 void QUmlExpansionRegionObject::setSuperGroup(QObject *superGroup)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->setSuperGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(superGroup));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->setSuperGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(superGroup));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [StructuredActivityNode]
 
 void QUmlExpansionRegionObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlExpansionRegionObject::addEdge(QObject *edge)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->addEdge(qmodelingobjectproperty_cast<QUmlActivityEdge *>(edge));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->addEdge(qmodelingelementproperty_cast<QUmlActivityEdge *>(edge));
 }
 
 void QUmlExpansionRegionObject::removeEdge(QObject *edge)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->removeEdge(qmodelingobjectproperty_cast<QUmlActivityEdge *>(edge));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->removeEdge(qmodelingelementproperty_cast<QUmlActivityEdge *>(edge));
 }
 
 void QUmlExpansionRegionObject::setMustIsolate(bool mustIsolate)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->setMustIsolate(mustIsolate);
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->setMustIsolate(mustIsolate);
 }
 
 void QUmlExpansionRegionObject::unsetMustIsolate()
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("mustIsolate"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("mustIsolate"));
 }
 
 void QUmlExpansionRegionObject::addNode(QObject *node)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->addNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(node));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->addNode(qmodelingelementproperty_cast<QUmlActivityNode *>(node));
 }
 
 void QUmlExpansionRegionObject::removeNode(QObject *node)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->removeNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(node));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->removeNode(qmodelingelementproperty_cast<QUmlActivityNode *>(node));
 }
 
 void QUmlExpansionRegionObject::addStructuredNodeInput(QObject *structuredNodeInput)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->addStructuredNodeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(structuredNodeInput));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->addStructuredNodeInput(qmodelingelementproperty_cast<QUmlInputPin *>(structuredNodeInput));
 }
 
 void QUmlExpansionRegionObject::removeStructuredNodeInput(QObject *structuredNodeInput)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->removeStructuredNodeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(structuredNodeInput));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->removeStructuredNodeInput(qmodelingelementproperty_cast<QUmlInputPin *>(structuredNodeInput));
 }
 
 void QUmlExpansionRegionObject::addStructuredNodeOutput(QObject *structuredNodeOutput)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->addStructuredNodeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(structuredNodeOutput));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->addStructuredNodeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(structuredNodeOutput));
 }
 
 void QUmlExpansionRegionObject::removeStructuredNodeOutput(QObject *structuredNodeOutput)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->removeStructuredNodeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(structuredNodeOutput));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->removeStructuredNodeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(structuredNodeOutput));
 }
 
 void QUmlExpansionRegionObject::addVariable(QObject *variable)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->addVariable(qmodelingobjectproperty_cast<QUmlVariable *>(variable));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->addVariable(qmodelingelementproperty_cast<QUmlVariable *>(variable));
 }
 
 void QUmlExpansionRegionObject::removeVariable(QObject *variable)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->removeVariable(qmodelingobjectproperty_cast<QUmlVariable *>(variable));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->removeVariable(qmodelingelementproperty_cast<QUmlVariable *>(variable));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExpansionRegion]
 
 void QUmlExpansionRegionObject::addInputElement(QObject *inputElement)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->addInputElement(qmodelingobjectproperty_cast<QUmlExpansionNode *>(inputElement));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->addInputElement(qmodelingelementproperty_cast<QUmlExpansionNode *>(inputElement));
 }
 
 void QUmlExpansionRegionObject::removeInputElement(QObject *inputElement)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->removeInputElement(qmodelingobjectproperty_cast<QUmlExpansionNode *>(inputElement));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->removeInputElement(qmodelingelementproperty_cast<QUmlExpansionNode *>(inputElement));
 }
 
 void QUmlExpansionRegionObject::setMode(QtUml::ExpansionKind mode)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->setMode(mode);
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->setMode(mode);
 }
 
 void QUmlExpansionRegionObject::unsetMode()
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("mode"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("mode"));
 }
 
 void QUmlExpansionRegionObject::addOutputElement(QObject *outputElement)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->addOutputElement(qmodelingobjectproperty_cast<QUmlExpansionNode *>(outputElement));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->addOutputElement(qmodelingelementproperty_cast<QUmlExpansionNode *>(outputElement));
 }
 
 void QUmlExpansionRegionObject::removeOutputElement(QObject *outputElement)
 {
-    qmodelingobjectproperty_cast<QUmlExpansionRegion *>(this)->removeOutputElement(qmodelingobjectproperty_cast<QUmlExpansionNode *>(outputElement));
+    qmodelingelementproperty_cast<QUmlExpansionRegion *>(this)->removeOutputElement(qmodelingelementproperty_cast<QUmlExpansionNode *>(outputElement));
+}
+
+
+void QUmlExpansionRegionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityGroup");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("containedEdges"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("containedNodes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("subgroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superGroup"))));
+
+    d->propertyGroups << QStringLiteral("QUmlStructuredActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("edges"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("mustIsolate"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nodes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("structuredNodeInputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("structuredNodeOutputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("variables"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExpansionRegion");
+    d->groupProperties.insert(QStringLiteral("QUmlExpansionRegion"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlExpansionRegion"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("mode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlExpansionRegion"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputElements"))));
+}
+
+void QUmlExpansionRegionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionRegion, inputElements, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionRegion, inputElements, PropertyClassRole, QStringLiteral("QUmlExpansionRegion"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionRegion, inputElements, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionRegion, inputElements, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionRegion, inputElements, DocumentationRole, QStringLiteral("An object node that holds a separate element of the input collection during each of the multiple executions of the region."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionRegion, inputElements, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionRegion, inputElements, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionRegion, inputElements, OppositeEndRole, QStringLiteral("ExpansionNode-regionAsInput"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionRegion, mode, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionRegion, mode, PropertyClassRole, QStringLiteral("QUmlExpansionRegion"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionRegion, mode, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionRegion, mode, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionRegion, mode, DocumentationRole, QStringLiteral("The way in which the executions interact: parallel: all interactions are independent iterative: the interactions occur in order of the elements stream: a stream of values flows into a single execution"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionRegion, mode, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionRegion, mode, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionRegion, mode, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionRegion, outputElements, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionRegion, outputElements, PropertyClassRole, QStringLiteral("QUmlExpansionRegion"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionRegion, outputElements, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionRegion, outputElements, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionRegion, outputElements, DocumentationRole, QStringLiteral("An object node that accepts a separate element of the output collection during each of the multiple executions of the region. The values are formed into a collection that is available when the execution of the region is complete."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionRegion, outputElements, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionRegion, outputElements, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpansionRegion, outputElements, OppositeEndRole, QStringLiteral("ExpansionNode-regionAsOutput"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlexpansionregionobject_p.h b/src/uml/qobjects/qumlexpansionregionobject_p.h
index 5e01076c..69ae9c53 100644
--- a/src/uml/qobjects/qumlexpansionregionobject_p.h
+++ b/src/uml/qobjects/qumlexpansionregionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlExpansionRegion;
-class Q_UML_EXPORT QUmlExpansionRegionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlExpansionRegionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlExpansionRegionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -125,7 +128,7 @@ class Q_UML_EXPORT QUmlExpansionRegionObject : public QObject
     Q_PROPERTY(QSet<QObject *> outputElements READ outputElements)
 
 public:
-    Q_INVOKABLE explicit QUmlExpansionRegionObject(QUmlExpansionRegion *qModelingObject);
+    Q_INVOKABLE explicit QUmlExpansionRegionObject(QUmlExpansionRegion *qModelingElement);
     virtual ~QUmlExpansionRegionObject();
 
     // Owned attributes [Element]
@@ -317,6 +320,10 @@ public Q_SLOTS:
     void unsetMode();
     void addOutputElement(QObject *outputElement);
     void removeOutputElement(QObject *outputElement);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlexpressionobject.cpp b/src/uml/qobjects/qumlexpressionobject.cpp
index 5a11eded..c1668068 100644
--- a/src/uml/qobjects/qumlexpressionobject.cpp
+++ b/src/uml/qobjects/qumlexpressionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlexpressionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlExpression>
 #include <QtUml/QUmlComment>
@@ -55,16 +56,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlExpressionObject::QUmlExpressionObject(QUmlExpression *qModelingObject)
+QUmlExpressionObject::QUmlExpressionObject(QUmlExpression *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlExpressionObject::~QUmlExpressionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlExpression *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlExpression *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -73,25 +76,25 @@ QUmlExpressionObject::~QUmlExpressionObject()
 const QSet<QObject *> QUmlExpressionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlExpression *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlExpression *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExpressionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlExpression *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlExpression *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlExpressionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExpression *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlExpression *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExpression *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExpression *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -99,70 +102,70 @@ QObject *QUmlExpressionObject::owner() const
 const QSet<QObject *> QUmlExpressionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlExpression *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlExpression *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlExpressionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlExpression *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlExpression *>(this)->name();
 }
 
 QObject *QUmlExpressionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExpression *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlExpression *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExpression *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExpression *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlExpressionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExpression *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlExpression *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExpression *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExpression *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlExpressionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlExpression *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlExpression *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [TypedElement]
 
 QObject *QUmlExpressionObject::type() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExpression *>(this)->type())
+    if (!qmodelingelementproperty_cast<QUmlExpression *>(this)->type())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExpression *>(this)->type()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExpression *>(this)->type()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlExpressionObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExpression *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlExpression *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExpression *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExpression *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlExpressionObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExpression *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlExpression *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExpression *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExpression *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlExpressionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlExpression *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlExpression *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Expression]
@@ -170,14 +173,14 @@ QtUml::VisibilityKind QUmlExpressionObject::visibility() const
 const QList<QObject *> QUmlExpressionObject::operands() const
 {
     QList<QObject *> list;
-    foreach (QUmlValueSpecification *element, qmodelingobjectproperty_cast<QUmlExpression *>(this)->operands())
-        list.append(element->asQObject());
+    foreach (QUmlValueSpecification *element, qmodelingelementproperty_cast<QUmlExpression *>(this)->operands())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 QString QUmlExpressionObject::symbol() const
 {
-    return qmodelingobjectproperty_cast<QUmlExpression *>(this)->symbol();
+    return qmodelingelementproperty_cast<QUmlExpression *>(this)->symbol();
 }
 
 // OPERATIONS [Element]
@@ -185,14 +188,14 @@ QString QUmlExpressionObject::symbol() const
 QSet<QObject *> QUmlExpressionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlExpression *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlExpression *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlExpressionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlExpression *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlExpression *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -200,182 +203,243 @@ bool QUmlExpressionObject::mustBeOwned() const
 QList<QObject *> QUmlExpressionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlExpression *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlExpression *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlExpressionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlExpression *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlExpression *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlExpressionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlExpression *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlExpression *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlExpressionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlExpression *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlExpression *>(this)->separator();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlExpressionObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlExpression *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlExpression *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [ValueSpecification]
 
 bool QUmlExpressionObject::booleanValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlExpression *>(this)->booleanValue();
+    return qmodelingelementproperty_cast<QUmlExpression *>(this)->booleanValue();
 }
 
 int QUmlExpressionObject::integerValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlExpression *>(this)->integerValue();
+    return qmodelingelementproperty_cast<QUmlExpression *>(this)->integerValue();
 }
 
 bool QUmlExpressionObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlExpression *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlExpression *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlExpressionObject::isComputable() const
 {
-    return qmodelingobjectproperty_cast<QUmlExpression *>(this)->isComputable();
+    return qmodelingelementproperty_cast<QUmlExpression *>(this)->isComputable();
 }
 
 bool QUmlExpressionObject::isNull() const
 {
-    return qmodelingobjectproperty_cast<QUmlExpression *>(this)->isNull();
+    return qmodelingelementproperty_cast<QUmlExpression *>(this)->isNull();
 }
 
 double QUmlExpressionObject::realValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlExpression *>(this)->realValue();
+    return qmodelingelementproperty_cast<QUmlExpression *>(this)->realValue();
 }
 
 QString QUmlExpressionObject::stringValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlExpression *>(this)->stringValue();
+    return qmodelingelementproperty_cast<QUmlExpression *>(this)->stringValue();
 }
 
 int QUmlExpressionObject::unlimitedValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlExpression *>(this)->unlimitedValue();
+    return qmodelingelementproperty_cast<QUmlExpression *>(this)->unlimitedValue();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlExpressionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlExpression *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlExpression *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlExpressionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlExpression *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlExpression *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlExpressionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExpression *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlExpression *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlExpressionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExpression *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlExpression *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlExpressionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlExpression *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlExpression *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlExpressionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlExpression *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlExpression *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlExpressionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlExpression *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlExpression *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlExpressionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlExpression *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlExpression *>(this)->setName(name);
 }
 
 void QUmlExpressionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlExpression *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlExpression *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlExpressionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlExpression *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlExpression *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlExpressionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlExpression *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlExpression *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [TypedElement]
 
 void QUmlExpressionObject::setType(QObject *type)
 {
-    qmodelingobjectproperty_cast<QUmlExpression *>(this)->setType(qmodelingobjectproperty_cast<QUmlType *>(type));
+    qmodelingelementproperty_cast<QUmlExpression *>(this)->setType(qmodelingelementproperty_cast<QUmlType *>(type));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlExpressionObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlExpression *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlExpression *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlExpressionObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlExpression *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlExpression *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlExpressionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlExpression *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlExpression *>(this)->setVisibility(visibility);
 }
 
 void QUmlExpressionObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlExpression *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Expression]
 
 void QUmlExpressionObject::addOperand(QObject *operand)
 {
-    qmodelingobjectproperty_cast<QUmlExpression *>(this)->addOperand(qmodelingobjectproperty_cast<QUmlValueSpecification *>(operand));
+    qmodelingelementproperty_cast<QUmlExpression *>(this)->addOperand(qmodelingelementproperty_cast<QUmlValueSpecification *>(operand));
 }
 
 void QUmlExpressionObject::removeOperand(QObject *operand)
 {
-    qmodelingobjectproperty_cast<QUmlExpression *>(this)->removeOperand(qmodelingobjectproperty_cast<QUmlValueSpecification *>(operand));
+    qmodelingelementproperty_cast<QUmlExpression *>(this)->removeOperand(qmodelingelementproperty_cast<QUmlValueSpecification *>(operand));
 }
 
 void QUmlExpressionObject::setSymbol(QString symbol)
 {
-    qmodelingobjectproperty_cast<QUmlExpression *>(this)->setSymbol(symbol);
+    qmodelingelementproperty_cast<QUmlExpression *>(this)->setSymbol(symbol);
+}
+
+
+void QUmlExpressionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTypedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlValueSpecification");
+
+    d->propertyGroups << QStringLiteral("QUmlExpression");
+    d->groupProperties.insert(QStringLiteral("QUmlExpression"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("operands"))));
+    d->groupProperties.insert(QStringLiteral("QUmlExpression"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("symbol"))));
+}
+
+void QUmlExpressionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpression, operands, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpression, operands, PropertyClassRole, QStringLiteral("QUmlExpression"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpression, operands, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpression, operands, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpression, operands, DocumentationRole, QStringLiteral("Specifies a sequence of operands."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpression, operands, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpression, operands, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpression, operands, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpression, symbol, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpression, symbol, PropertyClassRole, QStringLiteral("QUmlExpression"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpression, symbol, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpression, symbol, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpression, symbol, DocumentationRole, QStringLiteral("The symbol associated with the node in the expression tree."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpression, symbol, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpression, symbol, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExpression, symbol, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlexpressionobject_p.h b/src/uml/qobjects/qumlexpressionobject_p.h
index 6b54ba7d..0b75d985 100644
--- a/src/uml/qobjects/qumlexpressionobject_p.h
+++ b/src/uml/qobjects/qumlexpressionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlExpression;
-class Q_UML_EXPORT QUmlExpressionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlExpressionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlExpressionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -85,7 +88,7 @@ class Q_UML_EXPORT QUmlExpressionObject : public QObject
     Q_PROPERTY(QString symbol READ symbol WRITE setSymbol)
 
 public:
-    Q_INVOKABLE explicit QUmlExpressionObject(QUmlExpression *qModelingObject);
+    Q_INVOKABLE explicit QUmlExpressionObject(QUmlExpression *qModelingElement);
     virtual ~QUmlExpressionObject();
 
     // Owned attributes [Element]
@@ -169,6 +172,10 @@ public Q_SLOTS:
     void addOperand(QObject *operand);
     void removeOperand(QObject *operand);
     void setSymbol(QString symbol);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlextendobject.cpp b/src/uml/qobjects/qumlextendobject.cpp
index 0ed9c1d6..984aac51 100644
--- a/src/uml/qobjects/qumlextendobject.cpp
+++ b/src/uml/qobjects/qumlextendobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlextendobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlExtend>
 #include <QtUml/QUmlComment>
@@ -54,16 +55,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlExtendObject::QUmlExtendObject(QUmlExtend *qModelingObject)
+QUmlExtendObject::QUmlExtendObject(QUmlExtend *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlExtendObject::~QUmlExtendObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlExtend *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlExtend *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -72,25 +75,25 @@ QUmlExtendObject::~QUmlExtendObject()
 const QSet<QObject *> QUmlExtendObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlExtend *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlExtend *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExtendObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlExtend *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlExtend *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlExtendObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExtend *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlExtend *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExtend *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExtend *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [Relationship]
@@ -98,8 +101,8 @@ QObject *QUmlExtendObject::owner() const
 const QSet<QObject *> QUmlExtendObject::relatedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlExtend *>(this)->relatedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlExtend *>(this)->relatedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -108,16 +111,16 @@ const QSet<QObject *> QUmlExtendObject::relatedElements() const
 const QSet<QObject *> QUmlExtendObject::sources() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlExtend *>(this)->sources())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlExtend *>(this)->sources())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExtendObject::targets() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlExtend *>(this)->targets())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlExtend *>(this)->targets())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -126,73 +129,73 @@ const QSet<QObject *> QUmlExtendObject::targets() const
 const QSet<QObject *> QUmlExtendObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlExtend *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlExtend *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlExtendObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtend *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlExtend *>(this)->name();
 }
 
 QObject *QUmlExtendObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExtend *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlExtend *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExtend *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExtend *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlExtendObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExtend *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlExtend *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExtend *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExtend *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlExtendObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtend *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlExtend *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlExtendObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtend *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlExtend *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Extend]
 
 QObject *QUmlExtendObject::condition() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExtend *>(this)->condition())
+    if (!qmodelingelementproperty_cast<QUmlExtend *>(this)->condition())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExtend *>(this)->condition()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExtend *>(this)->condition()->asQModelingObject();
 }
 
 QObject *QUmlExtendObject::extendedCase() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExtend *>(this)->extendedCase())
+    if (!qmodelingelementproperty_cast<QUmlExtend *>(this)->extendedCase())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExtend *>(this)->extendedCase()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExtend *>(this)->extendedCase()->asQModelingObject();
 }
 
 QObject *QUmlExtendObject::extension() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExtend *>(this)->extension())
+    if (!qmodelingelementproperty_cast<QUmlExtend *>(this)->extension())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExtend *>(this)->extension()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExtend *>(this)->extension()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlExtendObject::extensionLocations() const
 {
     QList<QObject *> list;
-    foreach (QUmlExtensionPoint *element, qmodelingobjectproperty_cast<QUmlExtend *>(this)->extensionLocations())
-        list.append(element->asQObject());
+    foreach (QUmlExtensionPoint *element, qmodelingelementproperty_cast<QUmlExtend *>(this)->extensionLocations())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -201,14 +204,14 @@ const QList<QObject *> QUmlExtendObject::extensionLocations() const
 QSet<QObject *> QUmlExtendObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlExtend *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlExtend *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlExtendObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtend *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlExtend *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -216,152 +219,228 @@ bool QUmlExtendObject::mustBeOwned() const
 QList<QObject *> QUmlExtendObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlExtend *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlExtend *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlExtendObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlExtend *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlExtend *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlExtendObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlExtend *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlExtend *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlExtendObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtend *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlExtend *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlExtendObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlExtend *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlExtend *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlExtendObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlExtend *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlExtend *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlExtendObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExtend *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlExtend *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlExtendObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExtend *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlExtend *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlExtendObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlExtend *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlExtend *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Relationship]
 
 void QUmlExtendObject::addRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExtend *>(this)->addRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlExtend *>(this)->addRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 void QUmlExtendObject::removeRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExtend *>(this)->removeRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlExtend *>(this)->removeRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [DirectedRelationship]
 
 void QUmlExtendObject::addSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlExtend *>(this)->addSource(qmodelingobjectproperty_cast<QUmlElement *>(source));
+    qmodelingelementproperty_cast<QUmlExtend *>(this)->addSource(qmodelingelementproperty_cast<QUmlElement *>(source));
 }
 
 void QUmlExtendObject::removeSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlExtend *>(this)->removeSource(qmodelingobjectproperty_cast<QUmlElement *>(source));
+    qmodelingelementproperty_cast<QUmlExtend *>(this)->removeSource(qmodelingelementproperty_cast<QUmlElement *>(source));
 }
 
 void QUmlExtendObject::addTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlExtend *>(this)->addTarget(qmodelingobjectproperty_cast<QUmlElement *>(target));
+    qmodelingelementproperty_cast<QUmlExtend *>(this)->addTarget(qmodelingelementproperty_cast<QUmlElement *>(target));
 }
 
 void QUmlExtendObject::removeTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlExtend *>(this)->removeTarget(qmodelingobjectproperty_cast<QUmlElement *>(target));
+    qmodelingelementproperty_cast<QUmlExtend *>(this)->removeTarget(qmodelingelementproperty_cast<QUmlElement *>(target));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlExtendObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlExtend *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlExtend *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlExtendObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlExtend *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlExtend *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlExtendObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlExtend *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlExtend *>(this)->setName(name);
 }
 
 void QUmlExtendObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlExtend *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlExtend *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlExtendObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlExtend *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlExtend *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlExtendObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlExtend *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlExtend *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlExtendObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlExtend *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlExtend *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Extend]
 
 void QUmlExtendObject::setCondition(QObject *condition)
 {
-    qmodelingobjectproperty_cast<QUmlExtend *>(this)->setCondition(qmodelingobjectproperty_cast<QUmlConstraint *>(condition));
+    qmodelingelementproperty_cast<QUmlExtend *>(this)->setCondition(qmodelingelementproperty_cast<QUmlConstraint *>(condition));
 }
 
 void QUmlExtendObject::setExtendedCase(QObject *extendedCase)
 {
-    qmodelingobjectproperty_cast<QUmlExtend *>(this)->setExtendedCase(qmodelingobjectproperty_cast<QUmlUseCase *>(extendedCase));
+    qmodelingelementproperty_cast<QUmlExtend *>(this)->setExtendedCase(qmodelingelementproperty_cast<QUmlUseCase *>(extendedCase));
 }
 
 void QUmlExtendObject::setExtension(QObject *extension)
 {
-    qmodelingobjectproperty_cast<QUmlExtend *>(this)->setExtension(qmodelingobjectproperty_cast<QUmlUseCase *>(extension));
+    qmodelingelementproperty_cast<QUmlExtend *>(this)->setExtension(qmodelingelementproperty_cast<QUmlUseCase *>(extension));
 }
 
 void QUmlExtendObject::addExtensionLocation(QObject *extensionLocation)
 {
-    qmodelingobjectproperty_cast<QUmlExtend *>(this)->addExtensionLocation(qmodelingobjectproperty_cast<QUmlExtensionPoint *>(extensionLocation));
+    qmodelingelementproperty_cast<QUmlExtend *>(this)->addExtensionLocation(qmodelingelementproperty_cast<QUmlExtensionPoint *>(extensionLocation));
 }
 
 void QUmlExtendObject::removeExtensionLocation(QObject *extensionLocation)
 {
-    qmodelingobjectproperty_cast<QUmlExtend *>(this)->removeExtensionLocation(qmodelingobjectproperty_cast<QUmlExtensionPoint *>(extensionLocation));
+    qmodelingelementproperty_cast<QUmlExtend *>(this)->removeExtensionLocation(qmodelingelementproperty_cast<QUmlExtensionPoint *>(extensionLocation));
+}
+
+
+void QUmlExtendObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDirectedRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExtend");
+    d->groupProperties.insert(QStringLiteral("QUmlExtend"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("condition"))));
+    d->groupProperties.insert(QStringLiteral("QUmlExtend"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extendedCase"))));
+    d->groupProperties.insert(QStringLiteral("QUmlExtend"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extension"))));
+    d->groupProperties.insert(QStringLiteral("QUmlExtend"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extensionLocations"))));
+}
+
+void QUmlExtendObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtend, condition, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtend, condition, PropertyClassRole, QStringLiteral("QUmlExtend"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtend, condition, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtend, condition, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtend, condition, DocumentationRole, QStringLiteral("References the condition that must hold when the first extension point is reached for the extension to take place. If no constraint is associated with the extend relationship, the extension is unconditional."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtend, condition, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtend, condition, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtend, condition, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtend, extendedCase, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtend, extendedCase, PropertyClassRole, QStringLiteral("QUmlExtend"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtend, extendedCase, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtend, extendedCase, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtend, extendedCase, DocumentationRole, QStringLiteral("References the use case that is being extended."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtend, extendedCase, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtend, extendedCase, SubsettedPropertiesRole, QStringLiteral("DirectedRelationship-target"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtend, extendedCase, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtend, extension, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtend, extension, PropertyClassRole, QStringLiteral("QUmlExtend"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtend, extension, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtend, extension, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtend, extension, DocumentationRole, QStringLiteral("References the use case that represents the extension and owns the extend relationship."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtend, extension, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtend, extension, SubsettedPropertiesRole, QStringLiteral("DirectedRelationship-source NamedElement-namespace"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtend, extension, OppositeEndRole, QStringLiteral("UseCase-extend"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtend, extensionLocations, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtend, extensionLocations, PropertyClassRole, QStringLiteral("QUmlExtend"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtend, extensionLocations, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtend, extensionLocations, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtend, extensionLocations, DocumentationRole, QStringLiteral("An ordered list of extension points belonging to the extended use case, specifying where the respective behavioral fragments of the extending use case are to be inserted. The first fragment in the extending use case is associated with the first extension point in the list, the second fragment with the second point, and so on. (Note that, in most practical cases, the extending use case has just a single behavior fragment, so that the list of extension points is trivial.)"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtend, extensionLocations, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtend, extensionLocations, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtend, extensionLocations, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlextendobject_p.h b/src/uml/qobjects/qumlextendobject_p.h
index e662e99b..74a98412 100644
--- a/src/uml/qobjects/qumlextendobject_p.h
+++ b/src/uml/qobjects/qumlextendobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlExtend;
-class Q_UML_EXPORT QUmlExtendObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlExtendObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlExtendObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -85,7 +88,7 @@ class Q_UML_EXPORT QUmlExtendObject : public QObject
     Q_PROPERTY(QList<QObject *> extensionLocations READ extensionLocations)
 
 public:
-    Q_INVOKABLE explicit QUmlExtendObject(QUmlExtend *qModelingObject);
+    Q_INVOKABLE explicit QUmlExtendObject(QUmlExtend *qModelingElement);
     virtual ~QUmlExtendObject();
 
     // Owned attributes [Element]
@@ -158,6 +161,10 @@ public Q_SLOTS:
     void setExtension(QObject *extension = 0);
     void addExtensionLocation(QObject *extensionLocation);
     void removeExtensionLocation(QObject *extensionLocation);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlextensionendobject.cpp b/src/uml/qobjects/qumlextensionendobject.cpp
index cf818883..d8021c6b 100644
--- a/src/uml/qobjects/qumlextensionendobject.cpp
+++ b/src/uml/qobjects/qumlextensionendobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlextensionendobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlExtensionEnd>
 #include <QtUml/QUmlAssociation>
@@ -68,16 +69,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlExtensionEndObject::QUmlExtensionEndObject(QUmlExtensionEnd *qModelingObject)
+QUmlExtensionEndObject::QUmlExtensionEndObject(QUmlExtensionEnd *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlExtensionEndObject::~QUmlExtensionEndObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -86,25 +89,25 @@ QUmlExtensionEndObject::~QUmlExtensionEndObject()
 const QSet<QObject *> QUmlExtensionEndObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExtensionEndObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlExtensionEndObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -112,95 +115,95 @@ QObject *QUmlExtensionEndObject::owner() const
 const QSet<QObject *> QUmlExtensionEndObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlExtensionEndObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->name();
 }
 
 QObject *QUmlExtensionEndObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlExtensionEndObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlExtensionEndObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlExtensionEndObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [MultiplicityElement]
 
 bool QUmlExtensionEndObject::isOrdered() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->isOrdered();
+    return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->isOrdered();
 }
 
 bool QUmlExtensionEndObject::isUnique() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->isUnique();
+    return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->isUnique();
 }
 
 QObject *QUmlExtensionEndObject::lowerValue() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->lowerValue())
+    if (!qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->lowerValue())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->lowerValue()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->lowerValue()->asQModelingObject();
 }
 
 int QUmlExtensionEndObject::upper() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->upper();
+    return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->upper();
 }
 
 QObject *QUmlExtensionEndObject::upperValue() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->upperValue())
+    if (!qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->upperValue())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->upperValue()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->upperValue()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlExtensionEndObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlExtensionEndObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExtensionEndObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -209,24 +212,24 @@ const QSet<QObject *> QUmlExtensionEndObject::redefinitionContexts() const
 const QSet<QObject *> QUmlExtensionEndObject::featuringClassifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->featuringClassifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->featuringClassifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlExtensionEndObject::isStatic() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->isStatic();
+    return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->isStatic();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlExtensionEndObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ConnectableElement]
@@ -234,17 +237,17 @@ QObject *QUmlExtensionEndObject::owningTemplateParameter() const
 const QList<QObject *> QUmlExtensionEndObject::ends() const
 {
     QList<QObject *> list;
-    foreach (QUmlConnectorEnd *element, qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->ends())
-        list.append(element->asQObject());
+    foreach (QUmlConnectorEnd *element, qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->ends())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 QObject *QUmlExtensionEndObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [DeploymentTarget]
@@ -252,16 +255,16 @@ QObject *QUmlExtensionEndObject::templateParameter() const
 const QSet<QObject *> QUmlExtensionEndObject::deployedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->deployedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->deployedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExtensionEndObject::deployments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDeployment *element, qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->deployments())
-        set.insert(element->asQObject());
+    foreach (QUmlDeployment *element, qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->deployments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -269,124 +272,124 @@ const QSet<QObject *> QUmlExtensionEndObject::deployments() const
 
 QtUml::AggregationKind QUmlExtensionEndObject::aggregation() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->aggregation();
+    return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->aggregation();
 }
 
 QObject *QUmlExtensionEndObject::association() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->association())
+    if (!qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->association())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->association()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->association()->asQModelingObject();
 }
 
 QObject *QUmlExtensionEndObject::associationEnd() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->associationEnd())
+    if (!qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->associationEnd())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->associationEnd()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->associationEnd()->asQModelingObject();
 }
 
 QObject *QUmlExtensionEndObject::class_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->class_())
+    if (!qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->class_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->class_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->class_()->asQModelingObject();
 }
 
 QObject *QUmlExtensionEndObject::datatype() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->datatype())
+    if (!qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->datatype())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->datatype()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->datatype()->asQModelingObject();
 }
 
 QString QUmlExtensionEndObject::default_() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->default_();
+    return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->default_();
 }
 
 QObject *QUmlExtensionEndObject::defaultValue() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->defaultValue())
+    if (!qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->defaultValue())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->defaultValue()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->defaultValue()->asQModelingObject();
 }
 
 QObject *QUmlExtensionEndObject::interface_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->interface_())
+    if (!qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->interface_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->interface_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->interface_()->asQModelingObject();
 }
 
 bool QUmlExtensionEndObject::isComposite() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->isComposite();
+    return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->isComposite();
 }
 
 bool QUmlExtensionEndObject::isDerived() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->isDerived();
+    return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->isDerived();
 }
 
 bool QUmlExtensionEndObject::isDerivedUnion() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->isDerivedUnion();
+    return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->isDerivedUnion();
 }
 
 bool QUmlExtensionEndObject::isID() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->isID();
+    return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->isID();
 }
 
 bool QUmlExtensionEndObject::isReadOnly() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->isReadOnly();
+    return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->isReadOnly();
 }
 
 QObject *QUmlExtensionEndObject::opposite() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->opposite())
+    if (!qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->opposite())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->opposite()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->opposite()->asQModelingObject();
 }
 
 QObject *QUmlExtensionEndObject::owningAssociation() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->owningAssociation())
+    if (!qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->owningAssociation())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->owningAssociation()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->owningAssociation()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlExtensionEndObject::qualifiers() const
 {
     QList<QObject *> list;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->qualifiers())
-        list.append(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->qualifiers())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QSet<QObject *> QUmlExtensionEndObject::redefinedProperties() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->redefinedProperties())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->redefinedProperties())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExtensionEndObject::subsettedProperties() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->subsettedProperties())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->subsettedProperties())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -394,15 +397,15 @@ const QSet<QObject *> QUmlExtensionEndObject::subsettedProperties() const
 
 int QUmlExtensionEndObject::lower() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->lower();
+    return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->lower();
 }
 
 QObject *QUmlExtensionEndObject::type() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->type())
+    if (!qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->type())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->type()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->type()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -410,14 +413,14 @@ QObject *QUmlExtensionEndObject::type() const
 QSet<QObject *> QUmlExtensionEndObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlExtensionEndObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -425,102 +428,102 @@ bool QUmlExtensionEndObject::mustBeOwned() const
 QList<QObject *> QUmlExtensionEndObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlExtensionEndObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlExtensionEndObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlExtensionEndObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->separator();
 }
 
 // OPERATIONS [MultiplicityElement]
 
 bool QUmlExtensionEndObject::compatibleWith(QObject *other) const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->compatibleWith(qmodelingobjectproperty_cast<QUmlMultiplicityElement *>(other));
+    return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->compatibleWith(qmodelingelementproperty_cast<QUmlMultiplicityElement *>(other));
 }
 
 bool QUmlExtensionEndObject::includesCardinality(int C) const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->includesCardinality(C);
+    return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->includesCardinality(C);
 }
 
 bool QUmlExtensionEndObject::includesMultiplicity(QObject *M) const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->includesMultiplicity(qmodelingobjectproperty_cast<QUmlMultiplicityElement *>(M));
+    return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->includesMultiplicity(qmodelingelementproperty_cast<QUmlMultiplicityElement *>(M));
 }
 
 bool QUmlExtensionEndObject::is(int lowerbound, int upperbound) const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->is(lowerbound, upperbound);
+    return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->is(lowerbound, upperbound);
 }
 
 bool QUmlExtensionEndObject::isMultivalued() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->isMultivalued();
+    return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->isMultivalued();
 }
 
 //int QUmlExtensionEndObject::upperBound() const
 //{
-//    return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->upperBound();
+//    return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->upperBound();
 //}
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlExtensionEndObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlExtensionEndObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [Property]
 
 bool QUmlExtensionEndObject::isAttribute(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->isAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(p));
+    return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->isAttribute(qmodelingelementproperty_cast<QUmlProperty *>(p));
 }
 
 bool QUmlExtensionEndObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlExtensionEndObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlExtensionEndObject::isNavigable() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->isNavigable();
+    return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->isNavigable();
 }
 
 QSet<QObject *> QUmlExtensionEndObject::subsettingContext() const
 {
     QSet<QObject *> set;
-    foreach (QUmlType *element, qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->subsettingContext())
-        set.insert(element->asQObject());
+    foreach (QUmlType *element, qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->subsettingContext())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -528,366 +531,478 @@ QSet<QObject *> QUmlExtensionEndObject::subsettingContext() const
 
 int QUmlExtensionEndObject::lowerBound() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->lowerBound();
+    return qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->lowerBound();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlExtensionEndObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlExtensionEndObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlExtensionEndObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlExtensionEndObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlExtensionEndObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlExtensionEndObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlExtensionEndObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlExtensionEndObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->setName(name);
 }
 
 void QUmlExtensionEndObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlExtensionEndObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlExtensionEndObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlExtensionEndObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [MultiplicityElement]
 
 void QUmlExtensionEndObject::setOrdered(bool isOrdered)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->setOrdered(isOrdered);
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->setOrdered(isOrdered);
 }
 
 void QUmlExtensionEndObject::unsetOrdered()
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("ordered"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("ordered"));
 }
 
 void QUmlExtensionEndObject::setUnique(bool isUnique)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->setUnique(isUnique);
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->setUnique(isUnique);
 }
 
 void QUmlExtensionEndObject::unsetUnique()
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("unique"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("unique"));
 }
 
 void QUmlExtensionEndObject::setLowerValue(QObject *lowerValue)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->setLowerValue(qmodelingobjectproperty_cast<QUmlValueSpecification *>(lowerValue));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->setLowerValue(qmodelingelementproperty_cast<QUmlValueSpecification *>(lowerValue));
 }
 
 void QUmlExtensionEndObject::setUpper(int upper)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->setUpper(upper);
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->setUpper(upper);
 }
 
 void QUmlExtensionEndObject::unsetUpper()
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("upper"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("upper"));
 }
 
 void QUmlExtensionEndObject::setUpperValue(QObject *upperValue)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->setUpperValue(qmodelingobjectproperty_cast<QUmlValueSpecification *>(upperValue));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->setUpperValue(qmodelingelementproperty_cast<QUmlValueSpecification *>(upperValue));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlExtensionEndObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlExtensionEndObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlExtensionEndObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlExtensionEndObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlExtensionEndObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlExtensionEndObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Feature]
 
 void QUmlExtensionEndObject::addFeaturingClassifier(QObject *featuringClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->addFeaturingClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(featuringClassifier));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->addFeaturingClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(featuringClassifier));
 }
 
 void QUmlExtensionEndObject::removeFeaturingClassifier(QObject *featuringClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->removeFeaturingClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(featuringClassifier));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->removeFeaturingClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(featuringClassifier));
 }
 
 void QUmlExtensionEndObject::setStatic(bool isStatic)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->setStatic(isStatic);
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->setStatic(isStatic);
 }
 
 void QUmlExtensionEndObject::unsetStatic()
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("static"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("static"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlExtensionEndObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 // SLOTS FOR OWNED ATTRIBUTES [ConnectableElement]
 
 void QUmlExtensionEndObject::addEnd(QObject *end)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->addEnd(qmodelingobjectproperty_cast<QUmlConnectorEnd *>(end));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->addEnd(qmodelingelementproperty_cast<QUmlConnectorEnd *>(end));
 }
 
 void QUmlExtensionEndObject::removeEnd(QObject *end)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->removeEnd(qmodelingobjectproperty_cast<QUmlConnectorEnd *>(end));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->removeEnd(qmodelingelementproperty_cast<QUmlConnectorEnd *>(end));
 }
 
 void QUmlExtensionEndObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlConnectableElementTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlConnectableElementTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [DeploymentTarget]
 
 void QUmlExtensionEndObject::addDeployedElement(QObject *deployedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->addDeployedElement(qmodelingobjectproperty_cast<QUmlPackageableElement *>(deployedElement));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->addDeployedElement(qmodelingelementproperty_cast<QUmlPackageableElement *>(deployedElement));
 }
 
 void QUmlExtensionEndObject::removeDeployedElement(QObject *deployedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->removeDeployedElement(qmodelingobjectproperty_cast<QUmlPackageableElement *>(deployedElement));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->removeDeployedElement(qmodelingelementproperty_cast<QUmlPackageableElement *>(deployedElement));
 }
 
 void QUmlExtensionEndObject::addDeployment(QObject *deployment)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->addDeployment(qmodelingobjectproperty_cast<QUmlDeployment *>(deployment));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->addDeployment(qmodelingelementproperty_cast<QUmlDeployment *>(deployment));
 }
 
 void QUmlExtensionEndObject::removeDeployment(QObject *deployment)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->removeDeployment(qmodelingobjectproperty_cast<QUmlDeployment *>(deployment));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->removeDeployment(qmodelingelementproperty_cast<QUmlDeployment *>(deployment));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Property]
 
 void QUmlExtensionEndObject::setAggregation(QtUml::AggregationKind aggregation)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->setAggregation(aggregation);
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->setAggregation(aggregation);
 }
 
 void QUmlExtensionEndObject::unsetAggregation()
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("aggregation"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("aggregation"));
 }
 
 void QUmlExtensionEndObject::setAssociation(QObject *association)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->setAssociation(qmodelingobjectproperty_cast<QUmlAssociation *>(association));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->setAssociation(qmodelingelementproperty_cast<QUmlAssociation *>(association));
 }
 
 void QUmlExtensionEndObject::setAssociationEnd(QObject *associationEnd)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->setAssociationEnd(qmodelingobjectproperty_cast<QUmlProperty *>(associationEnd));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->setAssociationEnd(qmodelingelementproperty_cast<QUmlProperty *>(associationEnd));
 }
 
 void QUmlExtensionEndObject::setClass(QObject *class_)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->setClass(qmodelingobjectproperty_cast<QUmlClass *>(class_));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->setClass(qmodelingelementproperty_cast<QUmlClass *>(class_));
 }
 
 void QUmlExtensionEndObject::setDatatype(QObject *datatype)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->setDatatype(qmodelingobjectproperty_cast<QUmlDataType *>(datatype));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->setDatatype(qmodelingelementproperty_cast<QUmlDataType *>(datatype));
 }
 
 void QUmlExtensionEndObject::setDefault(QString default_)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->setDefault(default_);
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->setDefault(default_);
 }
 
 void QUmlExtensionEndObject::setDefaultValue(QObject *defaultValue)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->setDefaultValue(qmodelingobjectproperty_cast<QUmlValueSpecification *>(defaultValue));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->setDefaultValue(qmodelingelementproperty_cast<QUmlValueSpecification *>(defaultValue));
 }
 
 void QUmlExtensionEndObject::setInterface(QObject *interface_)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->setInterface(qmodelingobjectproperty_cast<QUmlInterface *>(interface_));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->setInterface(qmodelingelementproperty_cast<QUmlInterface *>(interface_));
 }
 
 void QUmlExtensionEndObject::setComposite(bool isComposite)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->setComposite(isComposite);
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->setComposite(isComposite);
 }
 
 void QUmlExtensionEndObject::unsetComposite()
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("composite"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("composite"));
 }
 
 void QUmlExtensionEndObject::setDerived(bool isDerived)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->setDerived(isDerived);
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->setDerived(isDerived);
 }
 
 void QUmlExtensionEndObject::unsetDerived()
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("derived"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("derived"));
 }
 
 void QUmlExtensionEndObject::setDerivedUnion(bool isDerivedUnion)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->setDerivedUnion(isDerivedUnion);
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->setDerivedUnion(isDerivedUnion);
 }
 
 void QUmlExtensionEndObject::unsetDerivedUnion()
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("derivedUnion"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("derivedUnion"));
 }
 
 void QUmlExtensionEndObject::setID(bool isID)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->setID(isID);
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->setID(isID);
 }
 
 void QUmlExtensionEndObject::unsetID()
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("iD"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("iD"));
 }
 
 void QUmlExtensionEndObject::setReadOnly(bool isReadOnly)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->setReadOnly(isReadOnly);
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->setReadOnly(isReadOnly);
 }
 
 void QUmlExtensionEndObject::unsetReadOnly()
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("readOnly"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("readOnly"));
 }
 
 void QUmlExtensionEndObject::setOpposite(QObject *opposite)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->setOpposite(qmodelingobjectproperty_cast<QUmlProperty *>(opposite));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->setOpposite(qmodelingelementproperty_cast<QUmlProperty *>(opposite));
 }
 
 void QUmlExtensionEndObject::setOwningAssociation(QObject *owningAssociation)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->setOwningAssociation(qmodelingobjectproperty_cast<QUmlAssociation *>(owningAssociation));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->setOwningAssociation(qmodelingelementproperty_cast<QUmlAssociation *>(owningAssociation));
 }
 
 void QUmlExtensionEndObject::addQualifier(QObject *qualifier)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->addQualifier(qmodelingobjectproperty_cast<QUmlProperty *>(qualifier));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->addQualifier(qmodelingelementproperty_cast<QUmlProperty *>(qualifier));
 }
 
 void QUmlExtensionEndObject::removeQualifier(QObject *qualifier)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->removeQualifier(qmodelingobjectproperty_cast<QUmlProperty *>(qualifier));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->removeQualifier(qmodelingelementproperty_cast<QUmlProperty *>(qualifier));
 }
 
 void QUmlExtensionEndObject::addRedefinedProperty(QObject *redefinedProperty)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->addRedefinedProperty(qmodelingobjectproperty_cast<QUmlProperty *>(redefinedProperty));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->addRedefinedProperty(qmodelingelementproperty_cast<QUmlProperty *>(redefinedProperty));
 }
 
 void QUmlExtensionEndObject::removeRedefinedProperty(QObject *redefinedProperty)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->removeRedefinedProperty(qmodelingobjectproperty_cast<QUmlProperty *>(redefinedProperty));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->removeRedefinedProperty(qmodelingelementproperty_cast<QUmlProperty *>(redefinedProperty));
 }
 
 void QUmlExtensionEndObject::addSubsettedProperty(QObject *subsettedProperty)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->addSubsettedProperty(qmodelingobjectproperty_cast<QUmlProperty *>(subsettedProperty));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->addSubsettedProperty(qmodelingelementproperty_cast<QUmlProperty *>(subsettedProperty));
 }
 
 void QUmlExtensionEndObject::removeSubsettedProperty(QObject *subsettedProperty)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->removeSubsettedProperty(qmodelingobjectproperty_cast<QUmlProperty *>(subsettedProperty));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->removeSubsettedProperty(qmodelingelementproperty_cast<QUmlProperty *>(subsettedProperty));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExtensionEnd]
 
 void QUmlExtensionEndObject::setLower(int lower)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->setLower(lower);
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->setLower(lower);
 }
 
 void QUmlExtensionEndObject::unsetLower()
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("lower"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("lower"));
 }
 
 void QUmlExtensionEndObject::setType(QObject *type)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionEnd *>(this)->setType(qmodelingobjectproperty_cast<QUmlStereotype *>(type));
+    qmodelingelementproperty_cast<QUmlExtensionEnd *>(this)->setType(qmodelingelementproperty_cast<QUmlStereotype *>(type));
+}
+
+
+void QUmlExtensionEndObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTypedElement");
+
+    d->propertyGroups << QStringLiteral("QUmlMultiplicityElement");
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isOrdered"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isUnique"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lowerValue"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upper"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperValue"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlFeature");
+    d->groupProperties.insert(QStringLiteral("QUmlFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("featuringClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isStatic"))));
+
+    d->propertyGroups << QStringLiteral("QUmlStructuralFeature");
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlConnectableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlConnectableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ends"))));
+    d->groupProperties.insert(QStringLiteral("QUmlConnectableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDeploymentTarget");
+    d->groupProperties.insert(QStringLiteral("QUmlDeploymentTarget"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deployedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDeploymentTarget"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deployments"))));
+
+    d->propertyGroups << QStringLiteral("QUmlProperty");
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("aggregation"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("association"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("associationEnd"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("class_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("datatype"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("default_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("defaultValue"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interface_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isComposite"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isDerived"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isDerivedUnion"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isID"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isReadOnly"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("opposite"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningAssociation"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedProperties"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("subsettedProperties"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExtensionEnd");
+    d->groupProperties.insert(QStringLiteral("QUmlExtensionEnd"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lower"))));
+    d->groupProperties.insert(QStringLiteral("QUmlExtensionEnd"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
+}
+
+void QUmlExtensionEndObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtensionEnd, lower, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtensionEnd, lower, PropertyClassRole, QStringLiteral("QUmlExtensionEnd"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtensionEnd, lower, IsDerivedRole, true);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtensionEnd, lower, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtensionEnd, lower, DocumentationRole, QStringLiteral("This redefinition changes the default multiplicity of association ends, since model elements are usually extended by 0 or 1 instance of the extension stereotype."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtensionEnd, lower, RedefinedPropertiesRole, QStringLiteral("MultiplicityElement-lower"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtensionEnd, lower, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtensionEnd, lower, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtensionEnd, type, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtensionEnd, type, PropertyClassRole, QStringLiteral("QUmlExtensionEnd"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtensionEnd, type, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtensionEnd, type, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtensionEnd, type, DocumentationRole, QStringLiteral("References the type of the ExtensionEnd. Note that this association restricts the possible types of an ExtensionEnd to only be Stereotypes."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtensionEnd, type, RedefinedPropertiesRole, QStringLiteral("TypedElement-type"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtensionEnd, type, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtensionEnd, type, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlextensionendobject_p.h b/src/uml/qobjects/qumlextensionendobject_p.h
index bc92ba72..1dff926c 100644
--- a/src/uml/qobjects/qumlextensionendobject_p.h
+++ b/src/uml/qobjects/qumlextensionendobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlExtensionEnd;
-class Q_UML_EXPORT QUmlExtensionEndObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlExtensionEndObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlExtensionEndObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -127,7 +130,7 @@ class Q_UML_EXPORT QUmlExtensionEndObject : public QObject
     Q_PROPERTY(QObject * type READ type WRITE setType)
 
 public:
-    Q_INVOKABLE explicit QUmlExtensionEndObject(QUmlExtensionEnd *qModelingObject);
+    Q_INVOKABLE explicit QUmlExtensionEndObject(QUmlExtensionEnd *qModelingElement);
     virtual ~QUmlExtensionEndObject();
 
     // Owned attributes [Element]
@@ -325,6 +328,10 @@ public Q_SLOTS:
     void setLower(int lower);
     void unsetLower();
     void setType(QObject *type = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlextensionobject.cpp b/src/uml/qobjects/qumlextensionobject.cpp
index b452c5e0..2805e733 100644
--- a/src/uml/qobjects/qumlextensionobject.cpp
+++ b/src/uml/qobjects/qumlextensionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlextensionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlExtension>
 #include <QtUml/QUmlClass>
@@ -73,16 +74,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlExtensionObject::QUmlExtensionObject(QUmlExtension *qModelingObject)
+QUmlExtensionObject::QUmlExtensionObject(QUmlExtension *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlExtensionObject::~QUmlExtensionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlExtension *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlExtension *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -91,25 +94,25 @@ QUmlExtensionObject::~QUmlExtensionObject()
 const QSet<QObject *> QUmlExtensionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlExtension *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlExtension *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExtensionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlExtension *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlExtension *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlExtensionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExtension *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlExtension *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExtension *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExtension *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -117,35 +120,35 @@ QObject *QUmlExtensionObject::owner() const
 const QSet<QObject *> QUmlExtensionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlExtension *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlExtension *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlExtensionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtension *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlExtension *>(this)->name();
 }
 
 QObject *QUmlExtensionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExtension *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlExtension *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExtension *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExtension *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlExtensionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExtension *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlExtension *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExtension *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExtension *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlExtensionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtension *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlExtension *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [Namespace]
@@ -153,48 +156,48 @@ QString QUmlExtensionObject::qualifiedName() const
 const QSet<QObject *> QUmlExtensionObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlExtension *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlExtension *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExtensionObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlExtension *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlExtension *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExtensionObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlExtension *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlExtension *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExtensionObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlExtension *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlExtension *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExtensionObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlExtension *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlExtension *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExtensionObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlExtension *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlExtension *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -202,49 +205,49 @@ const QSet<QObject *> QUmlExtensionObject::packageImports() const
 
 QObject *QUmlExtensionObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExtension *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlExtension *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExtension *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExtension *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlExtensionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtension *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlExtension *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Type]
 
 QObject *QUmlExtensionObject::package() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExtension *>(this)->package())
+    if (!qmodelingelementproperty_cast<QUmlExtension *>(this)->package())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExtension *>(this)->package()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExtension *>(this)->package()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlExtensionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtension *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlExtension *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlExtensionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlExtension *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlExtension *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExtensionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlExtension *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlExtension *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -253,8 +256,8 @@ const QSet<QObject *> QUmlExtensionObject::redefinitionContexts() const
 const QSet<QObject *> QUmlExtensionObject::templateBindings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTemplateBinding *element, qmodelingobjectproperty_cast<QUmlExtension *>(this)->templateBindings())
-        set.insert(element->asQObject());
+    foreach (QUmlTemplateBinding *element, qmodelingelementproperty_cast<QUmlExtension *>(this)->templateBindings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -263,122 +266,122 @@ const QSet<QObject *> QUmlExtensionObject::templateBindings() const
 const QSet<QObject *> QUmlExtensionObject::attributes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlExtension *>(this)->attributes())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlExtension *>(this)->attributes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExtensionObject::collaborationUses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlCollaborationUse *element, qmodelingobjectproperty_cast<QUmlExtension *>(this)->collaborationUses())
-        set.insert(element->asQObject());
+    foreach (QUmlCollaborationUse *element, qmodelingelementproperty_cast<QUmlExtension *>(this)->collaborationUses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExtensionObject::features() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlExtension *>(this)->features())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlExtension *>(this)->features())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExtensionObject::generals() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlExtension *>(this)->generals())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlExtension *>(this)->generals())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExtensionObject::generalizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralization *element, qmodelingobjectproperty_cast<QUmlExtension *>(this)->generalizations())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralization *element, qmodelingelementproperty_cast<QUmlExtension *>(this)->generalizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExtensionObject::inheritedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlExtension *>(this)->inheritedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlExtension *>(this)->inheritedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlExtensionObject::isAbstract() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtension *>(this)->isAbstract();
+    return qmodelingelementproperty_cast<QUmlExtension *>(this)->isAbstract();
 }
 
 bool QUmlExtensionObject::isFinalSpecialization() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtension *>(this)->isFinalSpecialization();
+    return qmodelingelementproperty_cast<QUmlExtension *>(this)->isFinalSpecialization();
 }
 
 QObject *QUmlExtensionObject::ownedTemplateSignature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExtension *>(this)->ownedTemplateSignature())
+    if (!qmodelingelementproperty_cast<QUmlExtension *>(this)->ownedTemplateSignature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExtension *>(this)->ownedTemplateSignature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExtension *>(this)->ownedTemplateSignature()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlExtensionObject::ownedUseCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlExtension *>(this)->ownedUseCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlExtension *>(this)->ownedUseCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExtensionObject::powertypeExtents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralizationSet *element, qmodelingobjectproperty_cast<QUmlExtension *>(this)->powertypeExtents())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralizationSet *element, qmodelingelementproperty_cast<QUmlExtension *>(this)->powertypeExtents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExtensionObject::redefinedClassifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlExtension *>(this)->redefinedClassifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlExtension *>(this)->redefinedClassifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlExtensionObject::representation() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExtension *>(this)->representation())
+    if (!qmodelingelementproperty_cast<QUmlExtension *>(this)->representation())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExtension *>(this)->representation()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExtension *>(this)->representation()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlExtensionObject::substitutions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlSubstitution *element, qmodelingobjectproperty_cast<QUmlExtension *>(this)->substitutions())
-        set.insert(element->asQObject());
+    foreach (QUmlSubstitution *element, qmodelingelementproperty_cast<QUmlExtension *>(this)->substitutions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlExtensionObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExtension *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlExtension *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExtension *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExtension *>(this)->templateParameter()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlExtensionObject::useCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlExtension *>(this)->useCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlExtension *>(this)->useCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -387,8 +390,8 @@ const QSet<QObject *> QUmlExtensionObject::useCases() const
 const QSet<QObject *> QUmlExtensionObject::relatedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlExtension *>(this)->relatedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlExtension *>(this)->relatedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -397,29 +400,29 @@ const QSet<QObject *> QUmlExtensionObject::relatedElements() const
 const QList<QObject *> QUmlExtensionObject::endTypes() const
 {
     QList<QObject *> list;
-    foreach (QUmlType *element, qmodelingobjectproperty_cast<QUmlExtension *>(this)->endTypes())
-        list.append(element->asQObject());
+    foreach (QUmlType *element, qmodelingelementproperty_cast<QUmlExtension *>(this)->endTypes())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlExtensionObject::isDerived() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtension *>(this)->isDerived();
+    return qmodelingelementproperty_cast<QUmlExtension *>(this)->isDerived();
 }
 
 const QList<QObject *> QUmlExtensionObject::memberEnds() const
 {
     QList<QObject *> list;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlExtension *>(this)->memberEnds())
-        list.append(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlExtension *>(this)->memberEnds())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QSet<QObject *> QUmlExtensionObject::navigableOwnedEnds() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlExtension *>(this)->navigableOwnedEnds())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlExtension *>(this)->navigableOwnedEnds())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -427,23 +430,23 @@ const QSet<QObject *> QUmlExtensionObject::navigableOwnedEnds() const
 
 bool QUmlExtensionObject::isRequired() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtension *>(this)->isRequired();
+    return qmodelingelementproperty_cast<QUmlExtension *>(this)->isRequired();
 }
 
 QObject *QUmlExtensionObject::metaclass() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExtension *>(this)->metaclass())
+    if (!qmodelingelementproperty_cast<QUmlExtension *>(this)->metaclass())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExtension *>(this)->metaclass()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExtension *>(this)->metaclass()->asQModelingObject();
 }
 
 QObject *QUmlExtensionObject::ownedEnd() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExtension *>(this)->ownedEnd())
+    if (!qmodelingelementproperty_cast<QUmlExtension *>(this)->ownedEnd())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExtension *>(this)->ownedEnd()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExtension *>(this)->ownedEnd()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -451,14 +454,14 @@ QObject *QUmlExtensionObject::ownedEnd() const
 QSet<QObject *> QUmlExtensionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlExtension *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlExtension *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlExtensionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtension *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlExtension *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -466,27 +469,27 @@ bool QUmlExtensionObject::mustBeOwned() const
 QList<QObject *> QUmlExtensionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlExtension *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlExtension *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlExtensionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlExtension *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlExtension *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlExtensionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlExtension *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlExtension *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlExtensionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtension *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlExtension *>(this)->separator();
 }
 
 // OPERATIONS [Namespace]
@@ -495,44 +498,44 @@ QSet<QObject *> QUmlExtensionObject::excludeCollisions(QSet<QObject *> imps) con
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlExtension *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlExtension *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlExtensionObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlExtension *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlExtension *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlExtensionObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlExtension *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlExtension *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlExtensionObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtension *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlExtension *>(this)->membersAreDistinguishable();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlExtensionObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlExtension *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlExtension *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlExtensionObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtension *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlExtension *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [Type]
@@ -540,12 +543,12 @@ bool QUmlExtensionObject::isTemplateParameter() const
 
 bool QUmlExtensionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlExtension *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlExtension *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlExtensionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlExtension *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlExtension *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [TemplateableElement]
@@ -553,8 +556,8 @@ bool QUmlExtensionObject::isRedefinitionContextValid(QObject *redefined) const
 QSet<QObject *> QUmlExtensionObject::parameterableElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterableElement *element, qmodelingobjectproperty_cast<QUmlExtension *>(this)->parameterableElements())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterableElement *element, qmodelingelementproperty_cast<QUmlExtension *>(this)->parameterableElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -563,63 +566,63 @@ QSet<QObject *> QUmlExtensionObject::parameterableElements() const
 QSet<QObject *> QUmlExtensionObject::allFeatures() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlExtension *>(this)->allFeatures())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlExtension *>(this)->allFeatures())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlExtensionObject::allParents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlExtension *>(this)->allParents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlExtension *>(this)->allParents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlExtensionObject::conformsTo(QObject *other) const
 {
-    return qmodelingobjectproperty_cast<QUmlExtension *>(this)->conformsTo(qmodelingobjectproperty_cast<QUmlClassifier *>(other));
+    return qmodelingelementproperty_cast<QUmlExtension *>(this)->conformsTo(qmodelingelementproperty_cast<QUmlClassifier *>(other));
 }
 
 bool QUmlExtensionObject::hasVisibilityOf(QObject *n) const
 {
-    return qmodelingobjectproperty_cast<QUmlExtension *>(this)->hasVisibilityOf(qmodelingobjectproperty_cast<QUmlNamedElement *>(n));
+    return qmodelingelementproperty_cast<QUmlExtension *>(this)->hasVisibilityOf(qmodelingelementproperty_cast<QUmlNamedElement *>(n));
 }
 
 QSet<QObject *> QUmlExtensionObject::inherit(QSet<QObject *> inhs) const
 {
     QSet<QUmlNamedElement *> inhsConverted;
     foreach (QObject *object, inhs)
-        inhsConverted.insert(qmodelingobjectproperty_cast<QUmlNamedElement *>(object));
+        inhsConverted.insert(qmodelingelementproperty_cast<QUmlNamedElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlExtension *>(this)->inherit(inhsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlExtension *>(this)->inherit(inhsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlExtensionObject::inheritableMembers(QObject *c) const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlExtension *>(this)->inheritableMembers(qmodelingobjectproperty_cast<QUmlClassifier *>(c)))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlExtension *>(this)->inheritableMembers(qmodelingelementproperty_cast<QUmlClassifier *>(c)))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlExtensionObject::isTemplate() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtension *>(this)->isTemplate();
+    return qmodelingelementproperty_cast<QUmlExtension *>(this)->isTemplate();
 }
 
 bool QUmlExtensionObject::maySpecializeType(QObject *c) const
 {
-    return qmodelingobjectproperty_cast<QUmlExtension *>(this)->maySpecializeType(qmodelingobjectproperty_cast<QUmlClassifier *>(c));
+    return qmodelingelementproperty_cast<QUmlExtension *>(this)->maySpecializeType(qmodelingelementproperty_cast<QUmlClassifier *>(c));
 }
 
 QSet<QObject *> QUmlExtensionObject::parents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlExtension *>(this)->parents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlExtension *>(this)->parents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -627,421 +630,537 @@ QSet<QObject *> QUmlExtensionObject::parents() const
 
 QObject *QUmlExtensionObject::metaclassEnd() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExtension *>(this)->metaclassEnd())
+    if (!qmodelingelementproperty_cast<QUmlExtension *>(this)->metaclassEnd())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExtension *>(this)->metaclassEnd()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExtension *>(this)->metaclassEnd()->asQModelingObject();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlExtensionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlExtensionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlExtensionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlExtensionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlExtensionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlExtensionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlExtensionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlExtensionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->setName(name);
 }
 
 void QUmlExtensionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlExtensionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlExtensionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlExtensionObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlExtensionObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlExtensionObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlExtensionObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlExtensionObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlExtensionObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlExtensionObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlExtensionObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlExtensionObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlExtensionObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlExtensionObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlExtensionObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlExtensionObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlExtensionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->setVisibility(visibility);
 }
 
 void QUmlExtensionObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Type]
 
 void QUmlExtensionObject::setPackage(QObject *package)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->setPackage(qmodelingobjectproperty_cast<QUmlPackage *>(package));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->setPackage(qmodelingelementproperty_cast<QUmlPackage *>(package));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlExtensionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlExtensionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlExtensionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlExtensionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlExtensionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlExtensionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateableElement]
 
 void QUmlExtensionObject::addTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->addTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->addTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 void QUmlExtensionObject::removeTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->removeTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->removeTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Classifier]
 
 void QUmlExtensionObject::addAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->addAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->addAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlExtensionObject::removeAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->removeAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->removeAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlExtensionObject::addCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->addCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->addCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlExtensionObject::removeCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->removeCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->removeCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlExtensionObject::addFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->addFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->addFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlExtensionObject::removeFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->removeFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->removeFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlExtensionObject::addGeneral(QObject *general)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->addGeneral(qmodelingobjectproperty_cast<QUmlClassifier *>(general));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->addGeneral(qmodelingelementproperty_cast<QUmlClassifier *>(general));
 }
 
 void QUmlExtensionObject::removeGeneral(QObject *general)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->removeGeneral(qmodelingobjectproperty_cast<QUmlClassifier *>(general));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->removeGeneral(qmodelingelementproperty_cast<QUmlClassifier *>(general));
 }
 
 void QUmlExtensionObject::addGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->addGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->addGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlExtensionObject::removeGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->removeGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->removeGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlExtensionObject::addInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->addInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->addInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlExtensionObject::removeInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->removeInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->removeInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlExtensionObject::setAbstract(bool isAbstract)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->setAbstract(isAbstract);
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->setAbstract(isAbstract);
 }
 
 void QUmlExtensionObject::unsetAbstract()
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("abstract"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
 void QUmlExtensionObject::setFinalSpecialization(bool isFinalSpecialization)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->setFinalSpecialization(isFinalSpecialization);
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->setFinalSpecialization(isFinalSpecialization);
 }
 
 void QUmlExtensionObject::unsetFinalSpecialization()
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("finalSpecialization"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
 void QUmlExtensionObject::setOwnedTemplateSignature(QObject *ownedTemplateSignature)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->setOwnedTemplateSignature(qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->setOwnedTemplateSignature(qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
 }
 
 void QUmlExtensionObject::addOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->addOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->addOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlExtensionObject::removeOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->removeOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->removeOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlExtensionObject::addPowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->addPowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->addPowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlExtensionObject::removePowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->removePowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->removePowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlExtensionObject::addRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->addRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->addRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlExtensionObject::removeRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->removeRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->removeRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlExtensionObject::setRepresentation(QObject *representation)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->setRepresentation(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(representation));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->setRepresentation(qmodelingelementproperty_cast<QUmlCollaborationUse *>(representation));
 }
 
 void QUmlExtensionObject::addSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->addSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->addSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlExtensionObject::removeSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->removeSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->removeSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlExtensionObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
 }
 
 void QUmlExtensionObject::addUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->addUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->addUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 void QUmlExtensionObject::removeUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->removeUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->removeUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Relationship]
 
 void QUmlExtensionObject::addRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->addRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->addRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 void QUmlExtensionObject::removeRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->removeRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->removeRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Association]
 
 void QUmlExtensionObject::addEndType(QObject *endType)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->addEndType(qmodelingobjectproperty_cast<QUmlType *>(endType));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->addEndType(qmodelingelementproperty_cast<QUmlType *>(endType));
 }
 
 void QUmlExtensionObject::removeEndType(QObject *endType)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->removeEndType(qmodelingobjectproperty_cast<QUmlType *>(endType));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->removeEndType(qmodelingelementproperty_cast<QUmlType *>(endType));
 }
 
 void QUmlExtensionObject::setDerived(bool isDerived)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->setDerived(isDerived);
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->setDerived(isDerived);
 }
 
 void QUmlExtensionObject::unsetDerived()
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("derived"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("derived"));
 }
 
 void QUmlExtensionObject::addMemberEnd(QObject *memberEnd)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->addMemberEnd(qmodelingobjectproperty_cast<QUmlProperty *>(memberEnd));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->addMemberEnd(qmodelingelementproperty_cast<QUmlProperty *>(memberEnd));
 }
 
 void QUmlExtensionObject::removeMemberEnd(QObject *memberEnd)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->removeMemberEnd(qmodelingobjectproperty_cast<QUmlProperty *>(memberEnd));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->removeMemberEnd(qmodelingelementproperty_cast<QUmlProperty *>(memberEnd));
 }
 
 void QUmlExtensionObject::addNavigableOwnedEnd(QObject *navigableOwnedEnd)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->addNavigableOwnedEnd(qmodelingobjectproperty_cast<QUmlProperty *>(navigableOwnedEnd));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->addNavigableOwnedEnd(qmodelingelementproperty_cast<QUmlProperty *>(navigableOwnedEnd));
 }
 
 void QUmlExtensionObject::removeNavigableOwnedEnd(QObject *navigableOwnedEnd)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->removeNavigableOwnedEnd(qmodelingobjectproperty_cast<QUmlProperty *>(navigableOwnedEnd));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->removeNavigableOwnedEnd(qmodelingelementproperty_cast<QUmlProperty *>(navigableOwnedEnd));
 }
 // SLOTS FOR OWNED ATTRIBUTES [Extension]
 
 void QUmlExtensionObject::setRequired(bool isRequired)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->setRequired(isRequired);
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->setRequired(isRequired);
 }
 
 void QUmlExtensionObject::unsetRequired()
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("required"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("required"));
 }
 
 void QUmlExtensionObject::setMetaclass(QObject *metaclass)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->setMetaclass(qmodelingobjectproperty_cast<QUmlClass *>(metaclass));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->setMetaclass(qmodelingelementproperty_cast<QUmlClass *>(metaclass));
 }
 
 void QUmlExtensionObject::setOwnedEnd(QObject *ownedEnd)
 {
-    qmodelingobjectproperty_cast<QUmlExtension *>(this)->setOwnedEnd(qmodelingobjectproperty_cast<QUmlExtensionEnd *>(ownedEnd));
+    qmodelingelementproperty_cast<QUmlExtension *>(this)->setOwnedEnd(qmodelingelementproperty_cast<QUmlExtensionEnd *>(ownedEnd));
+}
+
+
+void QUmlExtensionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlType");
+    d->groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generals"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAssociation");
+    d->groupProperties.insert(QStringLiteral("QUmlAssociation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("endTypes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAssociation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isDerived"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAssociation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("memberEnds"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAssociation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("navigableOwnedEnds"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExtension");
+    d->groupProperties.insert(QStringLiteral("QUmlExtension"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isRequired"))));
+    d->groupProperties.insert(QStringLiteral("QUmlExtension"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("metaclass"))));
+    d->groupProperties.insert(QStringLiteral("QUmlExtension"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedEnd"))));
+}
+
+void QUmlExtensionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtension, isRequired, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtension, isRequired, PropertyClassRole, QStringLiteral("QUmlExtension"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtension, isRequired, IsDerivedRole, true);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtension, isRequired, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtension, isRequired, DocumentationRole, QStringLiteral("Indicates whether an instance of the extending stereotype must be created when an instance of the extended class is created. The attribute value is derived from the value of the lower property of the ExtensionEnd referenced by Extension::ownedEnd; a lower value of 1 means that isRequired is true, but otherwise it is false. Since the default value of ExtensionEnd::lower is 0, the default value of isRequired is false."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtension, isRequired, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtension, isRequired, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtension, isRequired, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtension, metaclass, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtension, metaclass, PropertyClassRole, QStringLiteral("QUmlExtension"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtension, metaclass, IsDerivedRole, true);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtension, metaclass, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtension, metaclass, DocumentationRole, QStringLiteral("References the Class that is extended through an Extension. The property is derived from the type of the memberEnd that is not the ownedEnd."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtension, metaclass, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtension, metaclass, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtension, metaclass, OppositeEndRole, QStringLiteral("Class-extension"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtension, ownedEnd, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtension, ownedEnd, PropertyClassRole, QStringLiteral("QUmlExtension"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtension, ownedEnd, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtension, ownedEnd, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtension, ownedEnd, DocumentationRole, QStringLiteral("References the end of the extension that is typed by a Stereotype."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtension, ownedEnd, RedefinedPropertiesRole, QStringLiteral("Association-ownedEnd"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtension, ownedEnd, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtension, ownedEnd, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlextensionobject_p.h b/src/uml/qobjects/qumlextensionobject_p.h
index c238827e..47d4f2d7 100644
--- a/src/uml/qobjects/qumlextensionobject_p.h
+++ b/src/uml/qobjects/qumlextensionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlExtension;
-class Q_UML_EXPORT QUmlExtensionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlExtensionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlExtensionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -128,7 +131,7 @@ class Q_UML_EXPORT QUmlExtensionObject : public QObject
     Q_PROPERTY(QObject * ownedEnd READ ownedEnd WRITE setOwnedEnd)
 
 public:
-    Q_INVOKABLE explicit QUmlExtensionObject(QUmlExtension *qModelingObject);
+    Q_INVOKABLE explicit QUmlExtensionObject(QUmlExtension *qModelingElement);
     virtual ~QUmlExtensionObject();
 
     // Owned attributes [Element]
@@ -346,6 +349,10 @@ public Q_SLOTS:
     void unsetRequired();
     void Q_DECL_HIDDEN setMetaclass(QObject *metaclass = 0);
     void setOwnedEnd(QObject *ownedEnd = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlextensionpointobject.cpp b/src/uml/qobjects/qumlextensionpointobject.cpp
index 1ffb5909..66d151e3 100644
--- a/src/uml/qobjects/qumlextensionpointobject.cpp
+++ b/src/uml/qobjects/qumlextensionpointobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlextensionpointobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlExtensionPoint>
 #include <QtUml/QUmlClassifier>
@@ -54,16 +55,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlExtensionPointObject::QUmlExtensionPointObject(QUmlExtensionPoint *qModelingObject)
+QUmlExtensionPointObject::QUmlExtensionPointObject(QUmlExtensionPoint *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlExtensionPointObject::~QUmlExtensionPointObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -72,25 +75,25 @@ QUmlExtensionPointObject::~QUmlExtensionPointObject()
 const QSet<QObject *> QUmlExtensionPointObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExtensionPointObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlExtensionPointObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -98,62 +101,62 @@ QObject *QUmlExtensionPointObject::owner() const
 const QSet<QObject *> QUmlExtensionPointObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlExtensionPointObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->name();
 }
 
 QObject *QUmlExtensionPointObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlExtensionPointObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlExtensionPointObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlExtensionPointObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlExtensionPointObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlExtensionPointObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlExtensionPointObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -161,10 +164,10 @@ const QSet<QObject *> QUmlExtensionPointObject::redefinitionContexts() const
 
 QObject *QUmlExtensionPointObject::useCase() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->useCase())
+    if (!qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->useCase())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->useCase()->asQObject();
+        return qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->useCase()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -172,14 +175,14 @@ QObject *QUmlExtensionPointObject::useCase() const
 QSet<QObject *> QUmlExtensionPointObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlExtensionPointObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -187,142 +190,187 @@ bool QUmlExtensionPointObject::mustBeOwned() const
 QList<QObject *> QUmlExtensionPointObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlExtensionPointObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlExtensionPointObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlExtensionPointObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlExtensionPointObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlExtensionPointObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlExtensionPointObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlExtensionPointObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlExtensionPointObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlExtensionPointObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlExtensionPointObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlExtensionPointObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlExtensionPointObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlExtensionPointObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->setName(name);
 }
 
 void QUmlExtensionPointObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlExtensionPointObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlExtensionPointObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlExtensionPointObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlExtensionPointObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlExtensionPointObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlExtensionPointObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlExtensionPointObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlExtensionPointObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlExtensionPointObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExtensionPoint]
 
 void QUmlExtensionPointObject::setUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlExtensionPoint *>(this)->setUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlExtensionPoint *>(this)->setUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
+}
+
+
+void QUmlExtensionPointObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExtensionPoint");
+    d->groupProperties.insert(QStringLiteral("QUmlExtensionPoint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCase"))));
+}
+
+void QUmlExtensionPointObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtensionPoint, useCase, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtensionPoint, useCase, PropertyClassRole, QStringLiteral("QUmlExtensionPoint"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtensionPoint, useCase, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtensionPoint, useCase, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtensionPoint, useCase, DocumentationRole, QStringLiteral("References the use case that owns this extension point."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtensionPoint, useCase, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtensionPoint, useCase, SubsettedPropertiesRole, QStringLiteral("NamedElement-namespace"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlExtensionPoint, useCase, OppositeEndRole, QStringLiteral("UseCase-extensionPoint"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlextensionpointobject_p.h b/src/uml/qobjects/qumlextensionpointobject_p.h
index 1d43f81c..53a3b8f6 100644
--- a/src/uml/qobjects/qumlextensionpointobject_p.h
+++ b/src/uml/qobjects/qumlextensionpointobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlExtensionPoint;
-class Q_UML_EXPORT QUmlExtensionPointObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlExtensionPointObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlExtensionPointObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -80,7 +83,7 @@ class Q_UML_EXPORT QUmlExtensionPointObject : public QObject
     Q_PROPERTY(QObject * useCase READ useCase WRITE setUseCase)
 
 public:
-    Q_INVOKABLE explicit QUmlExtensionPointObject(QUmlExtensionPoint *qModelingObject);
+    Q_INVOKABLE explicit QUmlExtensionPointObject(QUmlExtensionPoint *qModelingElement);
     virtual ~QUmlExtensionPointObject();
 
     // Owned attributes [Element]
@@ -146,6 +149,10 @@ public Q_SLOTS:
 
     // Slots for owned attributes [ExtensionPoint]
     void setUseCase(QObject *useCase = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlfinalstateobject.cpp b/src/uml/qobjects/qumlfinalstateobject.cpp
index 71ba5567..48470aa0 100644
--- a/src/uml/qobjects/qumlfinalstateobject.cpp
+++ b/src/uml/qobjects/qumlfinalstateobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlfinalstateobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlFinalState>
 #include <QtUml/QUmlBehavior>
@@ -65,16 +66,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlFinalStateObject::QUmlFinalStateObject(QUmlFinalState *qModelingObject)
+QUmlFinalStateObject::QUmlFinalStateObject(QUmlFinalState *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlFinalStateObject::~QUmlFinalStateObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlFinalState *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlFinalState *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -83,25 +86,25 @@ QUmlFinalStateObject::~QUmlFinalStateObject()
 const QSet<QObject *> QUmlFinalStateObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlFinalState *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlFinalState *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlFinalStateObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlFinalState *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlFinalState *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlFinalStateObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlFinalState *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlFinalState *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlFinalState *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlFinalState *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -109,40 +112,40 @@ QObject *QUmlFinalStateObject::owner() const
 const QSet<QObject *> QUmlFinalStateObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlFinalState *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlFinalState *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlFinalStateObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlFinalState *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlFinalState *>(this)->name();
 }
 
 QObject *QUmlFinalStateObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlFinalState *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlFinalState *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlFinalState *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlFinalState *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlFinalStateObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlFinalState *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlFinalState *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlFinalState *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlFinalState *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlFinalStateObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlFinalState *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlFinalState *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlFinalStateObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlFinalState *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlFinalState *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Namespace]
@@ -150,48 +153,48 @@ QtUml::VisibilityKind QUmlFinalStateObject::visibility() const
 const QSet<QObject *> QUmlFinalStateObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlFinalState *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlFinalState *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlFinalStateObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlFinalState *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlFinalState *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlFinalStateObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlFinalState *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlFinalState *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlFinalStateObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlFinalState *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlFinalState *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlFinalStateObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlFinalState *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlFinalState *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlFinalStateObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlFinalState *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlFinalState *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -199,14 +202,14 @@ const QSet<QObject *> QUmlFinalStateObject::packageImports() const
 
 bool QUmlFinalStateObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlFinalState *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlFinalState *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlFinalStateObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlFinalState *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlFinalState *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -214,25 +217,25 @@ const QSet<QObject *> QUmlFinalStateObject::redefinedElements() const
 
 QObject *QUmlFinalStateObject::container() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlFinalState *>(this)->container())
+    if (!qmodelingelementproperty_cast<QUmlFinalState *>(this)->container())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlFinalState *>(this)->container()->asQObject();
+        return qmodelingelementproperty_cast<QUmlFinalState *>(this)->container()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlFinalStateObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTransition *element, qmodelingobjectproperty_cast<QUmlFinalState *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlTransition *element, qmodelingelementproperty_cast<QUmlFinalState *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlFinalStateObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTransition *element, qmodelingobjectproperty_cast<QUmlFinalState *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlTransition *element, qmodelingelementproperty_cast<QUmlFinalState *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -241,109 +244,109 @@ const QSet<QObject *> QUmlFinalStateObject::outgoings() const
 const QSet<QObject *> QUmlFinalStateObject::connections() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConnectionPointReference *element, qmodelingobjectproperty_cast<QUmlFinalState *>(this)->connections())
-        set.insert(element->asQObject());
+    foreach (QUmlConnectionPointReference *element, qmodelingelementproperty_cast<QUmlFinalState *>(this)->connections())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlFinalStateObject::connectionPoints() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPseudostate *element, qmodelingobjectproperty_cast<QUmlFinalState *>(this)->connectionPoints())
-        set.insert(element->asQObject());
+    foreach (QUmlPseudostate *element, qmodelingelementproperty_cast<QUmlFinalState *>(this)->connectionPoints())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlFinalStateObject::deferrableTriggers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTrigger *element, qmodelingobjectproperty_cast<QUmlFinalState *>(this)->deferrableTriggers())
-        set.insert(element->asQObject());
+    foreach (QUmlTrigger *element, qmodelingelementproperty_cast<QUmlFinalState *>(this)->deferrableTriggers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlFinalStateObject::doActivity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlFinalState *>(this)->doActivity())
+    if (!qmodelingelementproperty_cast<QUmlFinalState *>(this)->doActivity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlFinalState *>(this)->doActivity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlFinalState *>(this)->doActivity()->asQModelingObject();
 }
 
 QObject *QUmlFinalStateObject::entry() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlFinalState *>(this)->entry())
+    if (!qmodelingelementproperty_cast<QUmlFinalState *>(this)->entry())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlFinalState *>(this)->entry()->asQObject();
+        return qmodelingelementproperty_cast<QUmlFinalState *>(this)->entry()->asQModelingObject();
 }
 
 QObject *QUmlFinalStateObject::exit() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlFinalState *>(this)->exit())
+    if (!qmodelingelementproperty_cast<QUmlFinalState *>(this)->exit())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlFinalState *>(this)->exit()->asQObject();
+        return qmodelingelementproperty_cast<QUmlFinalState *>(this)->exit()->asQModelingObject();
 }
 
 bool QUmlFinalStateObject::isComposite() const
 {
-    return qmodelingobjectproperty_cast<QUmlFinalState *>(this)->isComposite();
+    return qmodelingelementproperty_cast<QUmlFinalState *>(this)->isComposite();
 }
 
 bool QUmlFinalStateObject::isOrthogonal() const
 {
-    return qmodelingobjectproperty_cast<QUmlFinalState *>(this)->isOrthogonal();
+    return qmodelingelementproperty_cast<QUmlFinalState *>(this)->isOrthogonal();
 }
 
 bool QUmlFinalStateObject::isSimple() const
 {
-    return qmodelingobjectproperty_cast<QUmlFinalState *>(this)->isSimple();
+    return qmodelingelementproperty_cast<QUmlFinalState *>(this)->isSimple();
 }
 
 bool QUmlFinalStateObject::isSubmachineState() const
 {
-    return qmodelingobjectproperty_cast<QUmlFinalState *>(this)->isSubmachineState();
+    return qmodelingelementproperty_cast<QUmlFinalState *>(this)->isSubmachineState();
 }
 
 QObject *QUmlFinalStateObject::redefinedState() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlFinalState *>(this)->redefinedState())
+    if (!qmodelingelementproperty_cast<QUmlFinalState *>(this)->redefinedState())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlFinalState *>(this)->redefinedState()->asQObject();
+        return qmodelingelementproperty_cast<QUmlFinalState *>(this)->redefinedState()->asQModelingObject();
 }
 
 QObject *QUmlFinalStateObject::redefinitionContext() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlFinalState *>(this)->redefinitionContext())
+    if (!qmodelingelementproperty_cast<QUmlFinalState *>(this)->redefinitionContext())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlFinalState *>(this)->redefinitionContext()->asQObject();
+        return qmodelingelementproperty_cast<QUmlFinalState *>(this)->redefinitionContext()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlFinalStateObject::regions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRegion *element, qmodelingobjectproperty_cast<QUmlFinalState *>(this)->regions())
-        set.insert(element->asQObject());
+    foreach (QUmlRegion *element, qmodelingelementproperty_cast<QUmlFinalState *>(this)->regions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlFinalStateObject::stateInvariant() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlFinalState *>(this)->stateInvariant())
+    if (!qmodelingelementproperty_cast<QUmlFinalState *>(this)->stateInvariant())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlFinalState *>(this)->stateInvariant()->asQObject();
+        return qmodelingelementproperty_cast<QUmlFinalState *>(this)->stateInvariant()->asQModelingObject();
 }
 
 QObject *QUmlFinalStateObject::submachine() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlFinalState *>(this)->submachine())
+    if (!qmodelingelementproperty_cast<QUmlFinalState *>(this)->submachine())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlFinalState *>(this)->submachine()->asQObject();
+        return qmodelingelementproperty_cast<QUmlFinalState *>(this)->submachine()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -351,14 +354,14 @@ QObject *QUmlFinalStateObject::submachine() const
 QSet<QObject *> QUmlFinalStateObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlFinalState *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlFinalState *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlFinalStateObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlFinalState *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlFinalState *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -366,27 +369,27 @@ bool QUmlFinalStateObject::mustBeOwned() const
 QList<QObject *> QUmlFinalStateObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlFinalState *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlFinalState *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlFinalStateObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlFinalState *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlFinalState *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlFinalStateObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlFinalState *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlFinalState *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlFinalStateObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlFinalState *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlFinalState *>(this)->separator();
 }
 
 // OPERATIONS [Namespace]
@@ -395,32 +398,32 @@ QSet<QObject *> QUmlFinalStateObject::excludeCollisions(QSet<QObject *> imps) co
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlFinalState *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlFinalState *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlFinalStateObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlFinalState *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlFinalState *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlFinalStateObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlFinalState *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlFinalState *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlFinalStateObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlFinalState *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlFinalState *>(this)->membersAreDistinguishable();
 }
 
 // OPERATIONS [RedefinableElement]
@@ -429,311 +432,379 @@ bool QUmlFinalStateObject::membersAreDistinguishable() const
 
 QObject *QUmlFinalStateObject::containingStateMachine() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlFinalState *>(this)->containingStateMachine())
+    if (!qmodelingelementproperty_cast<QUmlFinalState *>(this)->containingStateMachine())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlFinalState *>(this)->containingStateMachine()->asQObject();
+        return qmodelingelementproperty_cast<QUmlFinalState *>(this)->containingStateMachine()->asQModelingObject();
 }
 
 bool QUmlFinalStateObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlFinalState *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlFinalState *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlFinalStateObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlFinalState *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlState *>(redefined));
+    return qmodelingelementproperty_cast<QUmlFinalState *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlState *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlFinalStateObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlFinalStateObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlFinalStateObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlFinalStateObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlFinalStateObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlFinalStateObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlFinalStateObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlFinalStateObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->setName(name);
 }
 
 void QUmlFinalStateObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlFinalStateObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlFinalStateObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlFinalStateObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlFinalStateObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlFinalStateObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlFinalStateObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlFinalStateObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlFinalStateObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlFinalStateObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlFinalStateObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlFinalStateObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlFinalStateObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlFinalStateObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlFinalStateObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlFinalStateObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlFinalStateObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlFinalStateObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlFinalStateObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlFinalStateObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 // SLOTS FOR OWNED ATTRIBUTES [Vertex]
 
 void QUmlFinalStateObject::setContainer(QObject *container)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->setContainer(qmodelingobjectproperty_cast<QUmlRegion *>(container));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->setContainer(qmodelingelementproperty_cast<QUmlRegion *>(container));
 }
 
 void QUmlFinalStateObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlTransition *>(incoming));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlTransition *>(incoming));
 }
 
 void QUmlFinalStateObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlTransition *>(incoming));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlTransition *>(incoming));
 }
 
 void QUmlFinalStateObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlTransition *>(outgoing));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlTransition *>(outgoing));
 }
 
 void QUmlFinalStateObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlTransition *>(outgoing));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlTransition *>(outgoing));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [State]
 
 void QUmlFinalStateObject::addConnection(QObject *connection)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->addConnection(qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(connection));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->addConnection(qmodelingelementproperty_cast<QUmlConnectionPointReference *>(connection));
 }
 
 void QUmlFinalStateObject::removeConnection(QObject *connection)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->removeConnection(qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(connection));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->removeConnection(qmodelingelementproperty_cast<QUmlConnectionPointReference *>(connection));
 }
 
 void QUmlFinalStateObject::addConnectionPoint(QObject *connectionPoint)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->addConnectionPoint(qmodelingobjectproperty_cast<QUmlPseudostate *>(connectionPoint));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->addConnectionPoint(qmodelingelementproperty_cast<QUmlPseudostate *>(connectionPoint));
 }
 
 void QUmlFinalStateObject::removeConnectionPoint(QObject *connectionPoint)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->removeConnectionPoint(qmodelingobjectproperty_cast<QUmlPseudostate *>(connectionPoint));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->removeConnectionPoint(qmodelingelementproperty_cast<QUmlPseudostate *>(connectionPoint));
 }
 
 void QUmlFinalStateObject::addDeferrableTrigger(QObject *deferrableTrigger)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->addDeferrableTrigger(qmodelingobjectproperty_cast<QUmlTrigger *>(deferrableTrigger));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->addDeferrableTrigger(qmodelingelementproperty_cast<QUmlTrigger *>(deferrableTrigger));
 }
 
 void QUmlFinalStateObject::removeDeferrableTrigger(QObject *deferrableTrigger)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->removeDeferrableTrigger(qmodelingobjectproperty_cast<QUmlTrigger *>(deferrableTrigger));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->removeDeferrableTrigger(qmodelingelementproperty_cast<QUmlTrigger *>(deferrableTrigger));
 }
 
 void QUmlFinalStateObject::setDoActivity(QObject *doActivity)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->setDoActivity(qmodelingobjectproperty_cast<QUmlBehavior *>(doActivity));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->setDoActivity(qmodelingelementproperty_cast<QUmlBehavior *>(doActivity));
 }
 
 void QUmlFinalStateObject::setEntry(QObject *entry)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->setEntry(qmodelingobjectproperty_cast<QUmlBehavior *>(entry));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->setEntry(qmodelingelementproperty_cast<QUmlBehavior *>(entry));
 }
 
 void QUmlFinalStateObject::setExit(QObject *exit)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->setExit(qmodelingobjectproperty_cast<QUmlBehavior *>(exit));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->setExit(qmodelingelementproperty_cast<QUmlBehavior *>(exit));
 }
 
 void QUmlFinalStateObject::setComposite(bool isComposite)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->setComposite(isComposite);
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->setComposite(isComposite);
 }
 
 void QUmlFinalStateObject::unsetComposite()
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("composite"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("composite"));
 }
 
 void QUmlFinalStateObject::setOrthogonal(bool isOrthogonal)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->setOrthogonal(isOrthogonal);
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->setOrthogonal(isOrthogonal);
 }
 
 void QUmlFinalStateObject::unsetOrthogonal()
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("orthogonal"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("orthogonal"));
 }
 
 void QUmlFinalStateObject::setSimple(bool isSimple)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->setSimple(isSimple);
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->setSimple(isSimple);
 }
 
 void QUmlFinalStateObject::unsetSimple()
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("simple"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("simple"));
 }
 
 void QUmlFinalStateObject::setSubmachineState(bool isSubmachineState)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->setSubmachineState(isSubmachineState);
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->setSubmachineState(isSubmachineState);
 }
 
 void QUmlFinalStateObject::unsetSubmachineState()
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("submachineState"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("submachineState"));
 }
 
 void QUmlFinalStateObject::setRedefinedState(QObject *redefinedState)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->setRedefinedState(qmodelingobjectproperty_cast<QUmlState *>(redefinedState));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->setRedefinedState(qmodelingelementproperty_cast<QUmlState *>(redefinedState));
 }
 
 void QUmlFinalStateObject::setRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->setRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->setRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlFinalStateObject::addRegion(QObject *region)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->addRegion(qmodelingobjectproperty_cast<QUmlRegion *>(region));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->addRegion(qmodelingelementproperty_cast<QUmlRegion *>(region));
 }
 
 void QUmlFinalStateObject::removeRegion(QObject *region)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->removeRegion(qmodelingobjectproperty_cast<QUmlRegion *>(region));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->removeRegion(qmodelingelementproperty_cast<QUmlRegion *>(region));
 }
 
 void QUmlFinalStateObject::setStateInvariant(QObject *stateInvariant)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->setStateInvariant(qmodelingobjectproperty_cast<QUmlConstraint *>(stateInvariant));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->setStateInvariant(qmodelingelementproperty_cast<QUmlConstraint *>(stateInvariant));
 }
 
 void QUmlFinalStateObject::setSubmachine(QObject *submachine)
 {
-    qmodelingobjectproperty_cast<QUmlFinalState *>(this)->setSubmachine(qmodelingobjectproperty_cast<QUmlStateMachine *>(submachine));
+    qmodelingelementproperty_cast<QUmlFinalState *>(this)->setSubmachine(qmodelingelementproperty_cast<QUmlStateMachine *>(submachine));
+}
+
+
+void QUmlFinalStateObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+
+    d->propertyGroups << QStringLiteral("QUmlVertex");
+    d->groupProperties.insert(QStringLiteral("QUmlVertex"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("container"))));
+    d->groupProperties.insert(QStringLiteral("QUmlVertex"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlVertex"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlState");
+    d->groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("connections"))));
+    d->groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("connectionPoints"))));
+    d->groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deferrableTriggers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("doActivity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("entry"))));
+    d->groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("exit"))));
+    d->groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isComposite"))));
+    d->groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isOrthogonal"))));
+    d->groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isSimple"))));
+    d->groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isSubmachineState"))));
+    d->groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedState"))));
+    d->groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContext"))));
+    d->groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("regions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("stateInvariant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("submachine"))));
+
+    d->propertyGroups << QStringLiteral("QUmlFinalState");
+}
+
+void QUmlFinalStateObject::setPropertyData()
+{
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlfinalstateobject_p.h b/src/uml/qobjects/qumlfinalstateobject_p.h
index 3c79c163..ab54634c 100644
--- a/src/uml/qobjects/qumlfinalstateobject_p.h
+++ b/src/uml/qobjects/qumlfinalstateobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlFinalState;
-class Q_UML_EXPORT QUmlFinalStateObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlFinalStateObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlFinalStateObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -106,7 +109,7 @@ class Q_UML_EXPORT QUmlFinalStateObject : public QObject
     Q_PROPERTY(QObject * submachine READ submachine WRITE setSubmachine)
 
 public:
-    Q_INVOKABLE explicit QUmlFinalStateObject(QUmlFinalState *qModelingObject);
+    Q_INVOKABLE explicit QUmlFinalStateObject(QUmlFinalState *qModelingElement);
     virtual ~QUmlFinalStateObject();
 
     // Owned attributes [Element]
@@ -250,6 +253,10 @@ public Q_SLOTS:
     void removeRegion(QObject *region);
     void setStateInvariant(QObject *stateInvariant = 0);
     void setSubmachine(QObject *submachine = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlflowfinalnodeobject.cpp b/src/uml/qobjects/qumlflowfinalnodeobject.cpp
index d84a5bf3..fbaf5a46 100644
--- a/src/uml/qobjects/qumlflowfinalnodeobject.cpp
+++ b/src/uml/qobjects/qumlflowfinalnodeobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlflowfinalnodeobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlFlowFinalNode>
 #include <QtUml/QUmlActivity>
@@ -60,16 +61,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlFlowFinalNodeObject::QUmlFlowFinalNodeObject(QUmlFlowFinalNode *qModelingObject)
+QUmlFlowFinalNodeObject::QUmlFlowFinalNodeObject(QUmlFlowFinalNode *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlFlowFinalNodeObject::~QUmlFlowFinalNodeObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -78,25 +81,25 @@ QUmlFlowFinalNodeObject::~QUmlFlowFinalNodeObject()
 const QSet<QObject *> QUmlFlowFinalNodeObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlFlowFinalNodeObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlFlowFinalNodeObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -104,62 +107,62 @@ QObject *QUmlFlowFinalNodeObject::owner() const
 const QSet<QObject *> QUmlFlowFinalNodeObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlFlowFinalNodeObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->name();
 }
 
 QObject *QUmlFlowFinalNodeObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlFlowFinalNodeObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlFlowFinalNodeObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlFlowFinalNodeObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlFlowFinalNodeObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlFlowFinalNodeObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlFlowFinalNodeObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -167,65 +170,65 @@ const QSet<QObject *> QUmlFlowFinalNodeObject::redefinitionContexts() const
 
 QObject *QUmlFlowFinalNodeObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlFlowFinalNodeObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlFlowFinalNodeObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlFlowFinalNodeObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlFlowFinalNodeObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlFlowFinalNodeObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlFlowFinalNodeObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlFlowFinalNodeObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -234,14 +237,14 @@ const QSet<QObject *> QUmlFlowFinalNodeObject::redefinedNodes() const
 QSet<QObject *> QUmlFlowFinalNodeObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlFlowFinalNodeObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -249,207 +252,256 @@ bool QUmlFlowFinalNodeObject::mustBeOwned() const
 QList<QObject *> QUmlFlowFinalNodeObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlFlowFinalNodeObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlFlowFinalNodeObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlFlowFinalNodeObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlFlowFinalNodeObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlFlowFinalNodeObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlFlowFinalNodeObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlFlowFinalNodeObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlFlowFinalNodeObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlFlowFinalNodeObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlFlowFinalNodeObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlFlowFinalNodeObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlFlowFinalNodeObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlFlowFinalNodeObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->setName(name);
 }
 
 void QUmlFlowFinalNodeObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlFlowFinalNodeObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlFlowFinalNodeObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlFlowFinalNodeObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlFlowFinalNodeObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlFlowFinalNodeObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlFlowFinalNodeObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlFlowFinalNodeObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlFlowFinalNodeObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlFlowFinalNodeObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlFlowFinalNodeObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlFlowFinalNodeObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlFlowFinalNodeObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlFlowFinalNodeObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlFlowFinalNodeObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlFlowFinalNodeObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlFlowFinalNodeObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlFlowFinalNodeObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlFlowFinalNodeObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlFlowFinalNodeObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlFlowFinalNodeObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlFlowFinalNodeObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlFlowFinalNodeObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlFlowFinalNodeObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlFlowFinalNode *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlFlowFinalNode *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
+}
+
+
+void QUmlFlowFinalNodeObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlControlNode");
+
+    d->propertyGroups << QStringLiteral("QUmlFinalNode");
+
+    d->propertyGroups << QStringLiteral("QUmlFlowFinalNode");
+}
+
+void QUmlFlowFinalNodeObject::setPropertyData()
+{
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlflowfinalnodeobject_p.h b/src/uml/qobjects/qumlflowfinalnodeobject_p.h
index 3df0386a..888366bc 100644
--- a/src/uml/qobjects/qumlflowfinalnodeobject_p.h
+++ b/src/uml/qobjects/qumlflowfinalnodeobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlFlowFinalNode;
-class Q_UML_EXPORT QUmlFlowFinalNodeObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlFlowFinalNodeObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlFlowFinalNodeObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -87,7 +90,7 @@ class Q_UML_EXPORT QUmlFlowFinalNodeObject : public QObject
     Q_PROPERTY(QSet<QObject *> redefinedNodes READ redefinedNodes)
 
 public:
-    Q_INVOKABLE explicit QUmlFlowFinalNodeObject(QUmlFlowFinalNode *qModelingObject);
+    Q_INVOKABLE explicit QUmlFlowFinalNodeObject(QUmlFlowFinalNode *qModelingElement);
     virtual ~QUmlFlowFinalNodeObject();
 
     // Owned attributes [Element]
@@ -173,6 +176,10 @@ public Q_SLOTS:
     void removeOutgoing(QObject *outgoing);
     void addRedefinedNode(QObject *redefinedNode);
     void removeRedefinedNode(QObject *redefinedNode);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlforknodeobject.cpp b/src/uml/qobjects/qumlforknodeobject.cpp
index 3ac3fa1d..6177ea53 100644
--- a/src/uml/qobjects/qumlforknodeobject.cpp
+++ b/src/uml/qobjects/qumlforknodeobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlforknodeobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlForkNode>
 #include <QtUml/QUmlActivity>
@@ -60,16 +61,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlForkNodeObject::QUmlForkNodeObject(QUmlForkNode *qModelingObject)
+QUmlForkNodeObject::QUmlForkNodeObject(QUmlForkNode *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlForkNodeObject::~QUmlForkNodeObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlForkNode *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlForkNode *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -78,25 +81,25 @@ QUmlForkNodeObject::~QUmlForkNodeObject()
 const QSet<QObject *> QUmlForkNodeObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlForkNode *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlForkNode *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlForkNodeObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlForkNode *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlForkNode *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlForkNodeObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlForkNode *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlForkNode *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlForkNode *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlForkNode *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -104,62 +107,62 @@ QObject *QUmlForkNodeObject::owner() const
 const QSet<QObject *> QUmlForkNodeObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlForkNode *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlForkNode *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlForkNodeObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlForkNode *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlForkNode *>(this)->name();
 }
 
 QObject *QUmlForkNodeObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlForkNode *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlForkNode *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlForkNode *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlForkNode *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlForkNodeObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlForkNode *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlForkNode *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlForkNode *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlForkNode *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlForkNodeObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlForkNode *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlForkNode *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlForkNodeObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlForkNode *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlForkNode *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlForkNodeObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlForkNode *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlForkNode *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlForkNodeObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlForkNode *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlForkNode *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlForkNodeObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlForkNode *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlForkNode *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -167,65 +170,65 @@ const QSet<QObject *> QUmlForkNodeObject::redefinitionContexts() const
 
 QObject *QUmlForkNodeObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlForkNode *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlForkNode *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlForkNode *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlForkNode *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlForkNodeObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlForkNode *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlForkNode *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlForkNodeObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlForkNode *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlForkNode *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlForkNodeObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlForkNode *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlForkNode *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlForkNodeObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlForkNode *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlForkNode *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlForkNode *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlForkNode *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlForkNodeObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlForkNode *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlForkNode *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlForkNodeObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlForkNode *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlForkNode *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlForkNodeObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlForkNode *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlForkNode *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -234,14 +237,14 @@ const QSet<QObject *> QUmlForkNodeObject::redefinedNodes() const
 QSet<QObject *> QUmlForkNodeObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlForkNode *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlForkNode *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlForkNodeObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlForkNode *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlForkNode *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -249,207 +252,254 @@ bool QUmlForkNodeObject::mustBeOwned() const
 QList<QObject *> QUmlForkNodeObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlForkNode *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlForkNode *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlForkNodeObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlForkNode *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlForkNode *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlForkNodeObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlForkNode *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlForkNode *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlForkNodeObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlForkNode *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlForkNode *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlForkNodeObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlForkNode *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlForkNode *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlForkNodeObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlForkNode *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlForkNode *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlForkNodeObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlForkNode *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlForkNode *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlForkNodeObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlForkNode *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlForkNode *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlForkNodeObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlForkNode *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlForkNode *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlForkNodeObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlForkNode *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlForkNode *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlForkNodeObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlForkNode *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlForkNode *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlForkNodeObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlForkNode *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlForkNode *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlForkNodeObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlForkNode *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlForkNode *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlForkNodeObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlForkNode *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlForkNode *>(this)->setName(name);
 }
 
 void QUmlForkNodeObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlForkNode *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlForkNode *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlForkNodeObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlForkNode *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlForkNode *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlForkNodeObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlForkNode *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlForkNode *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlForkNodeObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlForkNode *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlForkNode *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlForkNodeObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlForkNode *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlForkNode *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlForkNodeObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlForkNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlForkNodeObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlForkNode *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlForkNode *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlForkNodeObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlForkNode *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlForkNode *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlForkNodeObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlForkNode *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlForkNode *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlForkNodeObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlForkNode *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlForkNode *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlForkNodeObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlForkNode *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlForkNode *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlForkNodeObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlForkNode *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlForkNode *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlForkNodeObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlForkNode *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlForkNode *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlForkNodeObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlForkNode *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlForkNode *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlForkNodeObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlForkNode *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlForkNode *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlForkNodeObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlForkNode *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlForkNode *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlForkNodeObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlForkNode *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlForkNode *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlForkNodeObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlForkNode *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlForkNode *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlForkNodeObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlForkNode *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlForkNode *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlForkNodeObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlForkNode *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlForkNode *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlForkNodeObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlForkNode *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlForkNode *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlForkNodeObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlForkNode *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlForkNode *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlForkNodeObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlForkNode *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlForkNode *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlForkNodeObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlForkNode *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlForkNode *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
+}
+
+
+void QUmlForkNodeObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlControlNode");
+
+    d->propertyGroups << QStringLiteral("QUmlForkNode");
+}
+
+void QUmlForkNodeObject::setPropertyData()
+{
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlforknodeobject_p.h b/src/uml/qobjects/qumlforknodeobject_p.h
index 23bce00a..61f25046 100644
--- a/src/uml/qobjects/qumlforknodeobject_p.h
+++ b/src/uml/qobjects/qumlforknodeobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlForkNode;
-class Q_UML_EXPORT QUmlForkNodeObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlForkNodeObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlForkNodeObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -87,7 +90,7 @@ class Q_UML_EXPORT QUmlForkNodeObject : public QObject
     Q_PROPERTY(QSet<QObject *> redefinedNodes READ redefinedNodes)
 
 public:
-    Q_INVOKABLE explicit QUmlForkNodeObject(QUmlForkNode *qModelingObject);
+    Q_INVOKABLE explicit QUmlForkNodeObject(QUmlForkNode *qModelingElement);
     virtual ~QUmlForkNodeObject();
 
     // Owned attributes [Element]
@@ -173,6 +176,10 @@ public Q_SLOTS:
     void removeOutgoing(QObject *outgoing);
     void addRedefinedNode(QObject *redefinedNode);
     void removeRedefinedNode(QObject *redefinedNode);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlfunctionbehaviorobject.cpp b/src/uml/qobjects/qumlfunctionbehaviorobject.cpp
index 6e70fa11..6852c07c 100644
--- a/src/uml/qobjects/qumlfunctionbehaviorobject.cpp
+++ b/src/uml/qobjects/qumlfunctionbehaviorobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlfunctionbehaviorobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlFunctionBehavior>
 #include <QtUml/QUmlBehavior>
@@ -84,16 +85,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlFunctionBehaviorObject::QUmlFunctionBehaviorObject(QUmlFunctionBehavior *qModelingObject)
+QUmlFunctionBehaviorObject::QUmlFunctionBehaviorObject(QUmlFunctionBehavior *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlFunctionBehaviorObject::~QUmlFunctionBehaviorObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -102,25 +105,25 @@ QUmlFunctionBehaviorObject::~QUmlFunctionBehaviorObject()
 const QSet<QObject *> QUmlFunctionBehaviorObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlFunctionBehaviorObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlFunctionBehaviorObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -128,35 +131,35 @@ QObject *QUmlFunctionBehaviorObject::owner() const
 const QSet<QObject *> QUmlFunctionBehaviorObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlFunctionBehaviorObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->name();
 }
 
 QObject *QUmlFunctionBehaviorObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlFunctionBehaviorObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlFunctionBehaviorObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [Namespace]
@@ -164,48 +167,48 @@ QString QUmlFunctionBehaviorObject::qualifiedName() const
 const QSet<QObject *> QUmlFunctionBehaviorObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlFunctionBehaviorObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlFunctionBehaviorObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlFunctionBehaviorObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlFunctionBehaviorObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlFunctionBehaviorObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -213,49 +216,49 @@ const QSet<QObject *> QUmlFunctionBehaviorObject::packageImports() const
 
 QObject *QUmlFunctionBehaviorObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlFunctionBehaviorObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Type]
 
 QObject *QUmlFunctionBehaviorObject::package() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->package())
+    if (!qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->package())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->package()->asQObject();
+        return qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->package()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlFunctionBehaviorObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlFunctionBehaviorObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlFunctionBehaviorObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -264,8 +267,8 @@ const QSet<QObject *> QUmlFunctionBehaviorObject::redefinitionContexts() const
 const QSet<QObject *> QUmlFunctionBehaviorObject::templateBindings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTemplateBinding *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->templateBindings())
-        set.insert(element->asQObject());
+    foreach (QUmlTemplateBinding *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->templateBindings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -274,109 +277,109 @@ const QSet<QObject *> QUmlFunctionBehaviorObject::templateBindings() const
 const QSet<QObject *> QUmlFunctionBehaviorObject::attributes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->attributes())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->attributes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlFunctionBehaviorObject::collaborationUses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlCollaborationUse *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->collaborationUses())
-        set.insert(element->asQObject());
+    foreach (QUmlCollaborationUse *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->collaborationUses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlFunctionBehaviorObject::features() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->features())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->features())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlFunctionBehaviorObject::generalizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralization *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->generalizations())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralization *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->generalizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlFunctionBehaviorObject::inheritedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->inheritedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->inheritedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlFunctionBehaviorObject::isFinalSpecialization() const
 {
-    return qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->isFinalSpecialization();
+    return qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->isFinalSpecialization();
 }
 
 QObject *QUmlFunctionBehaviorObject::ownedTemplateSignature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->ownedTemplateSignature())
+    if (!qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->ownedTemplateSignature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->ownedTemplateSignature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->ownedTemplateSignature()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlFunctionBehaviorObject::ownedUseCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->ownedUseCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->ownedUseCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlFunctionBehaviorObject::powertypeExtents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralizationSet *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->powertypeExtents())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralizationSet *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->powertypeExtents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlFunctionBehaviorObject::redefinedClassifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->redefinedClassifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->redefinedClassifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlFunctionBehaviorObject::representation() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->representation())
+    if (!qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->representation())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->representation()->asQObject();
+        return qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->representation()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlFunctionBehaviorObject::substitutions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlSubstitution *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->substitutions())
-        set.insert(element->asQObject());
+    foreach (QUmlSubstitution *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->substitutions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlFunctionBehaviorObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->templateParameter()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlFunctionBehaviorObject::useCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->useCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->useCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -385,24 +388,24 @@ const QSet<QObject *> QUmlFunctionBehaviorObject::useCases() const
 const QSet<QObject *> QUmlFunctionBehaviorObject::ownedConnectors() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConnector *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->ownedConnectors())
-        set.insert(element->asQObject());
+    foreach (QUmlConnector *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->ownedConnectors())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlFunctionBehaviorObject::parts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->parts())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->parts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlFunctionBehaviorObject::roles() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConnectableElement *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->roles())
-        set.insert(element->asQObject());
+    foreach (QUmlConnectableElement *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->roles())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -411,8 +414,8 @@ const QSet<QObject *> QUmlFunctionBehaviorObject::roles() const
 const QSet<QObject *> QUmlFunctionBehaviorObject::ownedPorts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPort *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->ownedPorts())
-        set.insert(element->asQObject());
+    foreach (QUmlPort *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->ownedPorts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -420,25 +423,25 @@ const QSet<QObject *> QUmlFunctionBehaviorObject::ownedPorts() const
 
 QObject *QUmlFunctionBehaviorObject::classifierBehavior() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->classifierBehavior())
+    if (!qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->classifierBehavior())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->classifierBehavior()->asQObject();
+        return qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->classifierBehavior()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlFunctionBehaviorObject::interfaceRealizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterfaceRealization *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->interfaceRealizations())
-        set.insert(element->asQObject());
+    foreach (QUmlInterfaceRealization *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->interfaceRealizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlFunctionBehaviorObject::ownedBehaviors() const
 {
     QSet<QObject *> set;
-    foreach (QUmlBehavior *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->ownedBehaviors())
-        set.insert(element->asQObject());
+    foreach (QUmlBehavior *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->ownedBehaviors())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -447,58 +450,58 @@ const QSet<QObject *> QUmlFunctionBehaviorObject::ownedBehaviors() const
 const QSet<QObject *> QUmlFunctionBehaviorObject::extensions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExtension *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->extensions())
-        set.insert(element->asQObject());
+    foreach (QUmlExtension *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->extensions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlFunctionBehaviorObject::isAbstract() const
 {
-    return qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->isAbstract();
+    return qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->isAbstract();
 }
 
 bool QUmlFunctionBehaviorObject::isActive() const
 {
-    return qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->isActive();
+    return qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->isActive();
 }
 
 const QList<QObject *> QUmlFunctionBehaviorObject::nestedClassifiers() const
 {
     QList<QObject *> list;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->nestedClassifiers())
-        list.append(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->nestedClassifiers())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QList<QObject *> QUmlFunctionBehaviorObject::ownedAttributes() const
 {
     QList<QObject *> list;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->ownedAttributes())
-        list.append(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->ownedAttributes())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QList<QObject *> QUmlFunctionBehaviorObject::ownedOperations() const
 {
     QList<QObject *> list;
-    foreach (QUmlOperation *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->ownedOperations())
-        list.append(element->asQObject());
+    foreach (QUmlOperation *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->ownedOperations())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QSet<QObject *> QUmlFunctionBehaviorObject::ownedReceptions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlReception *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->ownedReceptions())
-        set.insert(element->asQObject());
+    foreach (QUmlReception *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->ownedReceptions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlFunctionBehaviorObject::superClasses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClass *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->superClasses())
-        set.insert(element->asQObject());
+    foreach (QUmlClass *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->superClasses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -506,75 +509,75 @@ const QSet<QObject *> QUmlFunctionBehaviorObject::superClasses() const
 
 QObject *QUmlFunctionBehaviorObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->context()->asQModelingObject();
 }
 
 bool QUmlFunctionBehaviorObject::isReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->isReentrant();
+    return qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->isReentrant();
 }
 
 const QList<QObject *> QUmlFunctionBehaviorObject::ownedParameters() const
 {
     QList<QObject *> list;
-    foreach (QUmlParameter *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->ownedParameters())
-        list.append(element->asQObject());
+    foreach (QUmlParameter *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->ownedParameters())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QSet<QObject *> QUmlFunctionBehaviorObject::ownedParameterSets() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterSet *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->ownedParameterSets())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterSet *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->ownedParameterSets())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlFunctionBehaviorObject::postconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->postconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->postconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlFunctionBehaviorObject::preconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->preconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->preconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlFunctionBehaviorObject::redefinedBehaviors() const
 {
     QSet<QObject *> set;
-    foreach (QUmlBehavior *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->redefinedBehaviors())
-        set.insert(element->asQObject());
+    foreach (QUmlBehavior *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->redefinedBehaviors())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlFunctionBehaviorObject::specification() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->specification())
+    if (!qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->specification())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->specification()->asQObject();
+        return qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->specification()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [OpaqueBehavior]
 
 const QList<QString> QUmlFunctionBehaviorObject::bodies() const
 {
-    return qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->bodies();
+    return qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->bodies();
 }
 
 const QList<QString> QUmlFunctionBehaviorObject::languages() const
 {
-    return qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->languages();
+    return qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->languages();
 }
 
 // OPERATIONS [Element]
@@ -582,14 +585,14 @@ const QList<QString> QUmlFunctionBehaviorObject::languages() const
 QSet<QObject *> QUmlFunctionBehaviorObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlFunctionBehaviorObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -597,27 +600,27 @@ bool QUmlFunctionBehaviorObject::mustBeOwned() const
 QList<QObject *> QUmlFunctionBehaviorObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlFunctionBehaviorObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlFunctionBehaviorObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlFunctionBehaviorObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->separator();
 }
 
 // OPERATIONS [Namespace]
@@ -626,44 +629,44 @@ QSet<QObject *> QUmlFunctionBehaviorObject::excludeCollisions(QSet<QObject *> im
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlFunctionBehaviorObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlFunctionBehaviorObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlFunctionBehaviorObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->membersAreDistinguishable();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlFunctionBehaviorObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlFunctionBehaviorObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [Type]
@@ -671,12 +674,12 @@ bool QUmlFunctionBehaviorObject::isTemplateParameter() const
 
 bool QUmlFunctionBehaviorObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlFunctionBehaviorObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [TemplateableElement]
@@ -684,8 +687,8 @@ bool QUmlFunctionBehaviorObject::isRedefinitionContextValid(QObject *redefined)
 QSet<QObject *> QUmlFunctionBehaviorObject::parameterableElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterableElement *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->parameterableElements())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterableElement *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->parameterableElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -694,52 +697,52 @@ QSet<QObject *> QUmlFunctionBehaviorObject::parameterableElements() const
 QSet<QObject *> QUmlFunctionBehaviorObject::allFeatures() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->allFeatures())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->allFeatures())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlFunctionBehaviorObject::allParents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->allParents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->allParents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlFunctionBehaviorObject::conformsTo(QObject *other) const
 {
-    return qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->conformsTo(qmodelingobjectproperty_cast<QUmlClassifier *>(other));
+    return qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->conformsTo(qmodelingelementproperty_cast<QUmlClassifier *>(other));
 }
 
 bool QUmlFunctionBehaviorObject::hasVisibilityOf(QObject *n) const
 {
-    return qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->hasVisibilityOf(qmodelingobjectproperty_cast<QUmlNamedElement *>(n));
+    return qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->hasVisibilityOf(qmodelingelementproperty_cast<QUmlNamedElement *>(n));
 }
 
 QSet<QObject *> QUmlFunctionBehaviorObject::inheritableMembers(QObject *c) const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->inheritableMembers(qmodelingobjectproperty_cast<QUmlClassifier *>(c)))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->inheritableMembers(qmodelingelementproperty_cast<QUmlClassifier *>(c)))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlFunctionBehaviorObject::isTemplate() const
 {
-    return qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->isTemplate();
+    return qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->isTemplate();
 }
 
 bool QUmlFunctionBehaviorObject::maySpecializeType(QObject *c) const
 {
-    return qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->maySpecializeType(qmodelingobjectproperty_cast<QUmlClassifier *>(c));
+    return qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->maySpecializeType(qmodelingelementproperty_cast<QUmlClassifier *>(c));
 }
 
 QSet<QObject *> QUmlFunctionBehaviorObject::parents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->parents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->parents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -749,10 +752,10 @@ QSet<QObject *> QUmlFunctionBehaviorObject::inherit(QSet<QObject *> inhs) const
 {
     QSet<QUmlNamedElement *> inhsConverted;
     foreach (QObject *object, inhs)
-        inhsConverted.insert(qmodelingobjectproperty_cast<QUmlNamedElement *>(object));
+        inhsConverted.insert(qmodelingelementproperty_cast<QUmlNamedElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->inherit(inhsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->inherit(inhsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -760,563 +763,675 @@ QSet<QObject *> QUmlFunctionBehaviorObject::inherit(QSet<QObject *> inhs) const
 
 void QUmlFunctionBehaviorObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlFunctionBehaviorObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlFunctionBehaviorObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlFunctionBehaviorObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlFunctionBehaviorObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlFunctionBehaviorObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlFunctionBehaviorObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlFunctionBehaviorObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->setName(name);
 }
 
 void QUmlFunctionBehaviorObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlFunctionBehaviorObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlFunctionBehaviorObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlFunctionBehaviorObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlFunctionBehaviorObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlFunctionBehaviorObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlFunctionBehaviorObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlFunctionBehaviorObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlFunctionBehaviorObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlFunctionBehaviorObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlFunctionBehaviorObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlFunctionBehaviorObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlFunctionBehaviorObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlFunctionBehaviorObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlFunctionBehaviorObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlFunctionBehaviorObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlFunctionBehaviorObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->setVisibility(visibility);
 }
 
 void QUmlFunctionBehaviorObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Type]
 
 void QUmlFunctionBehaviorObject::setPackage(QObject *package)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->setPackage(qmodelingobjectproperty_cast<QUmlPackage *>(package));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->setPackage(qmodelingelementproperty_cast<QUmlPackage *>(package));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlFunctionBehaviorObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlFunctionBehaviorObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlFunctionBehaviorObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlFunctionBehaviorObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlFunctionBehaviorObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlFunctionBehaviorObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateableElement]
 
 void QUmlFunctionBehaviorObject::addTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 void QUmlFunctionBehaviorObject::removeTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removeTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removeTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Classifier]
 
 void QUmlFunctionBehaviorObject::addAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlFunctionBehaviorObject::removeAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removeAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removeAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlFunctionBehaviorObject::addCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlFunctionBehaviorObject::removeCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removeCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removeCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlFunctionBehaviorObject::addFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlFunctionBehaviorObject::removeFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removeFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removeFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlFunctionBehaviorObject::addGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlFunctionBehaviorObject::removeGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removeGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removeGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlFunctionBehaviorObject::addInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlFunctionBehaviorObject::removeInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removeInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removeInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlFunctionBehaviorObject::setFinalSpecialization(bool isFinalSpecialization)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->setFinalSpecialization(isFinalSpecialization);
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->setFinalSpecialization(isFinalSpecialization);
 }
 
 void QUmlFunctionBehaviorObject::unsetFinalSpecialization()
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("finalSpecialization"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
 void QUmlFunctionBehaviorObject::setOwnedTemplateSignature(QObject *ownedTemplateSignature)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->setOwnedTemplateSignature(qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->setOwnedTemplateSignature(qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
 }
 
 void QUmlFunctionBehaviorObject::addOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlFunctionBehaviorObject::removeOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removeOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removeOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlFunctionBehaviorObject::addPowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addPowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addPowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlFunctionBehaviorObject::removePowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removePowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removePowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlFunctionBehaviorObject::addRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlFunctionBehaviorObject::removeRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removeRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removeRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlFunctionBehaviorObject::setRepresentation(QObject *representation)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->setRepresentation(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(representation));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->setRepresentation(qmodelingelementproperty_cast<QUmlCollaborationUse *>(representation));
 }
 
 void QUmlFunctionBehaviorObject::addSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlFunctionBehaviorObject::removeSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removeSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removeSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlFunctionBehaviorObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
 }
 
 void QUmlFunctionBehaviorObject::addUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 void QUmlFunctionBehaviorObject::removeUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removeUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removeUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [StructuredClassifier]
 
 void QUmlFunctionBehaviorObject::addOwnedConnector(QObject *ownedConnector)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addOwnedConnector(qmodelingobjectproperty_cast<QUmlConnector *>(ownedConnector));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addOwnedConnector(qmodelingelementproperty_cast<QUmlConnector *>(ownedConnector));
 }
 
 void QUmlFunctionBehaviorObject::removeOwnedConnector(QObject *ownedConnector)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removeOwnedConnector(qmodelingobjectproperty_cast<QUmlConnector *>(ownedConnector));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removeOwnedConnector(qmodelingelementproperty_cast<QUmlConnector *>(ownedConnector));
 }
 
 void QUmlFunctionBehaviorObject::addPart(QObject *part)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addPart(qmodelingobjectproperty_cast<QUmlProperty *>(part));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addPart(qmodelingelementproperty_cast<QUmlProperty *>(part));
 }
 
 void QUmlFunctionBehaviorObject::removePart(QObject *part)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removePart(qmodelingobjectproperty_cast<QUmlProperty *>(part));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removePart(qmodelingelementproperty_cast<QUmlProperty *>(part));
 }
 
 void QUmlFunctionBehaviorObject::addRole(QObject *role)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addRole(qmodelingobjectproperty_cast<QUmlConnectableElement *>(role));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addRole(qmodelingelementproperty_cast<QUmlConnectableElement *>(role));
 }
 
 void QUmlFunctionBehaviorObject::removeRole(QObject *role)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removeRole(qmodelingobjectproperty_cast<QUmlConnectableElement *>(role));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removeRole(qmodelingelementproperty_cast<QUmlConnectableElement *>(role));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [EncapsulatedClassifier]
 
 void QUmlFunctionBehaviorObject::addOwnedPort(QObject *ownedPort)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addOwnedPort(qmodelingobjectproperty_cast<QUmlPort *>(ownedPort));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addOwnedPort(qmodelingelementproperty_cast<QUmlPort *>(ownedPort));
 }
 
 void QUmlFunctionBehaviorObject::removeOwnedPort(QObject *ownedPort)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removeOwnedPort(qmodelingobjectproperty_cast<QUmlPort *>(ownedPort));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removeOwnedPort(qmodelingelementproperty_cast<QUmlPort *>(ownedPort));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [BehavioredClassifier]
 
 void QUmlFunctionBehaviorObject::setClassifierBehavior(QObject *classifierBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->setClassifierBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(classifierBehavior));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->setClassifierBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(classifierBehavior));
 }
 
 void QUmlFunctionBehaviorObject::addInterfaceRealization(QObject *interfaceRealization)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addInterfaceRealization(qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addInterfaceRealization(qmodelingelementproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
 }
 
 void QUmlFunctionBehaviorObject::removeInterfaceRealization(QObject *interfaceRealization)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removeInterfaceRealization(qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removeInterfaceRealization(qmodelingelementproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
 }
 
 void QUmlFunctionBehaviorObject::addOwnedBehavior(QObject *ownedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addOwnedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(ownedBehavior));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addOwnedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(ownedBehavior));
 }
 
 void QUmlFunctionBehaviorObject::removeOwnedBehavior(QObject *ownedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removeOwnedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(ownedBehavior));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removeOwnedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(ownedBehavior));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Class]
 
 void QUmlFunctionBehaviorObject::addExtension(QObject *extension)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addExtension(qmodelingobjectproperty_cast<QUmlExtension *>(extension));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addExtension(qmodelingelementproperty_cast<QUmlExtension *>(extension));
 }
 
 void QUmlFunctionBehaviorObject::removeExtension(QObject *extension)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removeExtension(qmodelingobjectproperty_cast<QUmlExtension *>(extension));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removeExtension(qmodelingelementproperty_cast<QUmlExtension *>(extension));
 }
 
 void QUmlFunctionBehaviorObject::setAbstract(bool isAbstract)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->setAbstract(isAbstract);
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->setAbstract(isAbstract);
 }
 
 void QUmlFunctionBehaviorObject::unsetAbstract()
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("abstract"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
 void QUmlFunctionBehaviorObject::setActive(bool isActive)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->setActive(isActive);
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->setActive(isActive);
 }
 
 void QUmlFunctionBehaviorObject::unsetActive()
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("active"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("active"));
 }
 
 void QUmlFunctionBehaviorObject::addNestedClassifier(QObject *nestedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addNestedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(nestedClassifier));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addNestedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(nestedClassifier));
 }
 
 void QUmlFunctionBehaviorObject::removeNestedClassifier(QObject *nestedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removeNestedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(nestedClassifier));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removeNestedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(nestedClassifier));
 }
 
 void QUmlFunctionBehaviorObject::addOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlFunctionBehaviorObject::removeOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removeOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removeOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlFunctionBehaviorObject::addOwnedOperation(QObject *ownedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addOwnedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(ownedOperation));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addOwnedOperation(qmodelingelementproperty_cast<QUmlOperation *>(ownedOperation));
 }
 
 void QUmlFunctionBehaviorObject::removeOwnedOperation(QObject *ownedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removeOwnedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(ownedOperation));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removeOwnedOperation(qmodelingelementproperty_cast<QUmlOperation *>(ownedOperation));
 }
 
 void QUmlFunctionBehaviorObject::addOwnedReception(QObject *ownedReception)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addOwnedReception(qmodelingobjectproperty_cast<QUmlReception *>(ownedReception));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addOwnedReception(qmodelingelementproperty_cast<QUmlReception *>(ownedReception));
 }
 
 void QUmlFunctionBehaviorObject::removeOwnedReception(QObject *ownedReception)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removeOwnedReception(qmodelingobjectproperty_cast<QUmlReception *>(ownedReception));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removeOwnedReception(qmodelingelementproperty_cast<QUmlReception *>(ownedReception));
 }
 
 void QUmlFunctionBehaviorObject::addSuperClass(QObject *superClass)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addSuperClass(qmodelingobjectproperty_cast<QUmlClass *>(superClass));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addSuperClass(qmodelingelementproperty_cast<QUmlClass *>(superClass));
 }
 
 void QUmlFunctionBehaviorObject::removeSuperClass(QObject *superClass)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removeSuperClass(qmodelingobjectproperty_cast<QUmlClass *>(superClass));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removeSuperClass(qmodelingelementproperty_cast<QUmlClass *>(superClass));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Behavior]
 
 void QUmlFunctionBehaviorObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->setContext(qmodelingobjectproperty_cast<QUmlBehavioredClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->setContext(qmodelingelementproperty_cast<QUmlBehavioredClassifier *>(context));
 }
 
 void QUmlFunctionBehaviorObject::setReentrant(bool isReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->setReentrant(isReentrant);
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->setReentrant(isReentrant);
 }
 
 void QUmlFunctionBehaviorObject::unsetReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("reentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("reentrant"));
 }
 
 void QUmlFunctionBehaviorObject::addOwnedParameter(QObject *ownedParameter)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addOwnedParameter(qmodelingobjectproperty_cast<QUmlParameter *>(ownedParameter));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addOwnedParameter(qmodelingelementproperty_cast<QUmlParameter *>(ownedParameter));
 }
 
 void QUmlFunctionBehaviorObject::removeOwnedParameter(QObject *ownedParameter)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removeOwnedParameter(qmodelingobjectproperty_cast<QUmlParameter *>(ownedParameter));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removeOwnedParameter(qmodelingelementproperty_cast<QUmlParameter *>(ownedParameter));
 }
 
 void QUmlFunctionBehaviorObject::addOwnedParameterSet(QObject *ownedParameterSet)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addOwnedParameterSet(qmodelingobjectproperty_cast<QUmlParameterSet *>(ownedParameterSet));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addOwnedParameterSet(qmodelingelementproperty_cast<QUmlParameterSet *>(ownedParameterSet));
 }
 
 void QUmlFunctionBehaviorObject::removeOwnedParameterSet(QObject *ownedParameterSet)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removeOwnedParameterSet(qmodelingobjectproperty_cast<QUmlParameterSet *>(ownedParameterSet));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removeOwnedParameterSet(qmodelingelementproperty_cast<QUmlParameterSet *>(ownedParameterSet));
 }
 
 void QUmlFunctionBehaviorObject::addPostcondition(QObject *postcondition)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(postcondition));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(postcondition));
 }
 
 void QUmlFunctionBehaviorObject::removePostcondition(QObject *postcondition)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removePostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(postcondition));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removePostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(postcondition));
 }
 
 void QUmlFunctionBehaviorObject::addPrecondition(QObject *precondition)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(precondition));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(precondition));
 }
 
 void QUmlFunctionBehaviorObject::removePrecondition(QObject *precondition)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removePrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(precondition));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removePrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(precondition));
 }
 
 void QUmlFunctionBehaviorObject::addRedefinedBehavior(QObject *redefinedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addRedefinedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(redefinedBehavior));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addRedefinedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(redefinedBehavior));
 }
 
 void QUmlFunctionBehaviorObject::removeRedefinedBehavior(QObject *redefinedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removeRedefinedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(redefinedBehavior));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removeRedefinedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(redefinedBehavior));
 }
 
 void QUmlFunctionBehaviorObject::setSpecification(QObject *specification)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->setSpecification(qmodelingobjectproperty_cast<QUmlBehavioralFeature *>(specification));
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->setSpecification(qmodelingelementproperty_cast<QUmlBehavioralFeature *>(specification));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [OpaqueBehavior]
 
 void QUmlFunctionBehaviorObject::addBody(QString  body)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addBody(body);
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addBody(body);
 }
 
 void QUmlFunctionBehaviorObject::removeBody(QString  body)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removeBody(body);
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removeBody(body);
 }
 
 void QUmlFunctionBehaviorObject::addLanguage(QString  language)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->addLanguage(language);
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->addLanguage(language);
 }
 
 void QUmlFunctionBehaviorObject::removeLanguage(QString  language)
 {
-    qmodelingobjectproperty_cast<QUmlFunctionBehavior *>(this)->removeLanguage(language);
+    qmodelingelementproperty_cast<QUmlFunctionBehavior *>(this)->removeLanguage(language);
+}
+
+
+void QUmlFunctionBehaviorObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlType");
+    d->groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
+
+    d->propertyGroups << QStringLiteral("QUmlStructuredClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedConnectors"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parts"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("roles"))));
+
+    d->propertyGroups << QStringLiteral("QUmlEncapsulatedClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlEncapsulatedClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedPorts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlBehavioredClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifierBehavior"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interfaceRealizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedBehaviors"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClass");
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extensions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isActive"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedReceptions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superClasses"))));
+
+    d->propertyGroups << QStringLiteral("QUmlBehavior");
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameters"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameterSets"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("postconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("preconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedBehaviors"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("specification"))));
+
+    d->propertyGroups << QStringLiteral("QUmlOpaqueBehavior");
+    d->groupProperties.insert(QStringLiteral("QUmlOpaqueBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("bodies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlOpaqueBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("languages"))));
+
+    d->propertyGroups << QStringLiteral("QUmlFunctionBehavior");
+}
+
+void QUmlFunctionBehaviorObject::setPropertyData()
+{
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlfunctionbehaviorobject_p.h b/src/uml/qobjects/qumlfunctionbehaviorobject_p.h
index d50529a8..26355f6d 100644
--- a/src/uml/qobjects/qumlfunctionbehaviorobject_p.h
+++ b/src/uml/qobjects/qumlfunctionbehaviorobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlFunctionBehavior;
-class Q_UML_EXPORT QUmlFunctionBehaviorObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlFunctionBehaviorObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlFunctionBehaviorObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -149,7 +152,7 @@ class Q_UML_EXPORT QUmlFunctionBehaviorObject : public QObject
     Q_PROPERTY(QList<QString> languages READ languages)
 
 public:
-    Q_INVOKABLE explicit QUmlFunctionBehaviorObject(QUmlFunctionBehavior *qModelingObject);
+    Q_INVOKABLE explicit QUmlFunctionBehaviorObject(QUmlFunctionBehavior *qModelingElement);
     virtual ~QUmlFunctionBehaviorObject();
 
     // Owned attributes [Element]
@@ -422,6 +425,10 @@ public Q_SLOTS:
     void removeBody(QString body);
     void addLanguage(QString language);
     void removeLanguage(QString language);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlgateobject.cpp b/src/uml/qobjects/qumlgateobject.cpp
index e9ec6f98..a86818c3 100644
--- a/src/uml/qobjects/qumlgateobject.cpp
+++ b/src/uml/qobjects/qumlgateobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlgateobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlGate>
 #include <QtUml/QUmlComment>
@@ -52,16 +53,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlGateObject::QUmlGateObject(QUmlGate *qModelingObject)
+QUmlGateObject::QUmlGateObject(QUmlGate *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlGateObject::~QUmlGateObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlGate *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlGate *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -70,25 +73,25 @@ QUmlGateObject::~QUmlGateObject()
 const QSet<QObject *> QUmlGateObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlGate *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlGate *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlGateObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlGate *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlGate *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlGateObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlGate *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlGate *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlGate *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlGate *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -96,50 +99,50 @@ QObject *QUmlGateObject::owner() const
 const QSet<QObject *> QUmlGateObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlGate *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlGate *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlGateObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlGate *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlGate *>(this)->name();
 }
 
 QObject *QUmlGateObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlGate *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlGate *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlGate *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlGate *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlGateObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlGate *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlGate *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlGate *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlGate *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlGateObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlGate *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlGate *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlGateObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlGate *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlGate *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [MessageEnd]
 
 QObject *QUmlGateObject::message() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlGate *>(this)->message())
+    if (!qmodelingelementproperty_cast<QUmlGate *>(this)->message())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlGate *>(this)->message()->asQObject();
+        return qmodelingelementproperty_cast<QUmlGate *>(this)->message()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -147,14 +150,14 @@ QObject *QUmlGateObject::message() const
 QSet<QObject *> QUmlGateObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlGate *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlGate *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlGateObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlGate *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlGate *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -162,98 +165,130 @@ bool QUmlGateObject::mustBeOwned() const
 QList<QObject *> QUmlGateObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlGate *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlGate *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlGateObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlGate *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlGate *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlGateObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlGate *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlGate *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlGateObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlGate *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlGate *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlGateObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlGate *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlGate *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlGateObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlGate *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlGate *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlGateObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlGate *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlGate *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlGateObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlGate *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlGate *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlGateObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlGate *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlGate *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlGateObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlGate *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlGate *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlGateObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlGate *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlGate *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlGateObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlGate *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlGate *>(this)->setName(name);
 }
 
 void QUmlGateObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlGate *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlGate *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlGateObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlGate *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlGate *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlGateObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlGate *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlGate *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlGateObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlGate *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlGate *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [MessageEnd]
 
 void QUmlGateObject::setMessage(QObject *message)
 {
-    qmodelingobjectproperty_cast<QUmlGate *>(this)->setMessage(qmodelingobjectproperty_cast<QUmlMessage *>(message));
+    qmodelingelementproperty_cast<QUmlGate *>(this)->setMessage(qmodelingelementproperty_cast<QUmlMessage *>(message));
+}
+
+
+void QUmlGateObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlMessageEnd");
+    d->groupProperties.insert(QStringLiteral("QUmlMessageEnd"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("message"))));
+
+    d->propertyGroups << QStringLiteral("QUmlGate");
+}
+
+void QUmlGateObject::setPropertyData()
+{
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlgateobject_p.h b/src/uml/qobjects/qumlgateobject_p.h
index 9b7e8a92..e5db1aac 100644
--- a/src/uml/qobjects/qumlgateobject_p.h
+++ b/src/uml/qobjects/qumlgateobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlGate;
-class Q_UML_EXPORT QUmlGateObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlGateObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlGateObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -75,7 +78,7 @@ class Q_UML_EXPORT QUmlGateObject : public QObject
     Q_PROPERTY(QObject * message READ message WRITE setMessage)
 
 public:
-    Q_INVOKABLE explicit QUmlGateObject(QUmlGate *qModelingObject);
+    Q_INVOKABLE explicit QUmlGateObject(QUmlGate *qModelingElement);
     virtual ~QUmlGateObject();
 
     // Owned attributes [Element]
@@ -124,6 +127,10 @@ public Q_SLOTS:
 
     // Slots for owned attributes [MessageEnd]
     void setMessage(QObject *message = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlgeneralizationobject.cpp b/src/uml/qobjects/qumlgeneralizationobject.cpp
index 0ad743e1..832af887 100644
--- a/src/uml/qobjects/qumlgeneralizationobject.cpp
+++ b/src/uml/qobjects/qumlgeneralizationobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlgeneralizationobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlGeneralization>
 #include <QtUml/QUmlClassifier>
@@ -48,16 +49,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlGeneralizationObject::QUmlGeneralizationObject(QUmlGeneralization *qModelingObject)
+QUmlGeneralizationObject::QUmlGeneralizationObject(QUmlGeneralization *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlGeneralizationObject::~QUmlGeneralizationObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlGeneralization *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlGeneralization *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -66,25 +69,25 @@ QUmlGeneralizationObject::~QUmlGeneralizationObject()
 const QSet<QObject *> QUmlGeneralizationObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlGeneralization *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlGeneralization *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlGeneralizationObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlGeneralization *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlGeneralization *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlGeneralizationObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlGeneralization *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlGeneralization *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlGeneralization *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlGeneralization *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [Relationship]
@@ -92,8 +95,8 @@ QObject *QUmlGeneralizationObject::owner() const
 const QSet<QObject *> QUmlGeneralizationObject::relatedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlGeneralization *>(this)->relatedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlGeneralization *>(this)->relatedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -102,16 +105,16 @@ const QSet<QObject *> QUmlGeneralizationObject::relatedElements() const
 const QSet<QObject *> QUmlGeneralizationObject::sources() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlGeneralization *>(this)->sources())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlGeneralization *>(this)->sources())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlGeneralizationObject::targets() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlGeneralization *>(this)->targets())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlGeneralization *>(this)->targets())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -119,31 +122,31 @@ const QSet<QObject *> QUmlGeneralizationObject::targets() const
 
 QObject *QUmlGeneralizationObject::general() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlGeneralization *>(this)->general())
+    if (!qmodelingelementproperty_cast<QUmlGeneralization *>(this)->general())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlGeneralization *>(this)->general()->asQObject();
+        return qmodelingelementproperty_cast<QUmlGeneralization *>(this)->general()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlGeneralizationObject::generalizationSets() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralizationSet *element, qmodelingobjectproperty_cast<QUmlGeneralization *>(this)->generalizationSets())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralizationSet *element, qmodelingelementproperty_cast<QUmlGeneralization *>(this)->generalizationSets())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlGeneralizationObject::isSubstitutable() const
 {
-    return qmodelingobjectproperty_cast<QUmlGeneralization *>(this)->isSubstitutable();
+    return qmodelingelementproperty_cast<QUmlGeneralization *>(this)->isSubstitutable();
 }
 
 QObject *QUmlGeneralizationObject::specific() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlGeneralization *>(this)->specific())
+    if (!qmodelingelementproperty_cast<QUmlGeneralization *>(this)->specific())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlGeneralization *>(this)->specific()->asQObject();
+        return qmodelingelementproperty_cast<QUmlGeneralization *>(this)->specific()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -151,107 +154,176 @@ QObject *QUmlGeneralizationObject::specific() const
 QSet<QObject *> QUmlGeneralizationObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlGeneralization *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlGeneralization *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlGeneralizationObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlGeneralization *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlGeneralization *>(this)->mustBeOwned();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlGeneralizationObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralization *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlGeneralization *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlGeneralizationObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralization *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlGeneralization *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlGeneralizationObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralization *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlGeneralization *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlGeneralizationObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralization *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlGeneralization *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlGeneralizationObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralization *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlGeneralization *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Relationship]
 
 void QUmlGeneralizationObject::addRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralization *>(this)->addRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlGeneralization *>(this)->addRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 void QUmlGeneralizationObject::removeRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralization *>(this)->removeRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlGeneralization *>(this)->removeRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [DirectedRelationship]
 
 void QUmlGeneralizationObject::addSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralization *>(this)->addSource(qmodelingobjectproperty_cast<QUmlElement *>(source));
+    qmodelingelementproperty_cast<QUmlGeneralization *>(this)->addSource(qmodelingelementproperty_cast<QUmlElement *>(source));
 }
 
 void QUmlGeneralizationObject::removeSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralization *>(this)->removeSource(qmodelingobjectproperty_cast<QUmlElement *>(source));
+    qmodelingelementproperty_cast<QUmlGeneralization *>(this)->removeSource(qmodelingelementproperty_cast<QUmlElement *>(source));
 }
 
 void QUmlGeneralizationObject::addTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralization *>(this)->addTarget(qmodelingobjectproperty_cast<QUmlElement *>(target));
+    qmodelingelementproperty_cast<QUmlGeneralization *>(this)->addTarget(qmodelingelementproperty_cast<QUmlElement *>(target));
 }
 
 void QUmlGeneralizationObject::removeTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralization *>(this)->removeTarget(qmodelingobjectproperty_cast<QUmlElement *>(target));
+    qmodelingelementproperty_cast<QUmlGeneralization *>(this)->removeTarget(qmodelingelementproperty_cast<QUmlElement *>(target));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Generalization]
 
 void QUmlGeneralizationObject::setGeneral(QObject *general)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralization *>(this)->setGeneral(qmodelingobjectproperty_cast<QUmlClassifier *>(general));
+    qmodelingelementproperty_cast<QUmlGeneralization *>(this)->setGeneral(qmodelingelementproperty_cast<QUmlClassifier *>(general));
 }
 
 void QUmlGeneralizationObject::addGeneralizationSet(QObject *generalizationSet)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralization *>(this)->addGeneralizationSet(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(generalizationSet));
+    qmodelingelementproperty_cast<QUmlGeneralization *>(this)->addGeneralizationSet(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(generalizationSet));
 }
 
 void QUmlGeneralizationObject::removeGeneralizationSet(QObject *generalizationSet)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralization *>(this)->removeGeneralizationSet(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(generalizationSet));
+    qmodelingelementproperty_cast<QUmlGeneralization *>(this)->removeGeneralizationSet(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(generalizationSet));
 }
 
 void QUmlGeneralizationObject::setSubstitutable(bool isSubstitutable)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralization *>(this)->setSubstitutable(isSubstitutable);
+    qmodelingelementproperty_cast<QUmlGeneralization *>(this)->setSubstitutable(isSubstitutable);
 }
 
 void QUmlGeneralizationObject::unsetSubstitutable()
 {
-    qmodelingobjectproperty_cast<QUmlGeneralization *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("substitutable"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("substitutable"));
 }
 
 void QUmlGeneralizationObject::setSpecific(QObject *specific)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralization *>(this)->setSpecific(qmodelingobjectproperty_cast<QUmlClassifier *>(specific));
+    qmodelingelementproperty_cast<QUmlGeneralization *>(this)->setSpecific(qmodelingelementproperty_cast<QUmlClassifier *>(specific));
+}
+
+
+void QUmlGeneralizationObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDirectedRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
+
+    d->propertyGroups << QStringLiteral("QUmlGeneralization");
+    d->groupProperties.insert(QStringLiteral("QUmlGeneralization"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("general"))));
+    d->groupProperties.insert(QStringLiteral("QUmlGeneralization"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizationSets"))));
+    d->groupProperties.insert(QStringLiteral("QUmlGeneralization"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isSubstitutable"))));
+    d->groupProperties.insert(QStringLiteral("QUmlGeneralization"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("specific"))));
+}
+
+void QUmlGeneralizationObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralization, general, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralization, general, PropertyClassRole, QStringLiteral("QUmlGeneralization"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralization, general, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralization, general, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralization, general, DocumentationRole, QStringLiteral("References the general classifier in the Generalization relationship."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralization, general, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralization, general, SubsettedPropertiesRole, QStringLiteral("DirectedRelationship-target"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralization, general, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralization, generalizationSets, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralization, generalizationSets, PropertyClassRole, QStringLiteral("QUmlGeneralization"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralization, generalizationSets, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralization, generalizationSets, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralization, generalizationSets, DocumentationRole, QStringLiteral("Designates a set in which instances of Generalization is considered members."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralization, generalizationSets, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralization, generalizationSets, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralization, generalizationSets, OppositeEndRole, QStringLiteral("GeneralizationSet-generalization"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralization, isSubstitutable, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralization, isSubstitutable, PropertyClassRole, QStringLiteral("QUmlGeneralization"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralization, isSubstitutable, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralization, isSubstitutable, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralization, isSubstitutable, DocumentationRole, QStringLiteral("Indicates whether the specific classifier can be used wherever the general classifier can be used. If true, the execution traces of the specific classifier will be a superset of the execution traces of the general classifier."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralization, isSubstitutable, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralization, isSubstitutable, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralization, isSubstitutable, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralization, specific, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralization, specific, PropertyClassRole, QStringLiteral("QUmlGeneralization"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralization, specific, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralization, specific, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralization, specific, DocumentationRole, QStringLiteral("References the specializing classifier in the Generalization relationship."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralization, specific, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralization, specific, SubsettedPropertiesRole, QStringLiteral("Element-owner DirectedRelationship-source"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralization, specific, OppositeEndRole, QStringLiteral("Classifier-generalization"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlgeneralizationobject_p.h b/src/uml/qobjects/qumlgeneralizationobject_p.h
index 31d80325..c0cf36f7 100644
--- a/src/uml/qobjects/qumlgeneralizationobject_p.h
+++ b/src/uml/qobjects/qumlgeneralizationobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 QT_BEGIN_HEADER
 
@@ -52,9 +52,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlGeneralization;
-class Q_UML_EXPORT QUmlGeneralizationObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlGeneralizationObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlGeneralizationObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -75,7 +78,7 @@ class Q_UML_EXPORT QUmlGeneralizationObject : public QObject
     Q_PROPERTY(QObject * specific READ specific WRITE setSpecific)
 
 public:
-    Q_INVOKABLE explicit QUmlGeneralizationObject(QUmlGeneralization *qModelingObject);
+    Q_INVOKABLE explicit QUmlGeneralizationObject(QUmlGeneralization *qModelingElement);
     virtual ~QUmlGeneralizationObject();
 
     // Owned attributes [Element]
@@ -126,6 +129,10 @@ public Q_SLOTS:
     void setSubstitutable(bool isSubstitutable);
     void unsetSubstitutable();
     void setSpecific(QObject *specific = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlgeneralizationsetobject.cpp b/src/uml/qobjects/qumlgeneralizationsetobject.cpp
index 8e5441c8..efb04643 100644
--- a/src/uml/qobjects/qumlgeneralizationsetobject.cpp
+++ b/src/uml/qobjects/qumlgeneralizationsetobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlgeneralizationsetobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlGeneralizationSet>
 #include <QtUml/QUmlClassifier>
@@ -55,16 +56,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlGeneralizationSetObject::QUmlGeneralizationSetObject(QUmlGeneralizationSet *qModelingObject)
+QUmlGeneralizationSetObject::QUmlGeneralizationSetObject(QUmlGeneralizationSet *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlGeneralizationSetObject::~QUmlGeneralizationSetObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -73,43 +76,43 @@ QUmlGeneralizationSetObject::~QUmlGeneralizationSetObject()
 const QSet<QObject *> QUmlGeneralizationSetObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlGeneralizationSetObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlGeneralizationSetObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlGeneralizationSetObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlGeneralizationSetObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -117,42 +120,42 @@ QObject *QUmlGeneralizationSetObject::templateParameter() const
 const QSet<QObject *> QUmlGeneralizationSetObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlGeneralizationSetObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->name();
 }
 
 QObject *QUmlGeneralizationSetObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlGeneralizationSetObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlGeneralizationSetObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlGeneralizationSetObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [GeneralizationSet]
@@ -160,27 +163,27 @@ QtUml::VisibilityKind QUmlGeneralizationSetObject::visibility() const
 const QSet<QObject *> QUmlGeneralizationSetObject::generalizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralization *element, qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->generalizations())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralization *element, qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->generalizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlGeneralizationSetObject::isCovering() const
 {
-    return qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->isCovering();
+    return qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->isCovering();
 }
 
 bool QUmlGeneralizationSetObject::isDisjoint() const
 {
-    return qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->isDisjoint();
+    return qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->isDisjoint();
 }
 
 QObject *QUmlGeneralizationSetObject::powertype() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->powertype())
+    if (!qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->powertype())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->powertype()->asQObject();
+        return qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->powertype()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -188,26 +191,26 @@ QObject *QUmlGeneralizationSetObject::powertype() const
 QSet<QObject *> QUmlGeneralizationSetObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlGeneralizationSetObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlGeneralizationSetObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlGeneralizationSetObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [NamedElement]
@@ -215,146 +218,224 @@ bool QUmlGeneralizationSetObject::isTemplateParameter() const
 QList<QObject *> QUmlGeneralizationSetObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlGeneralizationSetObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlGeneralizationSetObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlGeneralizationSetObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlGeneralizationSetObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlGeneralizationSetObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlGeneralizationSetObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlGeneralizationSetObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlGeneralizationSetObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlGeneralizationSetObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlGeneralizationSetObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlGeneralizationSetObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlGeneralizationSetObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlGeneralizationSetObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->setName(name);
 }
 
 void QUmlGeneralizationSetObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlGeneralizationSetObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlGeneralizationSetObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlGeneralizationSetObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->setVisibility(visibility);
 }
 
 void QUmlGeneralizationSetObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [GeneralizationSet]
 
 void QUmlGeneralizationSetObject::addGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->addGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->addGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlGeneralizationSetObject::removeGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->removeGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->removeGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlGeneralizationSetObject::setCovering(bool isCovering)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->setCovering(isCovering);
+    qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->setCovering(isCovering);
 }
 
 void QUmlGeneralizationSetObject::unsetCovering()
 {
-    qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("covering"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("covering"));
 }
 
 void QUmlGeneralizationSetObject::setDisjoint(bool isDisjoint)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->setDisjoint(isDisjoint);
+    qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->setDisjoint(isDisjoint);
 }
 
 void QUmlGeneralizationSetObject::unsetDisjoint()
 {
-    qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("disjoint"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("disjoint"));
 }
 
 void QUmlGeneralizationSetObject::setPowertype(QObject *powertype)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(this)->setPowertype(qmodelingobjectproperty_cast<QUmlClassifier *>(powertype));
+    qmodelingelementproperty_cast<QUmlGeneralizationSet *>(this)->setPowertype(qmodelingelementproperty_cast<QUmlClassifier *>(powertype));
+}
+
+
+void QUmlGeneralizationSetObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlGeneralizationSet");
+    d->groupProperties.insert(QStringLiteral("QUmlGeneralizationSet"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlGeneralizationSet"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isCovering"))));
+    d->groupProperties.insert(QStringLiteral("QUmlGeneralizationSet"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isDisjoint"))));
+    d->groupProperties.insert(QStringLiteral("QUmlGeneralizationSet"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertype"))));
+}
+
+void QUmlGeneralizationSetObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralizationSet, generalizations, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralizationSet, generalizations, PropertyClassRole, QStringLiteral("QUmlGeneralizationSet"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralizationSet, generalizations, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralizationSet, generalizations, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralizationSet, generalizations, DocumentationRole, QStringLiteral("Designates the instances of Generalization which are members of a given GeneralizationSet."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralizationSet, generalizations, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralizationSet, generalizations, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralizationSet, generalizations, OppositeEndRole, QStringLiteral("Generalization-generalizationSet"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralizationSet, isCovering, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralizationSet, isCovering, PropertyClassRole, QStringLiteral("QUmlGeneralizationSet"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralizationSet, isCovering, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralizationSet, isCovering, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralizationSet, isCovering, DocumentationRole, QStringLiteral("Indicates (via the associated Generalizations) whether or not the set of specific Classifiers are covering for a particular general classifier. When isCovering is true, every instance of a particular general Classifier is also an instance of at least one of its specific Classifiers for the GeneralizationSet. When isCovering is false, there are one or more instances of the particular general Classifier that are not instances of at least one of its specific Classifiers defined for the GeneralizationSet."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralizationSet, isCovering, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralizationSet, isCovering, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralizationSet, isCovering, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralizationSet, isDisjoint, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralizationSet, isDisjoint, PropertyClassRole, QStringLiteral("QUmlGeneralizationSet"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralizationSet, isDisjoint, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralizationSet, isDisjoint, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralizationSet, isDisjoint, DocumentationRole, QStringLiteral("Indicates whether or not the set of specific Classifiers in a Generalization relationship have instance in common. If isDisjoint is true, the specific Classifiers for a particular GeneralizationSet have no members in common; that is, their intersection is empty. If isDisjoint is false, the specific Classifiers in a particular GeneralizationSet have one or more members in common; that is, their intersection is not empty. For example, Person could have two Generalization relationships, each with the different specific Classifier: Manager or Staff. This would be disjoint because every instance of Person must either be a Manager or Staff. In contrast, Person could have two Generalization relationships involving two specific (and non-covering) Classifiers: Sales Person and Manager. This GeneralizationSet would not be disjoint because there are instances of Person which can be a Sales Person and a Manager."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralizationSet, isDisjoint, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralizationSet, isDisjoint, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralizationSet, isDisjoint, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralizationSet, powertype, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralizationSet, powertype, PropertyClassRole, QStringLiteral("QUmlGeneralizationSet"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralizationSet, powertype, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralizationSet, powertype, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralizationSet, powertype, DocumentationRole, QStringLiteral("Designates the Classifier that is defined as the power type for the associated GeneralizationSet."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralizationSet, powertype, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralizationSet, powertype, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralizationSet, powertype, OppositeEndRole, QStringLiteral("Classifier-powertypeExtent"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlgeneralizationsetobject_p.h b/src/uml/qobjects/qumlgeneralizationsetobject_p.h
index 7d637788..f109f6fb 100644
--- a/src/uml/qobjects/qumlgeneralizationsetobject_p.h
+++ b/src/uml/qobjects/qumlgeneralizationsetobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlGeneralizationSet;
-class Q_UML_EXPORT QUmlGeneralizationSetObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlGeneralizationSetObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlGeneralizationSetObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -84,7 +87,7 @@ class Q_UML_EXPORT QUmlGeneralizationSetObject : public QObject
     Q_PROPERTY(QObject * powertype READ powertype WRITE setPowertype)
 
 public:
-    Q_INVOKABLE explicit QUmlGeneralizationSetObject(QUmlGeneralizationSet *qModelingObject);
+    Q_INVOKABLE explicit QUmlGeneralizationSetObject(QUmlGeneralizationSet *qModelingElement);
     virtual ~QUmlGeneralizationSetObject();
 
     // Owned attributes [Element]
@@ -159,6 +162,10 @@ public Q_SLOTS:
     void setDisjoint(bool isDisjoint);
     void unsetDisjoint();
     void setPowertype(QObject *powertype = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlgeneralorderingobject.cpp b/src/uml/qobjects/qumlgeneralorderingobject.cpp
index 1418a3c2..324f9903 100644
--- a/src/uml/qobjects/qumlgeneralorderingobject.cpp
+++ b/src/uml/qobjects/qumlgeneralorderingobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlgeneralorderingobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlGeneralOrdering>
 #include <QtUml/QUmlComment>
@@ -52,16 +53,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlGeneralOrderingObject::QUmlGeneralOrderingObject(QUmlGeneralOrdering *qModelingObject)
+QUmlGeneralOrderingObject::QUmlGeneralOrderingObject(QUmlGeneralOrdering *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlGeneralOrderingObject::~QUmlGeneralOrderingObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlGeneralOrdering *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -70,25 +73,25 @@ QUmlGeneralOrderingObject::~QUmlGeneralOrderingObject()
 const QSet<QObject *> QUmlGeneralOrderingObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlGeneralOrdering *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlGeneralOrderingObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlGeneralOrdering *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlGeneralOrderingObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlGeneralOrdering *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlGeneralOrdering *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -96,58 +99,58 @@ QObject *QUmlGeneralOrderingObject::owner() const
 const QSet<QObject *> QUmlGeneralOrderingObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlGeneralOrdering *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlGeneralOrderingObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlGeneralOrdering *>(this)->name();
 }
 
 QObject *QUmlGeneralOrderingObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlGeneralOrdering *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlGeneralOrdering *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlGeneralOrderingObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlGeneralOrdering *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlGeneralOrdering *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlGeneralOrderingObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlGeneralOrdering *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlGeneralOrderingObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlGeneralOrdering *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [GeneralOrdering]
 
 QObject *QUmlGeneralOrderingObject::after() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(this)->after())
+    if (!qmodelingelementproperty_cast<QUmlGeneralOrdering *>(this)->after())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(this)->after()->asQObject();
+        return qmodelingelementproperty_cast<QUmlGeneralOrdering *>(this)->after()->asQModelingObject();
 }
 
 QObject *QUmlGeneralOrderingObject::before() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(this)->before())
+    if (!qmodelingelementproperty_cast<QUmlGeneralOrdering *>(this)->before())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(this)->before()->asQObject();
+        return qmodelingelementproperty_cast<QUmlGeneralOrdering *>(this)->before()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -155,14 +158,14 @@ QObject *QUmlGeneralOrderingObject::before() const
 QSet<QObject *> QUmlGeneralOrderingObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlGeneralOrdering *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlGeneralOrderingObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlGeneralOrdering *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -170,103 +173,152 @@ bool QUmlGeneralOrderingObject::mustBeOwned() const
 QList<QObject *> QUmlGeneralOrderingObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlGeneralOrdering *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlGeneralOrderingObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlGeneralOrdering *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlGeneralOrderingObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlGeneralOrdering *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlGeneralOrderingObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlGeneralOrdering *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlGeneralOrderingObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlGeneralOrdering *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlGeneralOrderingObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlGeneralOrdering *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlGeneralOrderingObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlGeneralOrdering *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlGeneralOrderingObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlGeneralOrdering *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlGeneralOrderingObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlGeneralOrdering *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlGeneralOrderingObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlGeneralOrdering *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlGeneralOrderingObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlGeneralOrdering *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlGeneralOrderingObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlGeneralOrdering *>(this)->setName(name);
 }
 
 void QUmlGeneralOrderingObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlGeneralOrdering *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlGeneralOrderingObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlGeneralOrdering *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlGeneralOrderingObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlGeneralOrdering *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlGeneralOrderingObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlGeneralOrdering *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [GeneralOrdering]
 
 void QUmlGeneralOrderingObject::setAfter(QObject *after)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(this)->setAfter(qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(after));
+    qmodelingelementproperty_cast<QUmlGeneralOrdering *>(this)->setAfter(qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(after));
 }
 
 void QUmlGeneralOrderingObject::setBefore(QObject *before)
 {
-    qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(this)->setBefore(qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(before));
+    qmodelingelementproperty_cast<QUmlGeneralOrdering *>(this)->setBefore(qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(before));
+}
+
+
+void QUmlGeneralOrderingObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlGeneralOrdering");
+    d->groupProperties.insert(QStringLiteral("QUmlGeneralOrdering"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("after"))));
+    d->groupProperties.insert(QStringLiteral("QUmlGeneralOrdering"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("before"))));
+}
+
+void QUmlGeneralOrderingObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralOrdering, after, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralOrdering, after, PropertyClassRole, QStringLiteral("QUmlGeneralOrdering"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralOrdering, after, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralOrdering, after, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralOrdering, after, DocumentationRole, QStringLiteral("The OccurrenceSpecification referenced comes after the OccurrenceSpecification referenced by before."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralOrdering, after, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralOrdering, after, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralOrdering, after, OppositeEndRole, QStringLiteral("OccurrenceSpecification-toBefore"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralOrdering, before, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralOrdering, before, PropertyClassRole, QStringLiteral("QUmlGeneralOrdering"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralOrdering, before, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralOrdering, before, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralOrdering, before, DocumentationRole, QStringLiteral("The OccurrenceSpecification referenced comes before the OccurrenceSpecification referenced by after."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralOrdering, before, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralOrdering, before, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlGeneralOrdering, before, OppositeEndRole, QStringLiteral("OccurrenceSpecification-toAfter"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlgeneralorderingobject_p.h b/src/uml/qobjects/qumlgeneralorderingobject_p.h
index ed66972f..492b79d9 100644
--- a/src/uml/qobjects/qumlgeneralorderingobject_p.h
+++ b/src/uml/qobjects/qumlgeneralorderingobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlGeneralOrdering;
-class Q_UML_EXPORT QUmlGeneralOrderingObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlGeneralOrderingObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlGeneralOrderingObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -76,7 +79,7 @@ class Q_UML_EXPORT QUmlGeneralOrderingObject : public QObject
     Q_PROPERTY(QObject * before READ before WRITE setBefore)
 
 public:
-    Q_INVOKABLE explicit QUmlGeneralOrderingObject(QUmlGeneralOrdering *qModelingObject);
+    Q_INVOKABLE explicit QUmlGeneralOrderingObject(QUmlGeneralOrdering *qModelingElement);
     virtual ~QUmlGeneralOrderingObject();
 
     // Owned attributes [Element]
@@ -127,6 +130,10 @@ public Q_SLOTS:
     // Slots for owned attributes [GeneralOrdering]
     void setAfter(QObject *after = 0);
     void setBefore(QObject *before = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlimageobject.cpp b/src/uml/qobjects/qumlimageobject.cpp
index ec6485fc..624cd011 100644
--- a/src/uml/qobjects/qumlimageobject.cpp
+++ b/src/uml/qobjects/qumlimageobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlimageobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlImage>
 #include <QtUml/QUmlComment>
@@ -46,16 +47,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlImageObject::QUmlImageObject(QUmlImage *qModelingObject)
+QUmlImageObject::QUmlImageObject(QUmlImage *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlImageObject::~QUmlImageObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlImage *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlImage *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -64,42 +67,42 @@ QUmlImageObject::~QUmlImageObject()
 const QSet<QObject *> QUmlImageObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlImage *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlImage *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlImageObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlImage *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlImage *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlImageObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlImage *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlImage *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlImage *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlImage *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [Image]
 
 QString QUmlImageObject::content() const
 {
-    return qmodelingobjectproperty_cast<QUmlImage *>(this)->content();
+    return qmodelingelementproperty_cast<QUmlImage *>(this)->content();
 }
 
 QString QUmlImageObject::format() const
 {
-    return qmodelingobjectproperty_cast<QUmlImage *>(this)->format();
+    return qmodelingelementproperty_cast<QUmlImage *>(this)->format();
 }
 
 QString QUmlImageObject::location() const
 {
-    return qmodelingobjectproperty_cast<QUmlImage *>(this)->location();
+    return qmodelingelementproperty_cast<QUmlImage *>(this)->location();
 }
 
 // OPERATIONS [Element]
@@ -107,58 +110,109 @@ QString QUmlImageObject::location() const
 QSet<QObject *> QUmlImageObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlImage *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlImage *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlImageObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlImage *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlImage *>(this)->mustBeOwned();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlImageObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlImage *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlImage *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlImageObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlImage *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlImage *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlImageObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlImage *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlImage *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlImageObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlImage *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlImage *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlImageObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlImage *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlImage *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Image]
 
 void QUmlImageObject::setContent(QString content)
 {
-    qmodelingobjectproperty_cast<QUmlImage *>(this)->setContent(content);
+    qmodelingelementproperty_cast<QUmlImage *>(this)->setContent(content);
 }
 
 void QUmlImageObject::setFormat(QString format)
 {
-    qmodelingobjectproperty_cast<QUmlImage *>(this)->setFormat(format);
+    qmodelingelementproperty_cast<QUmlImage *>(this)->setFormat(format);
 }
 
 void QUmlImageObject::setLocation(QString location)
 {
-    qmodelingobjectproperty_cast<QUmlImage *>(this)->setLocation(location);
+    qmodelingelementproperty_cast<QUmlImage *>(this)->setLocation(location);
+}
+
+
+void QUmlImageObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlImage");
+    d->groupProperties.insert(QStringLiteral("QUmlImage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("content"))));
+    d->groupProperties.insert(QStringLiteral("QUmlImage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("format"))));
+    d->groupProperties.insert(QStringLiteral("QUmlImage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("location"))));
+}
+
+void QUmlImageObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlImage, content, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlImage, content, PropertyClassRole, QStringLiteral("QUmlImage"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlImage, content, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlImage, content, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlImage, content, DocumentationRole, QStringLiteral("This contains the serialization of the image according to the format. The value could represent a bitmap, image such as a GIF file, or drawing 'instructions' using a standard such as Scalable Vector Graphic (SVG) (which is XML based)."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlImage, content, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlImage, content, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlImage, content, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlImage, format, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlImage, format, PropertyClassRole, QStringLiteral("QUmlImage"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlImage, format, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlImage, format, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlImage, format, DocumentationRole, QStringLiteral("This indicates the format of the content - which is how the string content should be interpreted. The following values are reserved: SVG, GIF, PNG, JPG, WMF, EMF, BMP. In addition the prefix 'MIME: ' is also reserved. This option can be used as an alternative to express the reserved values above, for example 'SVG' could instead be expressed as 'MIME: image/svg+xml'."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlImage, format, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlImage, format, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlImage, format, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlImage, location, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlImage, location, PropertyClassRole, QStringLiteral("QUmlImage"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlImage, location, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlImage, location, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlImage, location, DocumentationRole, QStringLiteral("This contains a location that can be used by a tool to locate the image as an alternative to embedding it in the stereotype."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlImage, location, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlImage, location, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlImage, location, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlimageobject_p.h b/src/uml/qobjects/qumlimageobject_p.h
index e4e0bfa3..a03336e7 100644
--- a/src/uml/qobjects/qumlimageobject_p.h
+++ b/src/uml/qobjects/qumlimageobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 QT_BEGIN_HEADER
 
@@ -52,9 +52,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlImage;
-class Q_UML_EXPORT QUmlImageObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlImageObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlImageObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -67,7 +70,7 @@ class Q_UML_EXPORT QUmlImageObject : public QObject
     Q_PROPERTY(QString location READ location WRITE setLocation)
 
 public:
-    Q_INVOKABLE explicit QUmlImageObject(QUmlImage *qModelingObject);
+    Q_INVOKABLE explicit QUmlImageObject(QUmlImage *qModelingElement);
     virtual ~QUmlImageObject();
 
     // Owned attributes [Element]
@@ -97,6 +100,10 @@ public Q_SLOTS:
     void setContent(QString content);
     void setFormat(QString format);
     void setLocation(QString location);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlincludeobject.cpp b/src/uml/qobjects/qumlincludeobject.cpp
index 0b339b6d..044df87a 100644
--- a/src/uml/qobjects/qumlincludeobject.cpp
+++ b/src/uml/qobjects/qumlincludeobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlincludeobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlInclude>
 #include <QtUml/QUmlComment>
@@ -52,16 +53,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlIncludeObject::QUmlIncludeObject(QUmlInclude *qModelingObject)
+QUmlIncludeObject::QUmlIncludeObject(QUmlInclude *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlIncludeObject::~QUmlIncludeObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlInclude *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlInclude *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -70,25 +73,25 @@ QUmlIncludeObject::~QUmlIncludeObject()
 const QSet<QObject *> QUmlIncludeObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlInclude *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlInclude *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlIncludeObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInclude *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInclude *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlIncludeObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInclude *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlInclude *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInclude *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInclude *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [Relationship]
@@ -96,8 +99,8 @@ QObject *QUmlIncludeObject::owner() const
 const QSet<QObject *> QUmlIncludeObject::relatedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInclude *>(this)->relatedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInclude *>(this)->relatedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -106,16 +109,16 @@ const QSet<QObject *> QUmlIncludeObject::relatedElements() const
 const QSet<QObject *> QUmlIncludeObject::sources() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInclude *>(this)->sources())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInclude *>(this)->sources())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlIncludeObject::targets() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInclude *>(this)->targets())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInclude *>(this)->targets())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -124,58 +127,58 @@ const QSet<QObject *> QUmlIncludeObject::targets() const
 const QSet<QObject *> QUmlIncludeObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlInclude *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlInclude *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlIncludeObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlInclude *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlInclude *>(this)->name();
 }
 
 QObject *QUmlIncludeObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInclude *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlInclude *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInclude *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInclude *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlIncludeObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInclude *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlInclude *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInclude *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInclude *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlIncludeObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlInclude *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlInclude *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlIncludeObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlInclude *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlInclude *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Include]
 
 QObject *QUmlIncludeObject::addition() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInclude *>(this)->addition())
+    if (!qmodelingelementproperty_cast<QUmlInclude *>(this)->addition())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInclude *>(this)->addition()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInclude *>(this)->addition()->asQModelingObject();
 }
 
 QObject *QUmlIncludeObject::includingCase() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInclude *>(this)->includingCase())
+    if (!qmodelingelementproperty_cast<QUmlInclude *>(this)->includingCase())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInclude *>(this)->includingCase()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInclude *>(this)->includingCase()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -183,14 +186,14 @@ QObject *QUmlIncludeObject::includingCase() const
 QSet<QObject *> QUmlIncludeObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInclude *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInclude *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlIncludeObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlInclude *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlInclude *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -198,137 +201,193 @@ bool QUmlIncludeObject::mustBeOwned() const
 QList<QObject *> QUmlIncludeObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlInclude *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlInclude *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlIncludeObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlInclude *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlInclude *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlIncludeObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlInclude *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlInclude *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlIncludeObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlInclude *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlInclude *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlIncludeObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlInclude *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlInclude *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlIncludeObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlInclude *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlInclude *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlIncludeObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInclude *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlInclude *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlIncludeObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInclude *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlInclude *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlIncludeObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlInclude *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlInclude *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Relationship]
 
 void QUmlIncludeObject::addRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInclude *>(this)->addRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlInclude *>(this)->addRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 void QUmlIncludeObject::removeRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInclude *>(this)->removeRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlInclude *>(this)->removeRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [DirectedRelationship]
 
 void QUmlIncludeObject::addSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlInclude *>(this)->addSource(qmodelingobjectproperty_cast<QUmlElement *>(source));
+    qmodelingelementproperty_cast<QUmlInclude *>(this)->addSource(qmodelingelementproperty_cast<QUmlElement *>(source));
 }
 
 void QUmlIncludeObject::removeSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlInclude *>(this)->removeSource(qmodelingobjectproperty_cast<QUmlElement *>(source));
+    qmodelingelementproperty_cast<QUmlInclude *>(this)->removeSource(qmodelingelementproperty_cast<QUmlElement *>(source));
 }
 
 void QUmlIncludeObject::addTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlInclude *>(this)->addTarget(qmodelingobjectproperty_cast<QUmlElement *>(target));
+    qmodelingelementproperty_cast<QUmlInclude *>(this)->addTarget(qmodelingelementproperty_cast<QUmlElement *>(target));
 }
 
 void QUmlIncludeObject::removeTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlInclude *>(this)->removeTarget(qmodelingobjectproperty_cast<QUmlElement *>(target));
+    qmodelingelementproperty_cast<QUmlInclude *>(this)->removeTarget(qmodelingelementproperty_cast<QUmlElement *>(target));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlIncludeObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlInclude *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlInclude *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlIncludeObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlInclude *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlInclude *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlIncludeObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlInclude *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlInclude *>(this)->setName(name);
 }
 
 void QUmlIncludeObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlInclude *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlInclude *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlIncludeObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlInclude *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlInclude *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlIncludeObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlInclude *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlInclude *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlIncludeObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlInclude *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlInclude *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Include]
 
 void QUmlIncludeObject::setAddition(QObject *addition)
 {
-    qmodelingobjectproperty_cast<QUmlInclude *>(this)->setAddition(qmodelingobjectproperty_cast<QUmlUseCase *>(addition));
+    qmodelingelementproperty_cast<QUmlInclude *>(this)->setAddition(qmodelingelementproperty_cast<QUmlUseCase *>(addition));
 }
 
 void QUmlIncludeObject::setIncludingCase(QObject *includingCase)
 {
-    qmodelingobjectproperty_cast<QUmlInclude *>(this)->setIncludingCase(qmodelingobjectproperty_cast<QUmlUseCase *>(includingCase));
+    qmodelingelementproperty_cast<QUmlInclude *>(this)->setIncludingCase(qmodelingelementproperty_cast<QUmlUseCase *>(includingCase));
+}
+
+
+void QUmlIncludeObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDirectedRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlInclude");
+    d->groupProperties.insert(QStringLiteral("QUmlInclude"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("addition"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInclude"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("includingCase"))));
+}
+
+void QUmlIncludeObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInclude, addition, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInclude, addition, PropertyClassRole, QStringLiteral("QUmlInclude"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInclude, addition, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInclude, addition, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInclude, addition, DocumentationRole, QStringLiteral("References the use case that is to be included."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInclude, addition, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInclude, addition, SubsettedPropertiesRole, QStringLiteral("DirectedRelationship-target"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInclude, addition, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInclude, includingCase, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInclude, includingCase, PropertyClassRole, QStringLiteral("QUmlInclude"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInclude, includingCase, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInclude, includingCase, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInclude, includingCase, DocumentationRole, QStringLiteral("References the use case which will include the addition and owns the include relationship."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInclude, includingCase, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInclude, includingCase, SubsettedPropertiesRole, QStringLiteral("DirectedRelationship-source NamedElement-namespace"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInclude, includingCase, OppositeEndRole, QStringLiteral("UseCase-include"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlincludeobject_p.h b/src/uml/qobjects/qumlincludeobject_p.h
index d75b8306..b0dd9411 100644
--- a/src/uml/qobjects/qumlincludeobject_p.h
+++ b/src/uml/qobjects/qumlincludeobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlInclude;
-class Q_UML_EXPORT QUmlIncludeObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlIncludeObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlIncludeObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -83,7 +86,7 @@ class Q_UML_EXPORT QUmlIncludeObject : public QObject
     Q_PROPERTY(QObject * includingCase READ includingCase WRITE setIncludingCase)
 
 public:
-    Q_INVOKABLE explicit QUmlIncludeObject(QUmlInclude *qModelingObject);
+    Q_INVOKABLE explicit QUmlIncludeObject(QUmlInclude *qModelingElement);
     virtual ~QUmlIncludeObject();
 
     // Owned attributes [Element]
@@ -151,6 +154,10 @@ public Q_SLOTS:
     // Slots for owned attributes [Include]
     void setAddition(QObject *addition = 0);
     void setIncludingCase(QObject *includingCase = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlinformationflowobject.cpp b/src/uml/qobjects/qumlinformationflowobject.cpp
index 501241c2..a491f4eb 100644
--- a/src/uml/qobjects/qumlinformationflowobject.cpp
+++ b/src/uml/qobjects/qumlinformationflowobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlinformationflowobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlInformationFlow>
 #include <QtUml/QUmlActivityEdge>
@@ -58,16 +59,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlInformationFlowObject::QUmlInformationFlowObject(QUmlInformationFlow *qModelingObject)
+QUmlInformationFlowObject::QUmlInformationFlowObject(QUmlInformationFlow *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlInformationFlowObject::~QUmlInformationFlowObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -76,25 +79,25 @@ QUmlInformationFlowObject::~QUmlInformationFlowObject()
 const QSet<QObject *> QUmlInformationFlowObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInformationFlowObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlInformationFlowObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [Relationship]
@@ -102,8 +105,8 @@ QObject *QUmlInformationFlowObject::owner() const
 const QSet<QObject *> QUmlInformationFlowObject::relatedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->relatedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->relatedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -112,16 +115,16 @@ const QSet<QObject *> QUmlInformationFlowObject::relatedElements() const
 const QSet<QObject *> QUmlInformationFlowObject::sources() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->sources())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->sources())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInformationFlowObject::targets() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->targets())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->targets())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -129,18 +132,18 @@ const QSet<QObject *> QUmlInformationFlowObject::targets() const
 
 QObject *QUmlInformationFlowObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlInformationFlowObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -148,42 +151,42 @@ QObject *QUmlInformationFlowObject::templateParameter() const
 const QSet<QObject *> QUmlInformationFlowObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlInformationFlowObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->name();
 }
 
 QObject *QUmlInformationFlowObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlInformationFlowObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlInformationFlowObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlInformationFlowObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [InformationFlow]
@@ -191,56 +194,56 @@ QtUml::VisibilityKind QUmlInformationFlowObject::visibility() const
 const QSet<QObject *> QUmlInformationFlowObject::conveyed() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->conveyed())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->conveyed())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInformationFlowObject::informationSources() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->informationSources())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->informationSources())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInformationFlowObject::informationTargets() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->informationTargets())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->informationTargets())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInformationFlowObject::realizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRelationship *element, qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->realizations())
-        set.insert(element->asQObject());
+    foreach (QUmlRelationship *element, qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->realizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInformationFlowObject::realizingActivityEdges() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->realizingActivityEdges())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->realizingActivityEdges())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInformationFlowObject::realizingConnectors() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConnector *element, qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->realizingConnectors())
-        set.insert(element->asQObject());
+    foreach (QUmlConnector *element, qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->realizingConnectors())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInformationFlowObject::realizingMessages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlMessage *element, qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->realizingMessages())
-        set.insert(element->asQObject());
+    foreach (QUmlMessage *element, qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->realizingMessages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -249,26 +252,26 @@ const QSet<QObject *> QUmlInformationFlowObject::realizingMessages() const
 QSet<QObject *> QUmlInformationFlowObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInformationFlowObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlInformationFlowObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlInformationFlowObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [NamedElement]
@@ -276,215 +279,328 @@ bool QUmlInformationFlowObject::isTemplateParameter() const
 QList<QObject *> QUmlInformationFlowObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlInformationFlowObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInformationFlowObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlInformationFlowObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlInformationFlowObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlInformationFlowObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlInformationFlowObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlInformationFlowObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlInformationFlowObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Relationship]
 
 void QUmlInformationFlowObject::addRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->addRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->addRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 void QUmlInformationFlowObject::removeRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->removeRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->removeRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [DirectedRelationship]
 
 void QUmlInformationFlowObject::addSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->addSource(qmodelingobjectproperty_cast<QUmlElement *>(source));
+    qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->addSource(qmodelingelementproperty_cast<QUmlElement *>(source));
 }
 
 void QUmlInformationFlowObject::removeSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->removeSource(qmodelingobjectproperty_cast<QUmlElement *>(source));
+    qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->removeSource(qmodelingelementproperty_cast<QUmlElement *>(source));
 }
 
 void QUmlInformationFlowObject::addTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->addTarget(qmodelingobjectproperty_cast<QUmlElement *>(target));
+    qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->addTarget(qmodelingelementproperty_cast<QUmlElement *>(target));
 }
 
 void QUmlInformationFlowObject::removeTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->removeTarget(qmodelingobjectproperty_cast<QUmlElement *>(target));
+    qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->removeTarget(qmodelingelementproperty_cast<QUmlElement *>(target));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlInformationFlowObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlInformationFlowObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlInformationFlowObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlInformationFlowObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlInformationFlowObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->setName(name);
 }
 
 void QUmlInformationFlowObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlInformationFlowObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlInformationFlowObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlInformationFlowObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->setVisibility(visibility);
 }
 
 void QUmlInformationFlowObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [InformationFlow]
 
 void QUmlInformationFlowObject::addConveyed(QObject *conveyed)
 {
-    qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->addConveyed(qmodelingobjectproperty_cast<QUmlClassifier *>(conveyed));
+    qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->addConveyed(qmodelingelementproperty_cast<QUmlClassifier *>(conveyed));
 }
 
 void QUmlInformationFlowObject::removeConveyed(QObject *conveyed)
 {
-    qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->removeConveyed(qmodelingobjectproperty_cast<QUmlClassifier *>(conveyed));
+    qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->removeConveyed(qmodelingelementproperty_cast<QUmlClassifier *>(conveyed));
 }
 
 void QUmlInformationFlowObject::addInformationSource(QObject *informationSource)
 {
-    qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->addInformationSource(qmodelingobjectproperty_cast<QUmlNamedElement *>(informationSource));
+    qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->addInformationSource(qmodelingelementproperty_cast<QUmlNamedElement *>(informationSource));
 }
 
 void QUmlInformationFlowObject::removeInformationSource(QObject *informationSource)
 {
-    qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->removeInformationSource(qmodelingobjectproperty_cast<QUmlNamedElement *>(informationSource));
+    qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->removeInformationSource(qmodelingelementproperty_cast<QUmlNamedElement *>(informationSource));
 }
 
 void QUmlInformationFlowObject::addInformationTarget(QObject *informationTarget)
 {
-    qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->addInformationTarget(qmodelingobjectproperty_cast<QUmlNamedElement *>(informationTarget));
+    qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->addInformationTarget(qmodelingelementproperty_cast<QUmlNamedElement *>(informationTarget));
 }
 
 void QUmlInformationFlowObject::removeInformationTarget(QObject *informationTarget)
 {
-    qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->removeInformationTarget(qmodelingobjectproperty_cast<QUmlNamedElement *>(informationTarget));
+    qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->removeInformationTarget(qmodelingelementproperty_cast<QUmlNamedElement *>(informationTarget));
 }
 
 void QUmlInformationFlowObject::addRealization(QObject *realization)
 {
-    qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->addRealization(qmodelingobjectproperty_cast<QUmlRelationship *>(realization));
+    qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->addRealization(qmodelingelementproperty_cast<QUmlRelationship *>(realization));
 }
 
 void QUmlInformationFlowObject::removeRealization(QObject *realization)
 {
-    qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->removeRealization(qmodelingobjectproperty_cast<QUmlRelationship *>(realization));
+    qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->removeRealization(qmodelingelementproperty_cast<QUmlRelationship *>(realization));
 }
 
 void QUmlInformationFlowObject::addRealizingActivityEdge(QObject *realizingActivityEdge)
 {
-    qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->addRealizingActivityEdge(qmodelingobjectproperty_cast<QUmlActivityEdge *>(realizingActivityEdge));
+    qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->addRealizingActivityEdge(qmodelingelementproperty_cast<QUmlActivityEdge *>(realizingActivityEdge));
 }
 
 void QUmlInformationFlowObject::removeRealizingActivityEdge(QObject *realizingActivityEdge)
 {
-    qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->removeRealizingActivityEdge(qmodelingobjectproperty_cast<QUmlActivityEdge *>(realizingActivityEdge));
+    qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->removeRealizingActivityEdge(qmodelingelementproperty_cast<QUmlActivityEdge *>(realizingActivityEdge));
 }
 
 void QUmlInformationFlowObject::addRealizingConnector(QObject *realizingConnector)
 {
-    qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->addRealizingConnector(qmodelingobjectproperty_cast<QUmlConnector *>(realizingConnector));
+    qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->addRealizingConnector(qmodelingelementproperty_cast<QUmlConnector *>(realizingConnector));
 }
 
 void QUmlInformationFlowObject::removeRealizingConnector(QObject *realizingConnector)
 {
-    qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->removeRealizingConnector(qmodelingobjectproperty_cast<QUmlConnector *>(realizingConnector));
+    qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->removeRealizingConnector(qmodelingelementproperty_cast<QUmlConnector *>(realizingConnector));
 }
 
 void QUmlInformationFlowObject::addRealizingMessage(QObject *realizingMessage)
 {
-    qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->addRealizingMessage(qmodelingobjectproperty_cast<QUmlMessage *>(realizingMessage));
+    qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->addRealizingMessage(qmodelingelementproperty_cast<QUmlMessage *>(realizingMessage));
 }
 
 void QUmlInformationFlowObject::removeRealizingMessage(QObject *realizingMessage)
 {
-    qmodelingobjectproperty_cast<QUmlInformationFlow *>(this)->removeRealizingMessage(qmodelingobjectproperty_cast<QUmlMessage *>(realizingMessage));
+    qmodelingelementproperty_cast<QUmlInformationFlow *>(this)->removeRealizingMessage(qmodelingelementproperty_cast<QUmlMessage *>(realizingMessage));
+}
+
+
+void QUmlInformationFlowObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDirectedRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlInformationFlow");
+    d->groupProperties.insert(QStringLiteral("QUmlInformationFlow"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("conveyed"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInformationFlow"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("informationSources"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInformationFlow"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("informationTargets"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInformationFlow"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("realizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInformationFlow"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("realizingActivityEdges"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInformationFlow"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("realizingConnectors"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInformationFlow"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("realizingMessages"))));
+}
+
+void QUmlInformationFlowObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, conveyed, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, conveyed, PropertyClassRole, QStringLiteral("QUmlInformationFlow"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, conveyed, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, conveyed, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, conveyed, DocumentationRole, QStringLiteral("Specifies the information items that may circulate on this information flow."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, conveyed, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, conveyed, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, conveyed, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, informationSources, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, informationSources, PropertyClassRole, QStringLiteral("QUmlInformationFlow"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, informationSources, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, informationSources, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, informationSources, DocumentationRole, QStringLiteral("Defines from which source the conveyed InformationItems are initiated."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, informationSources, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, informationSources, SubsettedPropertiesRole, QStringLiteral("DirectedRelationship-source"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, informationSources, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, informationTargets, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, informationTargets, PropertyClassRole, QStringLiteral("QUmlInformationFlow"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, informationTargets, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, informationTargets, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, informationTargets, DocumentationRole, QStringLiteral("Defines to which target the conveyed InformationItems are directed."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, informationTargets, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, informationTargets, SubsettedPropertiesRole, QStringLiteral("DirectedRelationship-target"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, informationTargets, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, realizations, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, realizations, PropertyClassRole, QStringLiteral("QUmlInformationFlow"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, realizations, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, realizations, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, realizations, DocumentationRole, QStringLiteral("Determines which Relationship will realize the specified flow"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, realizations, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, realizations, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, realizations, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, realizingActivityEdges, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, realizingActivityEdges, PropertyClassRole, QStringLiteral("QUmlInformationFlow"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, realizingActivityEdges, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, realizingActivityEdges, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, realizingActivityEdges, DocumentationRole, QStringLiteral("Determines which ActivityEdges will realize the specified flow."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, realizingActivityEdges, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, realizingActivityEdges, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, realizingActivityEdges, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, realizingConnectors, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, realizingConnectors, PropertyClassRole, QStringLiteral("QUmlInformationFlow"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, realizingConnectors, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, realizingConnectors, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, realizingConnectors, DocumentationRole, QStringLiteral("Determines which Connectors will realize the specified flow."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, realizingConnectors, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, realizingConnectors, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, realizingConnectors, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, realizingMessages, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, realizingMessages, PropertyClassRole, QStringLiteral("QUmlInformationFlow"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, realizingMessages, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, realizingMessages, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, realizingMessages, DocumentationRole, QStringLiteral("Determines which Messages will realize the specified flow."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, realizingMessages, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, realizingMessages, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationFlow, realizingMessages, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlinformationflowobject_p.h b/src/uml/qobjects/qumlinformationflowobject_p.h
index d9150a3a..424d460f 100644
--- a/src/uml/qobjects/qumlinformationflowobject_p.h
+++ b/src/uml/qobjects/qumlinformationflowobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlInformationFlow;
-class Q_UML_EXPORT QUmlInformationFlowObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlInformationFlowObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlInformationFlowObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -94,7 +97,7 @@ class Q_UML_EXPORT QUmlInformationFlowObject : public QObject
     Q_PROPERTY(QSet<QObject *> realizingMessages READ realizingMessages)
 
 public:
-    Q_INVOKABLE explicit QUmlInformationFlowObject(QUmlInformationFlow *qModelingObject);
+    Q_INVOKABLE explicit QUmlInformationFlowObject(QUmlInformationFlow *qModelingElement);
     virtual ~QUmlInformationFlowObject();
 
     // Owned attributes [Element]
@@ -196,6 +199,10 @@ public Q_SLOTS:
     void removeRealizingConnector(QObject *realizingConnector);
     void addRealizingMessage(QObject *realizingMessage);
     void removeRealizingMessage(QObject *realizingMessage);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlinformationitemobject.cpp b/src/uml/qobjects/qumlinformationitemobject.cpp
index b10081e3..ef45b88d 100644
--- a/src/uml/qobjects/qumlinformationitemobject.cpp
+++ b/src/uml/qobjects/qumlinformationitemobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlinformationitemobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlInformationItem>
 #include <QtUml/QUmlClassifier>
@@ -71,16 +72,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlInformationItemObject::QUmlInformationItemObject(QUmlInformationItem *qModelingObject)
+QUmlInformationItemObject::QUmlInformationItemObject(QUmlInformationItem *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlInformationItemObject::~QUmlInformationItemObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlInformationItem *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -89,25 +92,25 @@ QUmlInformationItemObject::~QUmlInformationItemObject()
 const QSet<QObject *> QUmlInformationItemObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlInformationItem *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInformationItemObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInformationItem *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlInformationItemObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlInformationItem *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInformationItem *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -115,35 +118,35 @@ QObject *QUmlInformationItemObject::owner() const
 const QSet<QObject *> QUmlInformationItemObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlInformationItem *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlInformationItemObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlInformationItem *>(this)->name();
 }
 
 QObject *QUmlInformationItemObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlInformationItem *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInformationItem *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlInformationItemObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlInformationItem *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInformationItem *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlInformationItemObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlInformationItem *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [Namespace]
@@ -151,48 +154,48 @@ QString QUmlInformationItemObject::qualifiedName() const
 const QSet<QObject *> QUmlInformationItemObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlInformationItem *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInformationItemObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlInformationItem *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInformationItemObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlInformationItem *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInformationItemObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlInformationItem *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInformationItemObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlInformationItem *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInformationItemObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlInformationItem *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -200,49 +203,49 @@ const QSet<QObject *> QUmlInformationItemObject::packageImports() const
 
 QObject *QUmlInformationItemObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlInformationItem *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInformationItem *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlInformationItemObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlInformationItem *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Type]
 
 QObject *QUmlInformationItemObject::package() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->package())
+    if (!qmodelingelementproperty_cast<QUmlInformationItem *>(this)->package())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->package()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInformationItem *>(this)->package()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlInformationItemObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlInformationItem *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlInformationItemObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlInformationItem *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInformationItemObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlInformationItem *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -251,8 +254,8 @@ const QSet<QObject *> QUmlInformationItemObject::redefinitionContexts() const
 const QSet<QObject *> QUmlInformationItemObject::templateBindings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTemplateBinding *element, qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->templateBindings())
-        set.insert(element->asQObject());
+    foreach (QUmlTemplateBinding *element, qmodelingelementproperty_cast<QUmlInformationItem *>(this)->templateBindings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -261,122 +264,122 @@ const QSet<QObject *> QUmlInformationItemObject::templateBindings() const
 const QSet<QObject *> QUmlInformationItemObject::attributes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->attributes())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlInformationItem *>(this)->attributes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInformationItemObject::collaborationUses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlCollaborationUse *element, qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->collaborationUses())
-        set.insert(element->asQObject());
+    foreach (QUmlCollaborationUse *element, qmodelingelementproperty_cast<QUmlInformationItem *>(this)->collaborationUses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInformationItemObject::features() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->features())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlInformationItem *>(this)->features())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInformationItemObject::generals() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->generals())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlInformationItem *>(this)->generals())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInformationItemObject::generalizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralization *element, qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->generalizations())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralization *element, qmodelingelementproperty_cast<QUmlInformationItem *>(this)->generalizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInformationItemObject::inheritedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->inheritedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlInformationItem *>(this)->inheritedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInformationItemObject::isAbstract() const
 {
-    return qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->isAbstract();
+    return qmodelingelementproperty_cast<QUmlInformationItem *>(this)->isAbstract();
 }
 
 bool QUmlInformationItemObject::isFinalSpecialization() const
 {
-    return qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->isFinalSpecialization();
+    return qmodelingelementproperty_cast<QUmlInformationItem *>(this)->isFinalSpecialization();
 }
 
 QObject *QUmlInformationItemObject::ownedTemplateSignature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->ownedTemplateSignature())
+    if (!qmodelingelementproperty_cast<QUmlInformationItem *>(this)->ownedTemplateSignature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->ownedTemplateSignature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInformationItem *>(this)->ownedTemplateSignature()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlInformationItemObject::ownedUseCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->ownedUseCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlInformationItem *>(this)->ownedUseCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInformationItemObject::powertypeExtents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralizationSet *element, qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->powertypeExtents())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralizationSet *element, qmodelingelementproperty_cast<QUmlInformationItem *>(this)->powertypeExtents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInformationItemObject::redefinedClassifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->redefinedClassifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlInformationItem *>(this)->redefinedClassifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlInformationItemObject::representation() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->representation())
+    if (!qmodelingelementproperty_cast<QUmlInformationItem *>(this)->representation())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->representation()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInformationItem *>(this)->representation()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlInformationItemObject::substitutions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlSubstitution *element, qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->substitutions())
-        set.insert(element->asQObject());
+    foreach (QUmlSubstitution *element, qmodelingelementproperty_cast<QUmlInformationItem *>(this)->substitutions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlInformationItemObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlInformationItem *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInformationItem *>(this)->templateParameter()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlInformationItemObject::useCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->useCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlInformationItem *>(this)->useCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -385,8 +388,8 @@ const QSet<QObject *> QUmlInformationItemObject::useCases() const
 const QSet<QObject *> QUmlInformationItemObject::represented() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->represented())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlInformationItem *>(this)->represented())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -395,14 +398,14 @@ const QSet<QObject *> QUmlInformationItemObject::represented() const
 QSet<QObject *> QUmlInformationItemObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInformationItem *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInformationItemObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlInformationItem *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -410,27 +413,27 @@ bool QUmlInformationItemObject::mustBeOwned() const
 QList<QObject *> QUmlInformationItemObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlInformationItem *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlInformationItemObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlInformationItem *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInformationItemObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlInformationItem *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlInformationItemObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlInformationItem *>(this)->separator();
 }
 
 // OPERATIONS [Namespace]
@@ -439,44 +442,44 @@ QSet<QObject *> QUmlInformationItemObject::excludeCollisions(QSet<QObject *> imp
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlInformationItem *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlInformationItemObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlInformationItem *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlInformationItemObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlInformationItem *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInformationItemObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlInformationItem *>(this)->membersAreDistinguishable();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlInformationItemObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlInformationItem *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlInformationItemObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlInformationItem *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [Type]
@@ -484,12 +487,12 @@ bool QUmlInformationItemObject::isTemplateParameter() const
 
 bool QUmlInformationItemObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlInformationItem *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlInformationItemObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlInformationItem *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [TemplateableElement]
@@ -497,8 +500,8 @@ bool QUmlInformationItemObject::isRedefinitionContextValid(QObject *redefined) c
 QSet<QObject *> QUmlInformationItemObject::parameterableElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterableElement *element, qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->parameterableElements())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterableElement *element, qmodelingelementproperty_cast<QUmlInformationItem *>(this)->parameterableElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -507,63 +510,63 @@ QSet<QObject *> QUmlInformationItemObject::parameterableElements() const
 QSet<QObject *> QUmlInformationItemObject::allFeatures() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->allFeatures())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlInformationItem *>(this)->allFeatures())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlInformationItemObject::allParents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->allParents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlInformationItem *>(this)->allParents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInformationItemObject::conformsTo(QObject *other) const
 {
-    return qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->conformsTo(qmodelingobjectproperty_cast<QUmlClassifier *>(other));
+    return qmodelingelementproperty_cast<QUmlInformationItem *>(this)->conformsTo(qmodelingelementproperty_cast<QUmlClassifier *>(other));
 }
 
 bool QUmlInformationItemObject::hasVisibilityOf(QObject *n) const
 {
-    return qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->hasVisibilityOf(qmodelingobjectproperty_cast<QUmlNamedElement *>(n));
+    return qmodelingelementproperty_cast<QUmlInformationItem *>(this)->hasVisibilityOf(qmodelingelementproperty_cast<QUmlNamedElement *>(n));
 }
 
 QSet<QObject *> QUmlInformationItemObject::inherit(QSet<QObject *> inhs) const
 {
     QSet<QUmlNamedElement *> inhsConverted;
     foreach (QObject *object, inhs)
-        inhsConverted.insert(qmodelingobjectproperty_cast<QUmlNamedElement *>(object));
+        inhsConverted.insert(qmodelingelementproperty_cast<QUmlNamedElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->inherit(inhsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlInformationItem *>(this)->inherit(inhsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlInformationItemObject::inheritableMembers(QObject *c) const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->inheritableMembers(qmodelingobjectproperty_cast<QUmlClassifier *>(c)))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlInformationItem *>(this)->inheritableMembers(qmodelingelementproperty_cast<QUmlClassifier *>(c)))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInformationItemObject::isTemplate() const
 {
-    return qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->isTemplate();
+    return qmodelingelementproperty_cast<QUmlInformationItem *>(this)->isTemplate();
 }
 
 bool QUmlInformationItemObject::maySpecializeType(QObject *c) const
 {
-    return qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->maySpecializeType(qmodelingobjectproperty_cast<QUmlClassifier *>(c));
+    return qmodelingelementproperty_cast<QUmlInformationItem *>(this)->maySpecializeType(qmodelingelementproperty_cast<QUmlClassifier *>(c));
 }
 
 QSet<QObject *> QUmlInformationItemObject::parents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->parents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlInformationItem *>(this)->parents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -571,348 +574,433 @@ QSet<QObject *> QUmlInformationItemObject::parents() const
 
 void QUmlInformationItemObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlInformationItemObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlInformationItemObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlInformationItemObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlInformationItemObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlInformationItemObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlInformationItemObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlInformationItemObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->setName(name);
 }
 
 void QUmlInformationItemObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlInformationItemObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlInformationItemObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlInformationItemObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlInformationItemObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlInformationItemObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlInformationItemObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlInformationItemObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlInformationItemObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlInformationItemObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlInformationItemObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlInformationItemObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlInformationItemObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlInformationItemObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlInformationItemObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlInformationItemObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlInformationItemObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->setVisibility(visibility);
 }
 
 void QUmlInformationItemObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Type]
 
 void QUmlInformationItemObject::setPackage(QObject *package)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->setPackage(qmodelingobjectproperty_cast<QUmlPackage *>(package));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->setPackage(qmodelingelementproperty_cast<QUmlPackage *>(package));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlInformationItemObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlInformationItemObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlInformationItemObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlInformationItemObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlInformationItemObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlInformationItemObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateableElement]
 
 void QUmlInformationItemObject::addTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->addTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->addTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 void QUmlInformationItemObject::removeTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->removeTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->removeTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Classifier]
 
 void QUmlInformationItemObject::addAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->addAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->addAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlInformationItemObject::removeAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->removeAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->removeAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlInformationItemObject::addCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->addCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->addCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlInformationItemObject::removeCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->removeCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->removeCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlInformationItemObject::addFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->addFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->addFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlInformationItemObject::removeFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->removeFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->removeFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlInformationItemObject::addGeneral(QObject *general)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->addGeneral(qmodelingobjectproperty_cast<QUmlClassifier *>(general));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->addGeneral(qmodelingelementproperty_cast<QUmlClassifier *>(general));
 }
 
 void QUmlInformationItemObject::removeGeneral(QObject *general)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->removeGeneral(qmodelingobjectproperty_cast<QUmlClassifier *>(general));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->removeGeneral(qmodelingelementproperty_cast<QUmlClassifier *>(general));
 }
 
 void QUmlInformationItemObject::addGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->addGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->addGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlInformationItemObject::removeGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->removeGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->removeGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlInformationItemObject::addInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->addInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->addInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlInformationItemObject::removeInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->removeInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->removeInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlInformationItemObject::setAbstract(bool isAbstract)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->setAbstract(isAbstract);
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->setAbstract(isAbstract);
 }
 
 void QUmlInformationItemObject::unsetAbstract()
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("abstract"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
 void QUmlInformationItemObject::setFinalSpecialization(bool isFinalSpecialization)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->setFinalSpecialization(isFinalSpecialization);
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->setFinalSpecialization(isFinalSpecialization);
 }
 
 void QUmlInformationItemObject::unsetFinalSpecialization()
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("finalSpecialization"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
 void QUmlInformationItemObject::setOwnedTemplateSignature(QObject *ownedTemplateSignature)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->setOwnedTemplateSignature(qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->setOwnedTemplateSignature(qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
 }
 
 void QUmlInformationItemObject::addOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->addOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->addOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlInformationItemObject::removeOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->removeOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->removeOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlInformationItemObject::addPowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->addPowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->addPowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlInformationItemObject::removePowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->removePowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->removePowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlInformationItemObject::addRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->addRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->addRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlInformationItemObject::removeRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->removeRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->removeRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlInformationItemObject::setRepresentation(QObject *representation)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->setRepresentation(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(representation));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->setRepresentation(qmodelingelementproperty_cast<QUmlCollaborationUse *>(representation));
 }
 
 void QUmlInformationItemObject::addSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->addSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->addSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlInformationItemObject::removeSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->removeSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->removeSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlInformationItemObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
 }
 
 void QUmlInformationItemObject::addUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->addUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->addUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 void QUmlInformationItemObject::removeUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->removeUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->removeUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [InformationItem]
 
 void QUmlInformationItemObject::addRepresented(QObject *represented)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->addRepresented(qmodelingobjectproperty_cast<QUmlClassifier *>(represented));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->addRepresented(qmodelingelementproperty_cast<QUmlClassifier *>(represented));
 }
 
 void QUmlInformationItemObject::removeRepresented(QObject *represented)
 {
-    qmodelingobjectproperty_cast<QUmlInformationItem *>(this)->removeRepresented(qmodelingobjectproperty_cast<QUmlClassifier *>(represented));
+    qmodelingelementproperty_cast<QUmlInformationItem *>(this)->removeRepresented(qmodelingelementproperty_cast<QUmlClassifier *>(represented));
+}
+
+
+void QUmlInformationItemObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlType");
+    d->groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generals"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
+
+    d->propertyGroups << QStringLiteral("QUmlInformationItem");
+    d->groupProperties.insert(QStringLiteral("QUmlInformationItem"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("represented"))));
+}
+
+void QUmlInformationItemObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationItem, represented, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationItem, represented, PropertyClassRole, QStringLiteral("QUmlInformationItem"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationItem, represented, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationItem, represented, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationItem, represented, DocumentationRole, QStringLiteral("Determines the classifiers that will specify the structure and nature of the information. An information item represents all its represented classifiers."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationItem, represented, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationItem, represented, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInformationItem, represented, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlinformationitemobject_p.h b/src/uml/qobjects/qumlinformationitemobject_p.h
index d03ebd1c..aa7b9c3d 100644
--- a/src/uml/qobjects/qumlinformationitemobject_p.h
+++ b/src/uml/qobjects/qumlinformationitemobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlInformationItem;
-class Q_UML_EXPORT QUmlInformationItemObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlInformationItemObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlInformationItemObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -117,7 +120,7 @@ class Q_UML_EXPORT QUmlInformationItemObject : public QObject
     Q_PROPERTY(QSet<QObject *> represented READ represented)
 
 public:
-    Q_INVOKABLE explicit QUmlInformationItemObject(QUmlInformationItem *qModelingObject);
+    Q_INVOKABLE explicit QUmlInformationItemObject(QUmlInformationItem *qModelingElement);
     virtual ~QUmlInformationItemObject();
 
     // Owned attributes [Element]
@@ -305,6 +308,10 @@ public Q_SLOTS:
     // Slots for owned attributes [InformationItem]
     void addRepresented(QObject *represented);
     void removeRepresented(QObject *represented);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlinitialnodeobject.cpp b/src/uml/qobjects/qumlinitialnodeobject.cpp
index 8ecc3bca..a1364a5b 100644
--- a/src/uml/qobjects/qumlinitialnodeobject.cpp
+++ b/src/uml/qobjects/qumlinitialnodeobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlinitialnodeobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlInitialNode>
 #include <QtUml/QUmlActivity>
@@ -60,16 +61,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlInitialNodeObject::QUmlInitialNodeObject(QUmlInitialNode *qModelingObject)
+QUmlInitialNodeObject::QUmlInitialNodeObject(QUmlInitialNode *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlInitialNodeObject::~QUmlInitialNodeObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlInitialNode *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -78,25 +81,25 @@ QUmlInitialNodeObject::~QUmlInitialNodeObject()
 const QSet<QObject *> QUmlInitialNodeObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlInitialNode *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInitialNodeObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInitialNode *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlInitialNodeObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlInitialNode *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInitialNode *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -104,62 +107,62 @@ QObject *QUmlInitialNodeObject::owner() const
 const QSet<QObject *> QUmlInitialNodeObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlInitialNode *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlInitialNodeObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlInitialNode *>(this)->name();
 }
 
 QObject *QUmlInitialNodeObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlInitialNode *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInitialNode *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlInitialNodeObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlInitialNode *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInitialNode *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlInitialNodeObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlInitialNode *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlInitialNodeObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlInitialNode *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlInitialNodeObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlInitialNode *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlInitialNodeObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlInitialNode *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInitialNodeObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlInitialNode *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -167,65 +170,65 @@ const QSet<QObject *> QUmlInitialNodeObject::redefinitionContexts() const
 
 QObject *QUmlInitialNodeObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlInitialNode *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInitialNode *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlInitialNodeObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlInitialNode *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInitialNodeObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlInitialNode *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInitialNodeObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlInitialNode *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlInitialNodeObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlInitialNode *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInitialNode *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlInitialNodeObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlInitialNode *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInitialNodeObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlInitialNode *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInitialNodeObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlInitialNode *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -234,14 +237,14 @@ const QSet<QObject *> QUmlInitialNodeObject::redefinedNodes() const
 QSet<QObject *> QUmlInitialNodeObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInitialNode *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInitialNodeObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlInitialNode *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -249,207 +252,254 @@ bool QUmlInitialNodeObject::mustBeOwned() const
 QList<QObject *> QUmlInitialNodeObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlInitialNode *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlInitialNodeObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlInitialNode *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInitialNodeObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlInitialNode *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlInitialNodeObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlInitialNode *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlInitialNodeObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlInitialNode *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlInitialNodeObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlInitialNode *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlInitialNodeObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlInitialNode *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlInitialNodeObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlInitialNode *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlInitialNodeObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlInitialNode *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlInitialNodeObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlInitialNode *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlInitialNodeObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlInitialNode *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlInitialNodeObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlInitialNode *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlInitialNodeObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlInitialNode *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlInitialNodeObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlInitialNode *>(this)->setName(name);
 }
 
 void QUmlInitialNodeObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlInitialNode *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlInitialNodeObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlInitialNode *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlInitialNodeObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlInitialNode *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlInitialNodeObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlInitialNode *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlInitialNodeObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlInitialNode *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlInitialNodeObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlInitialNodeObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlInitialNode *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlInitialNodeObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlInitialNode *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlInitialNodeObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlInitialNode *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlInitialNodeObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlInitialNode *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlInitialNodeObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlInitialNode *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlInitialNodeObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlInitialNode *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlInitialNodeObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlInitialNode *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlInitialNodeObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlInitialNode *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlInitialNodeObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlInitialNode *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlInitialNodeObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlInitialNode *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlInitialNodeObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlInitialNode *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlInitialNodeObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlInitialNode *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlInitialNodeObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlInitialNode *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlInitialNodeObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlInitialNode *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlInitialNodeObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlInitialNode *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlInitialNodeObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlInitialNode *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlInitialNodeObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlInitialNode *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlInitialNodeObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlInitialNode *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlInitialNode *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
+}
+
+
+void QUmlInitialNodeObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlControlNode");
+
+    d->propertyGroups << QStringLiteral("QUmlInitialNode");
+}
+
+void QUmlInitialNodeObject::setPropertyData()
+{
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlinitialnodeobject_p.h b/src/uml/qobjects/qumlinitialnodeobject_p.h
index 3b2a20c2..216be392 100644
--- a/src/uml/qobjects/qumlinitialnodeobject_p.h
+++ b/src/uml/qobjects/qumlinitialnodeobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlInitialNode;
-class Q_UML_EXPORT QUmlInitialNodeObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlInitialNodeObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlInitialNodeObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -87,7 +90,7 @@ class Q_UML_EXPORT QUmlInitialNodeObject : public QObject
     Q_PROPERTY(QSet<QObject *> redefinedNodes READ redefinedNodes)
 
 public:
-    Q_INVOKABLE explicit QUmlInitialNodeObject(QUmlInitialNode *qModelingObject);
+    Q_INVOKABLE explicit QUmlInitialNodeObject(QUmlInitialNode *qModelingElement);
     virtual ~QUmlInitialNodeObject();
 
     // Owned attributes [Element]
@@ -173,6 +176,10 @@ public Q_SLOTS:
     void removeOutgoing(QObject *outgoing);
     void addRedefinedNode(QObject *redefinedNode);
     void removeRedefinedNode(QObject *redefinedNode);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlinputpinobject.cpp b/src/uml/qobjects/qumlinputpinobject.cpp
index 5d62ccba..c676105e 100644
--- a/src/uml/qobjects/qumlinputpinobject.cpp
+++ b/src/uml/qobjects/qumlinputpinobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlinputpinobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlInputPin>
 #include <QtUml/QUmlActivity>
@@ -65,16 +66,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlInputPinObject::QUmlInputPinObject(QUmlInputPin *qModelingObject)
+QUmlInputPinObject::QUmlInputPinObject(QUmlInputPin *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlInputPinObject::~QUmlInputPinObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlInputPin *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlInputPin *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -83,63 +86,63 @@ QUmlInputPinObject::~QUmlInputPinObject()
 const QSet<QObject *> QUmlInputPinObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlInputPin *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlInputPin *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInputPinObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInputPin *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInputPin *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlInputPinObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInputPin *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlInputPin *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInputPin *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInputPin *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [MultiplicityElement]
 
 bool QUmlInputPinObject::isOrdered() const
 {
-    return qmodelingobjectproperty_cast<QUmlInputPin *>(this)->isOrdered();
+    return qmodelingelementproperty_cast<QUmlInputPin *>(this)->isOrdered();
 }
 
 bool QUmlInputPinObject::isUnique() const
 {
-    return qmodelingobjectproperty_cast<QUmlInputPin *>(this)->isUnique();
+    return qmodelingelementproperty_cast<QUmlInputPin *>(this)->isUnique();
 }
 
 int QUmlInputPinObject::lower() const
 {
-    return qmodelingobjectproperty_cast<QUmlInputPin *>(this)->lower();
+    return qmodelingelementproperty_cast<QUmlInputPin *>(this)->lower();
 }
 
 QObject *QUmlInputPinObject::lowerValue() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInputPin *>(this)->lowerValue())
+    if (!qmodelingelementproperty_cast<QUmlInputPin *>(this)->lowerValue())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInputPin *>(this)->lowerValue()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInputPin *>(this)->lowerValue()->asQModelingObject();
 }
 
 int QUmlInputPinObject::upper() const
 {
-    return qmodelingobjectproperty_cast<QUmlInputPin *>(this)->upper();
+    return qmodelingelementproperty_cast<QUmlInputPin *>(this)->upper();
 }
 
 QObject *QUmlInputPinObject::upperValue() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInputPin *>(this)->upperValue())
+    if (!qmodelingelementproperty_cast<QUmlInputPin *>(this)->upperValue())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInputPin *>(this)->upperValue()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInputPin *>(this)->upperValue()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -147,62 +150,62 @@ QObject *QUmlInputPinObject::upperValue() const
 const QSet<QObject *> QUmlInputPinObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlInputPin *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlInputPin *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlInputPinObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlInputPin *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlInputPin *>(this)->name();
 }
 
 QObject *QUmlInputPinObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInputPin *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlInputPin *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInputPin *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInputPin *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlInputPinObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInputPin *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlInputPin *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInputPin *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInputPin *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlInputPinObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlInputPin *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlInputPin *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlInputPinObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlInputPin *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlInputPin *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlInputPinObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlInputPin *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlInputPin *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlInputPinObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlInputPin *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlInputPin *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInputPinObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlInputPin *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlInputPin *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -210,65 +213,65 @@ const QSet<QObject *> QUmlInputPinObject::redefinitionContexts() const
 
 QObject *QUmlInputPinObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInputPin *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlInputPin *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInputPin *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInputPin *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlInputPinObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlInputPin *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlInputPin *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInputPinObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlInputPin *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlInputPin *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInputPinObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlInputPin *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlInputPin *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlInputPinObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInputPin *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlInputPin *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInputPin *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInputPin *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlInputPinObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlInputPin *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlInputPin *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInputPinObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlInputPin *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlInputPin *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInputPinObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlInputPin *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlInputPin *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -276,10 +279,10 @@ const QSet<QObject *> QUmlInputPinObject::redefinedNodes() const
 
 QObject *QUmlInputPinObject::type() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInputPin *>(this)->type())
+    if (!qmodelingelementproperty_cast<QUmlInputPin *>(this)->type())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInputPin *>(this)->type()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInputPin *>(this)->type()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ObjectNode]
@@ -287,42 +290,42 @@ QObject *QUmlInputPinObject::type() const
 const QSet<QObject *> QUmlInputPinObject::inStates() const
 {
     QSet<QObject *> set;
-    foreach (QUmlState *element, qmodelingobjectproperty_cast<QUmlInputPin *>(this)->inStates())
-        set.insert(element->asQObject());
+    foreach (QUmlState *element, qmodelingelementproperty_cast<QUmlInputPin *>(this)->inStates())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInputPinObject::isControlType() const
 {
-    return qmodelingobjectproperty_cast<QUmlInputPin *>(this)->isControlType();
+    return qmodelingelementproperty_cast<QUmlInputPin *>(this)->isControlType();
 }
 
 QtUml::ObjectNodeOrderingKind QUmlInputPinObject::ordering() const
 {
-    return qmodelingobjectproperty_cast<QUmlInputPin *>(this)->ordering();
+    return qmodelingelementproperty_cast<QUmlInputPin *>(this)->ordering();
 }
 
 QObject *QUmlInputPinObject::selection() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInputPin *>(this)->selection())
+    if (!qmodelingelementproperty_cast<QUmlInputPin *>(this)->selection())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInputPin *>(this)->selection()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInputPin *>(this)->selection()->asQModelingObject();
 }
 
 QObject *QUmlInputPinObject::upperBound() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInputPin *>(this)->upperBound())
+    if (!qmodelingelementproperty_cast<QUmlInputPin *>(this)->upperBound())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInputPin *>(this)->upperBound()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInputPin *>(this)->upperBound()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [Pin]
 
 bool QUmlInputPinObject::isControl() const
 {
-    return qmodelingobjectproperty_cast<QUmlInputPin *>(this)->isControl();
+    return qmodelingelementproperty_cast<QUmlInputPin *>(this)->isControl();
 }
 
 // OPERATIONS [Element]
@@ -330,51 +333,51 @@ bool QUmlInputPinObject::isControl() const
 QSet<QObject *> QUmlInputPinObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInputPin *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInputPin *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInputPinObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlInputPin *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlInputPin *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [MultiplicityElement]
 
 bool QUmlInputPinObject::compatibleWith(QObject *other) const
 {
-    return qmodelingobjectproperty_cast<QUmlInputPin *>(this)->compatibleWith(qmodelingobjectproperty_cast<QUmlMultiplicityElement *>(other));
+    return qmodelingelementproperty_cast<QUmlInputPin *>(this)->compatibleWith(qmodelingelementproperty_cast<QUmlMultiplicityElement *>(other));
 }
 
 bool QUmlInputPinObject::includesCardinality(int C) const
 {
-    return qmodelingobjectproperty_cast<QUmlInputPin *>(this)->includesCardinality(C);
+    return qmodelingelementproperty_cast<QUmlInputPin *>(this)->includesCardinality(C);
 }
 
 bool QUmlInputPinObject::includesMultiplicity(QObject *M) const
 {
-    return qmodelingobjectproperty_cast<QUmlInputPin *>(this)->includesMultiplicity(qmodelingobjectproperty_cast<QUmlMultiplicityElement *>(M));
+    return qmodelingelementproperty_cast<QUmlInputPin *>(this)->includesMultiplicity(qmodelingelementproperty_cast<QUmlMultiplicityElement *>(M));
 }
 
 bool QUmlInputPinObject::is(int lowerbound, int upperbound) const
 {
-    return qmodelingobjectproperty_cast<QUmlInputPin *>(this)->is(lowerbound, upperbound);
+    return qmodelingelementproperty_cast<QUmlInputPin *>(this)->is(lowerbound, upperbound);
 }
 
 bool QUmlInputPinObject::isMultivalued() const
 {
-    return qmodelingobjectproperty_cast<QUmlInputPin *>(this)->isMultivalued();
+    return qmodelingelementproperty_cast<QUmlInputPin *>(this)->isMultivalued();
 }
 
 int QUmlInputPinObject::lowerBound() const
 {
-    return qmodelingobjectproperty_cast<QUmlInputPin *>(this)->lowerBound();
+    return qmodelingelementproperty_cast<QUmlInputPin *>(this)->lowerBound();
 }
 
 //int QUmlInputPinObject::upperBound() const
 //{
-//    return qmodelingobjectproperty_cast<QUmlInputPin *>(this)->upperBound();
+//    return qmodelingelementproperty_cast<QUmlInputPin *>(this)->upperBound();
 //}
 
 // OPERATIONS [NamedElement]
@@ -382,320 +385,393 @@ int QUmlInputPinObject::lowerBound() const
 QList<QObject *> QUmlInputPinObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlInputPin *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlInputPin *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlInputPinObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlInputPin *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlInputPin *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInputPinObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlInputPin *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlInputPin *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlInputPinObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlInputPin *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlInputPin *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlInputPinObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlInputPin *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlInputPin *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlInputPinObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlInputPin *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlInputPin *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlInputPinObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlInputPinObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlInputPinObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlInputPinObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlInputPinObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [MultiplicityElement]
 
 void QUmlInputPinObject::setOrdered(bool isOrdered)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->setOrdered(isOrdered);
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->setOrdered(isOrdered);
 }
 
 void QUmlInputPinObject::unsetOrdered()
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("ordered"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("ordered"));
 }
 
 void QUmlInputPinObject::setUnique(bool isUnique)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->setUnique(isUnique);
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->setUnique(isUnique);
 }
 
 void QUmlInputPinObject::unsetUnique()
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("unique"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("unique"));
 }
 
 void QUmlInputPinObject::setLower(int lower)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->setLower(lower);
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->setLower(lower);
 }
 
 void QUmlInputPinObject::unsetLower()
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("lower"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("lower"));
 }
 
 void QUmlInputPinObject::setLowerValue(QObject *lowerValue)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->setLowerValue(qmodelingobjectproperty_cast<QUmlValueSpecification *>(lowerValue));
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->setLowerValue(qmodelingelementproperty_cast<QUmlValueSpecification *>(lowerValue));
 }
 
 void QUmlInputPinObject::setUpper(int upper)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->setUpper(upper);
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->setUpper(upper);
 }
 
 void QUmlInputPinObject::unsetUpper()
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("upper"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("upper"));
 }
 
 void QUmlInputPinObject::setUpperValue(QObject *upperValue)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->setUpperValue(qmodelingobjectproperty_cast<QUmlValueSpecification *>(upperValue));
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->setUpperValue(qmodelingelementproperty_cast<QUmlValueSpecification *>(upperValue));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlInputPinObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlInputPinObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlInputPinObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->setName(name);
 }
 
 void QUmlInputPinObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlInputPinObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlInputPinObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlInputPinObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlInputPinObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlInputPinObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlInputPinObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlInputPinObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlInputPinObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlInputPinObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlInputPinObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlInputPinObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlInputPinObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlInputPinObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlInputPinObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlInputPinObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlInputPinObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlInputPinObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlInputPinObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlInputPinObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlInputPinObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlInputPinObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlInputPinObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlInputPinObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TypedElement]
 
 void QUmlInputPinObject::setType(QObject *type)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->setType(qmodelingobjectproperty_cast<QUmlType *>(type));
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->setType(qmodelingelementproperty_cast<QUmlType *>(type));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ObjectNode]
 
 void QUmlInputPinObject::addInState(QObject *inState)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->addInState(qmodelingobjectproperty_cast<QUmlState *>(inState));
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->addInState(qmodelingelementproperty_cast<QUmlState *>(inState));
 }
 
 void QUmlInputPinObject::removeInState(QObject *inState)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->removeInState(qmodelingobjectproperty_cast<QUmlState *>(inState));
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->removeInState(qmodelingelementproperty_cast<QUmlState *>(inState));
 }
 
 void QUmlInputPinObject::setControlType(bool isControlType)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->setControlType(isControlType);
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->setControlType(isControlType);
 }
 
 void QUmlInputPinObject::unsetControlType()
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("controlType"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("controlType"));
 }
 
 void QUmlInputPinObject::setOrdering(QtUml::ObjectNodeOrderingKind ordering)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->setOrdering(ordering);
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->setOrdering(ordering);
 }
 
 void QUmlInputPinObject::unsetOrdering()
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("ordering"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("ordering"));
 }
 
 void QUmlInputPinObject::setSelection(QObject *selection)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->setSelection(qmodelingobjectproperty_cast<QUmlBehavior *>(selection));
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->setSelection(qmodelingelementproperty_cast<QUmlBehavior *>(selection));
 }
 
 void QUmlInputPinObject::setUpperBound(QObject *upperBound)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->setUpperBound(qmodelingobjectproperty_cast<QUmlValueSpecification *>(upperBound));
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->setUpperBound(qmodelingelementproperty_cast<QUmlValueSpecification *>(upperBound));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Pin]
 
 void QUmlInputPinObject::setControl(bool isControl)
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->setControl(isControl);
+    qmodelingelementproperty_cast<QUmlInputPin *>(this)->setControl(isControl);
 }
 
 void QUmlInputPinObject::unsetControl()
 {
-    qmodelingobjectproperty_cast<QUmlInputPin *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("control"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("control"));
+}
+
+
+void QUmlInputPinObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlMultiplicityElement");
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isOrdered"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isUnique"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lower"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lowerValue"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upper"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperValue"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTypedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
+
+    d->propertyGroups << QStringLiteral("QUmlObjectNode");
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStates"))));
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isControlType"))));
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ordering"))));
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("selection"))));
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperBound"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPin");
+    d->groupProperties.insert(QStringLiteral("QUmlPin"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isControl"))));
+
+    d->propertyGroups << QStringLiteral("QUmlInputPin");
+}
+
+void QUmlInputPinObject::setPropertyData()
+{
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlinputpinobject_p.h b/src/uml/qobjects/qumlinputpinobject_p.h
index 4edc6422..f7eeea9f 100644
--- a/src/uml/qobjects/qumlinputpinobject_p.h
+++ b/src/uml/qobjects/qumlinputpinobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlInputPin;
-class Q_UML_EXPORT QUmlInputPinObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlInputPinObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlInputPinObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -108,7 +111,7 @@ class Q_UML_EXPORT QUmlInputPinObject : public QObject
     Q_PROPERTY(bool isControl READ isControl WRITE setControl RESET unsetControl)
 
 public:
-    Q_INVOKABLE explicit QUmlInputPinObject(QUmlInputPin *qModelingObject);
+    Q_INVOKABLE explicit QUmlInputPinObject(QUmlInputPin *qModelingElement);
     virtual ~QUmlInputPinObject();
 
     // Owned attributes [Element]
@@ -253,6 +256,10 @@ public Q_SLOTS:
     // Slots for owned attributes [Pin]
     void setControl(bool isControl);
     void unsetControl();
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlinstancespecificationobject.cpp b/src/uml/qobjects/qumlinstancespecificationobject.cpp
index 67b607a5..ca628224 100644
--- a/src/uml/qobjects/qumlinstancespecificationobject.cpp
+++ b/src/uml/qobjects/qumlinstancespecificationobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlinstancespecificationobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlInstanceSpecification>
 #include <QtUml/QUmlClassifier>
@@ -58,16 +59,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlInstanceSpecificationObject::QUmlInstanceSpecificationObject(QUmlInstanceSpecification *qModelingObject)
+QUmlInstanceSpecificationObject::QUmlInstanceSpecificationObject(QUmlInstanceSpecification *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlInstanceSpecificationObject::~QUmlInstanceSpecificationObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -76,25 +79,25 @@ QUmlInstanceSpecificationObject::~QUmlInstanceSpecificationObject()
 const QSet<QObject *> QUmlInstanceSpecificationObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInstanceSpecificationObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlInstanceSpecificationObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -102,60 +105,60 @@ QObject *QUmlInstanceSpecificationObject::owner() const
 const QSet<QObject *> QUmlInstanceSpecificationObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlInstanceSpecificationObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->name();
 }
 
 QObject *QUmlInstanceSpecificationObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlInstanceSpecificationObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlInstanceSpecificationObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlInstanceSpecificationObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlInstanceSpecificationObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlInstanceSpecificationObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [DeploymentTarget]
@@ -163,16 +166,16 @@ QtUml::VisibilityKind QUmlInstanceSpecificationObject::visibility() const
 const QSet<QObject *> QUmlInstanceSpecificationObject::deployedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->deployedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->deployedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInstanceSpecificationObject::deployments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDeployment *element, qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->deployments())
-        set.insert(element->asQObject());
+    foreach (QUmlDeployment *element, qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->deployments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -181,25 +184,25 @@ const QSet<QObject *> QUmlInstanceSpecificationObject::deployments() const
 const QSet<QObject *> QUmlInstanceSpecificationObject::classifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->classifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->classifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInstanceSpecificationObject::slots_() const
 {
     QSet<QObject *> set;
-    foreach (QUmlSlot *element, qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->slots_())
-        set.insert(element->asQObject());
+    foreach (QUmlSlot *element, qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->slots_())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlInstanceSpecificationObject::specification() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->specification())
+    if (!qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->specification())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->specification()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->specification()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -207,14 +210,14 @@ QObject *QUmlInstanceSpecificationObject::specification() const
 QSet<QObject *> QUmlInstanceSpecificationObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInstanceSpecificationObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -222,170 +225,242 @@ bool QUmlInstanceSpecificationObject::mustBeOwned() const
 QList<QObject *> QUmlInstanceSpecificationObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlInstanceSpecificationObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInstanceSpecificationObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlInstanceSpecificationObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->separator();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlInstanceSpecificationObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlInstanceSpecificationObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->isTemplateParameter();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlInstanceSpecificationObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlInstanceSpecificationObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlInstanceSpecificationObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlInstanceSpecificationObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlInstanceSpecificationObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlInstanceSpecificationObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlInstanceSpecificationObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlInstanceSpecificationObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->setName(name);
 }
 
 void QUmlInstanceSpecificationObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlInstanceSpecificationObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlInstanceSpecificationObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlInstanceSpecificationObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlInstanceSpecificationObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlInstanceSpecificationObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->setVisibility(visibility);
 }
 
 void QUmlInstanceSpecificationObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [DeploymentTarget]
 
 void QUmlInstanceSpecificationObject::addDeployedElement(QObject *deployedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->addDeployedElement(qmodelingobjectproperty_cast<QUmlPackageableElement *>(deployedElement));
+    qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->addDeployedElement(qmodelingelementproperty_cast<QUmlPackageableElement *>(deployedElement));
 }
 
 void QUmlInstanceSpecificationObject::removeDeployedElement(QObject *deployedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->removeDeployedElement(qmodelingobjectproperty_cast<QUmlPackageableElement *>(deployedElement));
+    qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->removeDeployedElement(qmodelingelementproperty_cast<QUmlPackageableElement *>(deployedElement));
 }
 
 void QUmlInstanceSpecificationObject::addDeployment(QObject *deployment)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->addDeployment(qmodelingobjectproperty_cast<QUmlDeployment *>(deployment));
+    qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->addDeployment(qmodelingelementproperty_cast<QUmlDeployment *>(deployment));
 }
 
 void QUmlInstanceSpecificationObject::removeDeployment(QObject *deployment)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->removeDeployment(qmodelingobjectproperty_cast<QUmlDeployment *>(deployment));
+    qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->removeDeployment(qmodelingelementproperty_cast<QUmlDeployment *>(deployment));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [InstanceSpecification]
 
 void QUmlInstanceSpecificationObject::addClassifier(QObject *classifier)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->addClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(classifier));
+    qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->addClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(classifier));
 }
 
 void QUmlInstanceSpecificationObject::removeClassifier(QObject *classifier)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->removeClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(classifier));
+    qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->removeClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(classifier));
 }
 
 void QUmlInstanceSpecificationObject::addSlot(QObject *slot_)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->addSlot(qmodelingobjectproperty_cast<QUmlSlot *>(slot_));
+    qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->addSlot(qmodelingelementproperty_cast<QUmlSlot *>(slot_));
 }
 
 void QUmlInstanceSpecificationObject::removeSlot(QObject *slot_)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->removeSlot(qmodelingobjectproperty_cast<QUmlSlot *>(slot_));
+    qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->removeSlot(qmodelingelementproperty_cast<QUmlSlot *>(slot_));
 }
 
 void QUmlInstanceSpecificationObject::setSpecification(QObject *specification)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(this)->setSpecification(qmodelingobjectproperty_cast<QUmlValueSpecification *>(specification));
+    qmodelingelementproperty_cast<QUmlInstanceSpecification *>(this)->setSpecification(qmodelingelementproperty_cast<QUmlValueSpecification *>(specification));
+}
+
+
+void QUmlInstanceSpecificationObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDeployedArtifact");
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDeploymentTarget");
+    d->groupProperties.insert(QStringLiteral("QUmlDeploymentTarget"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deployedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDeploymentTarget"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deployments"))));
+
+    d->propertyGroups << QStringLiteral("QUmlInstanceSpecification");
+    d->groupProperties.insert(QStringLiteral("QUmlInstanceSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInstanceSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("slots_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInstanceSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("specification"))));
+}
+
+void QUmlInstanceSpecificationObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInstanceSpecification, classifiers, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInstanceSpecification, classifiers, PropertyClassRole, QStringLiteral("QUmlInstanceSpecification"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInstanceSpecification, classifiers, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInstanceSpecification, classifiers, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInstanceSpecification, classifiers, DocumentationRole, QStringLiteral("The classifier or classifiers of the represented instance. If multiple classifiers are specified, the instance is classified by all of them."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInstanceSpecification, classifiers, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInstanceSpecification, classifiers, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInstanceSpecification, classifiers, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInstanceSpecification, slots_, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInstanceSpecification, slots_, PropertyClassRole, QStringLiteral("QUmlInstanceSpecification"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInstanceSpecification, slots_, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInstanceSpecification, slots_, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInstanceSpecification, slots_, DocumentationRole, QStringLiteral("A slot giving the value or values of a structural feature of the instance. An instance specification can have one slot per structural feature of its classifiers, including inherited features. It is not necessary to model a slot for each structural feature, in which case the instance specification is a partial description."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInstanceSpecification, slots_, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInstanceSpecification, slots_, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInstanceSpecification, slots_, OppositeEndRole, QStringLiteral("Slot-owningInstance"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInstanceSpecification, specification, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInstanceSpecification, specification, PropertyClassRole, QStringLiteral("QUmlInstanceSpecification"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInstanceSpecification, specification, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInstanceSpecification, specification, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInstanceSpecification, specification, DocumentationRole, QStringLiteral("A specification of how to compute, derive, or construct the instance."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInstanceSpecification, specification, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInstanceSpecification, specification, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInstanceSpecification, specification, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlinstancespecificationobject_p.h b/src/uml/qobjects/qumlinstancespecificationobject_p.h
index 7e1086dc..2d74353a 100644
--- a/src/uml/qobjects/qumlinstancespecificationobject_p.h
+++ b/src/uml/qobjects/qumlinstancespecificationobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlInstanceSpecification;
-class Q_UML_EXPORT QUmlInstanceSpecificationObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlInstanceSpecificationObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlInstanceSpecificationObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -87,7 +90,7 @@ class Q_UML_EXPORT QUmlInstanceSpecificationObject : public QObject
     Q_PROPERTY(QObject * specification READ specification WRITE setSpecification)
 
 public:
-    Q_INVOKABLE explicit QUmlInstanceSpecificationObject(QUmlInstanceSpecification *qModelingObject);
+    Q_INVOKABLE explicit QUmlInstanceSpecificationObject(QUmlInstanceSpecification *qModelingElement);
     virtual ~QUmlInstanceSpecificationObject();
 
     // Owned attributes [Element]
@@ -169,6 +172,10 @@ public Q_SLOTS:
     void addSlot(QObject *slot_);
     void removeSlot(QObject *slot_);
     void setSpecification(QObject *specification = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlinstancevalueobject.cpp b/src/uml/qobjects/qumlinstancevalueobject.cpp
index 9dbf38b6..27650fbf 100644
--- a/src/uml/qobjects/qumlinstancevalueobject.cpp
+++ b/src/uml/qobjects/qumlinstancevalueobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlinstancevalueobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlInstanceValue>
 #include <QtUml/QUmlComment>
@@ -55,16 +56,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlInstanceValueObject::QUmlInstanceValueObject(QUmlInstanceValue *qModelingObject)
+QUmlInstanceValueObject::QUmlInstanceValueObject(QUmlInstanceValue *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlInstanceValueObject::~QUmlInstanceValueObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -73,25 +76,25 @@ QUmlInstanceValueObject::~QUmlInstanceValueObject()
 const QSet<QObject *> QUmlInstanceValueObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInstanceValueObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlInstanceValueObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -99,80 +102,80 @@ QObject *QUmlInstanceValueObject::owner() const
 const QSet<QObject *> QUmlInstanceValueObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlInstanceValueObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->name();
 }
 
 QObject *QUmlInstanceValueObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlInstanceValueObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlInstanceValueObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [TypedElement]
 
 QObject *QUmlInstanceValueObject::type() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->type())
+    if (!qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->type())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->type()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->type()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlInstanceValueObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlInstanceValueObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlInstanceValueObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [InstanceValue]
 
 QObject *QUmlInstanceValueObject::instance() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->instance())
+    if (!qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->instance())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->instance()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->instance()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -180,14 +183,14 @@ QObject *QUmlInstanceValueObject::instance() const
 QSet<QObject *> QUmlInstanceValueObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInstanceValueObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -195,172 +198,223 @@ bool QUmlInstanceValueObject::mustBeOwned() const
 QList<QObject *> QUmlInstanceValueObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlInstanceValueObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInstanceValueObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlInstanceValueObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->separator();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlInstanceValueObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [ValueSpecification]
 
 bool QUmlInstanceValueObject::booleanValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->booleanValue();
+    return qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->booleanValue();
 }
 
 int QUmlInstanceValueObject::integerValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->integerValue();
+    return qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->integerValue();
 }
 
 bool QUmlInstanceValueObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlInstanceValueObject::isComputable() const
 {
-    return qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->isComputable();
+    return qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->isComputable();
 }
 
 bool QUmlInstanceValueObject::isNull() const
 {
-    return qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->isNull();
+    return qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->isNull();
 }
 
 double QUmlInstanceValueObject::realValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->realValue();
+    return qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->realValue();
 }
 
 QString QUmlInstanceValueObject::stringValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->stringValue();
+    return qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->stringValue();
 }
 
 int QUmlInstanceValueObject::unlimitedValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->unlimitedValue();
+    return qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->unlimitedValue();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlInstanceValueObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlInstanceValueObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlInstanceValueObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlInstanceValueObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlInstanceValueObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlInstanceValueObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlInstanceValueObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlInstanceValueObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->setName(name);
 }
 
 void QUmlInstanceValueObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlInstanceValueObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlInstanceValueObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [TypedElement]
 
 void QUmlInstanceValueObject::setType(QObject *type)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->setType(qmodelingobjectproperty_cast<QUmlType *>(type));
+    qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->setType(qmodelingelementproperty_cast<QUmlType *>(type));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlInstanceValueObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlInstanceValueObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlInstanceValueObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->setVisibility(visibility);
 }
 
 void QUmlInstanceValueObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [InstanceValue]
 
 void QUmlInstanceValueObject::setInstance(QObject *instance)
 {
-    qmodelingobjectproperty_cast<QUmlInstanceValue *>(this)->setInstance(qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(instance));
+    qmodelingelementproperty_cast<QUmlInstanceValue *>(this)->setInstance(qmodelingelementproperty_cast<QUmlInstanceSpecification *>(instance));
+}
+
+
+void QUmlInstanceValueObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTypedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlValueSpecification");
+
+    d->propertyGroups << QStringLiteral("QUmlInstanceValue");
+    d->groupProperties.insert(QStringLiteral("QUmlInstanceValue"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("instance"))));
+}
+
+void QUmlInstanceValueObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInstanceValue, instance, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInstanceValue, instance, PropertyClassRole, QStringLiteral("QUmlInstanceValue"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInstanceValue, instance, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInstanceValue, instance, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInstanceValue, instance, DocumentationRole, QStringLiteral("The instance that is the specified value."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInstanceValue, instance, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInstanceValue, instance, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInstanceValue, instance, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlinstancevalueobject_p.h b/src/uml/qobjects/qumlinstancevalueobject_p.h
index 0bbb0999..3fda26b2 100644
--- a/src/uml/qobjects/qumlinstancevalueobject_p.h
+++ b/src/uml/qobjects/qumlinstancevalueobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlInstanceValue;
-class Q_UML_EXPORT QUmlInstanceValueObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlInstanceValueObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlInstanceValueObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -84,7 +87,7 @@ class Q_UML_EXPORT QUmlInstanceValueObject : public QObject
     Q_PROPERTY(QObject * instance READ instance WRITE setInstance)
 
 public:
-    Q_INVOKABLE explicit QUmlInstanceValueObject(QUmlInstanceValue *qModelingObject);
+    Q_INVOKABLE explicit QUmlInstanceValueObject(QUmlInstanceValue *qModelingElement);
     virtual ~QUmlInstanceValueObject();
 
     // Owned attributes [Element]
@@ -165,6 +168,10 @@ public Q_SLOTS:
 
     // Slots for owned attributes [InstanceValue]
     void setInstance(QObject *instance = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlinteractionconstraintobject.cpp b/src/uml/qobjects/qumlinteractionconstraintobject.cpp
index 8a589290..ff724fcd 100644
--- a/src/uml/qobjects/qumlinteractionconstraintobject.cpp
+++ b/src/uml/qobjects/qumlinteractionconstraintobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlinteractionconstraintobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlInteractionConstraint>
 #include <QtUml/QUmlComment>
@@ -54,16 +55,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlInteractionConstraintObject::QUmlInteractionConstraintObject(QUmlInteractionConstraint *qModelingObject)
+QUmlInteractionConstraintObject::QUmlInteractionConstraintObject(QUmlInteractionConstraint *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlInteractionConstraintObject::~QUmlInteractionConstraintObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -72,43 +75,43 @@ QUmlInteractionConstraintObject::~QUmlInteractionConstraintObject()
 const QSet<QObject *> QUmlInteractionConstraintObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInteractionConstraintObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlInteractionConstraintObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlInteractionConstraintObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlInteractionConstraintObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -116,42 +119,42 @@ QObject *QUmlInteractionConstraintObject::templateParameter() const
 const QSet<QObject *> QUmlInteractionConstraintObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlInteractionConstraintObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->name();
 }
 
 QObject *QUmlInteractionConstraintObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlInteractionConstraintObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlInteractionConstraintObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlInteractionConstraintObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Constraint]
@@ -159,43 +162,43 @@ QtUml::VisibilityKind QUmlInteractionConstraintObject::visibility() const
 const QList<QObject *> QUmlInteractionConstraintObject::constrainedElements() const
 {
     QList<QObject *> list;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->constrainedElements())
-        list.append(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->constrainedElements())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 QObject *QUmlInteractionConstraintObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->context()->asQModelingObject();
 }
 
 QObject *QUmlInteractionConstraintObject::specification() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->specification())
+    if (!qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->specification())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->specification()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->specification()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [InteractionConstraint]
 
 QObject *QUmlInteractionConstraintObject::maxint() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->maxint())
+    if (!qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->maxint())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->maxint()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->maxint()->asQModelingObject();
 }
 
 QObject *QUmlInteractionConstraintObject::minint() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->minint())
+    if (!qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->minint())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->minint()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->minint()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -203,26 +206,26 @@ QObject *QUmlInteractionConstraintObject::minint() const
 QSet<QObject *> QUmlInteractionConstraintObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInteractionConstraintObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlInteractionConstraintObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlInteractionConstraintObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [NamedElement]
@@ -230,143 +233,204 @@ bool QUmlInteractionConstraintObject::isTemplateParameter() const
 QList<QObject *> QUmlInteractionConstraintObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlInteractionConstraintObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInteractionConstraintObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlInteractionConstraintObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlInteractionConstraintObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlInteractionConstraintObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlInteractionConstraintObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlInteractionConstraintObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlInteractionConstraintObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlInteractionConstraintObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlInteractionConstraintObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlInteractionConstraintObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlInteractionConstraintObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlInteractionConstraintObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->setName(name);
 }
 
 void QUmlInteractionConstraintObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlInteractionConstraintObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlInteractionConstraintObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlInteractionConstraintObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->setVisibility(visibility);
 }
 
 void QUmlInteractionConstraintObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Constraint]
 
 void QUmlInteractionConstraintObject::addConstrainedElement(QObject *constrainedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->addConstrainedElement(qmodelingobjectproperty_cast<QUmlElement *>(constrainedElement));
+    qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->addConstrainedElement(qmodelingelementproperty_cast<QUmlElement *>(constrainedElement));
 }
 
 void QUmlInteractionConstraintObject::removeConstrainedElement(QObject *constrainedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->removeConstrainedElement(qmodelingobjectproperty_cast<QUmlElement *>(constrainedElement));
+    qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->removeConstrainedElement(qmodelingelementproperty_cast<QUmlElement *>(constrainedElement));
 }
 
 void QUmlInteractionConstraintObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->setContext(qmodelingobjectproperty_cast<QUmlNamespace *>(context));
+    qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->setContext(qmodelingelementproperty_cast<QUmlNamespace *>(context));
 }
 
 void QUmlInteractionConstraintObject::setSpecification(QObject *specification)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->setSpecification(qmodelingobjectproperty_cast<QUmlValueSpecification *>(specification));
+    qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->setSpecification(qmodelingelementproperty_cast<QUmlValueSpecification *>(specification));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [InteractionConstraint]
 
 void QUmlInteractionConstraintObject::setMaxint(QObject *maxint)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->setMaxint(qmodelingobjectproperty_cast<QUmlValueSpecification *>(maxint));
+    qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->setMaxint(qmodelingelementproperty_cast<QUmlValueSpecification *>(maxint));
 }
 
 void QUmlInteractionConstraintObject::setMinint(QObject *minint)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(this)->setMinint(qmodelingobjectproperty_cast<QUmlValueSpecification *>(minint));
+    qmodelingelementproperty_cast<QUmlInteractionConstraint *>(this)->setMinint(qmodelingelementproperty_cast<QUmlValueSpecification *>(minint));
+}
+
+
+void QUmlInteractionConstraintObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlConstraint");
+    d->groupProperties.insert(QStringLiteral("QUmlConstraint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("constrainedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlConstraint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlConstraint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("specification"))));
+
+    d->propertyGroups << QStringLiteral("QUmlInteractionConstraint");
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionConstraint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("maxint"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionConstraint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("minint"))));
+}
+
+void QUmlInteractionConstraintObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionConstraint, maxint, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionConstraint, maxint, PropertyClassRole, QStringLiteral("QUmlInteractionConstraint"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionConstraint, maxint, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionConstraint, maxint, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionConstraint, maxint, DocumentationRole, QStringLiteral("The maximum number of iterations of a loop"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionConstraint, maxint, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionConstraint, maxint, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionConstraint, maxint, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionConstraint, minint, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionConstraint, minint, PropertyClassRole, QStringLiteral("QUmlInteractionConstraint"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionConstraint, minint, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionConstraint, minint, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionConstraint, minint, DocumentationRole, QStringLiteral("The minimum number of iterations of a loop"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionConstraint, minint, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionConstraint, minint, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionConstraint, minint, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlinteractionconstraintobject_p.h b/src/uml/qobjects/qumlinteractionconstraintobject_p.h
index 38844ee8..686e88a0 100644
--- a/src/uml/qobjects/qumlinteractionconstraintobject_p.h
+++ b/src/uml/qobjects/qumlinteractionconstraintobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlInteractionConstraint;
-class Q_UML_EXPORT QUmlInteractionConstraintObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlInteractionConstraintObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlInteractionConstraintObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -87,7 +90,7 @@ class Q_UML_EXPORT QUmlInteractionConstraintObject : public QObject
     Q_PROPERTY(QObject * minint READ minint WRITE setMinint)
 
 public:
-    Q_INVOKABLE explicit QUmlInteractionConstraintObject(QUmlInteractionConstraint *qModelingObject);
+    Q_INVOKABLE explicit QUmlInteractionConstraintObject(QUmlInteractionConstraint *qModelingElement);
     virtual ~QUmlInteractionConstraintObject();
 
     // Owned attributes [Element]
@@ -166,6 +169,10 @@ public Q_SLOTS:
     // Slots for owned attributes [InteractionConstraint]
     void setMaxint(QObject *maxint = 0);
     void setMinint(QObject *minint = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlinteractionobject.cpp b/src/uml/qobjects/qumlinteractionobject.cpp
index a3ed5b17..7559bcba 100644
--- a/src/uml/qobjects/qumlinteractionobject.cpp
+++ b/src/uml/qobjects/qumlinteractionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlinteractionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlInteraction>
 #include <QtUml/QUmlAction>
@@ -91,16 +92,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlInteractionObject::QUmlInteractionObject(QUmlInteraction *qModelingObject)
+QUmlInteractionObject::QUmlInteractionObject(QUmlInteraction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlInteractionObject::~QUmlInteractionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlInteraction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlInteraction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -109,25 +112,25 @@ QUmlInteractionObject::~QUmlInteractionObject()
 const QSet<QObject *> QUmlInteractionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInteractionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlInteractionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInteraction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlInteraction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInteraction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInteraction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -135,35 +138,35 @@ QObject *QUmlInteractionObject::owner() const
 const QSet<QObject *> QUmlInteractionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlInteractionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlInteraction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlInteraction *>(this)->name();
 }
 
 QObject *QUmlInteractionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInteraction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlInteraction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInteraction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInteraction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlInteractionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInteraction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlInteraction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInteraction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInteraction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlInteractionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlInteraction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlInteraction *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [Namespace]
@@ -171,48 +174,48 @@ QString QUmlInteractionObject::qualifiedName() const
 const QSet<QObject *> QUmlInteractionObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInteractionObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInteractionObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInteractionObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInteractionObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInteractionObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -220,49 +223,49 @@ const QSet<QObject *> QUmlInteractionObject::packageImports() const
 
 QObject *QUmlInteractionObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInteraction *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlInteraction *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInteraction *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInteraction *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlInteractionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlInteraction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlInteraction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Type]
 
 QObject *QUmlInteractionObject::package() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInteraction *>(this)->package())
+    if (!qmodelingelementproperty_cast<QUmlInteraction *>(this)->package())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInteraction *>(this)->package()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInteraction *>(this)->package()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlInteractionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlInteraction *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlInteraction *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlInteractionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInteractionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -271,8 +274,8 @@ const QSet<QObject *> QUmlInteractionObject::redefinitionContexts() const
 const QSet<QObject *> QUmlInteractionObject::templateBindings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTemplateBinding *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->templateBindings())
-        set.insert(element->asQObject());
+    foreach (QUmlTemplateBinding *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->templateBindings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -281,109 +284,109 @@ const QSet<QObject *> QUmlInteractionObject::templateBindings() const
 const QSet<QObject *> QUmlInteractionObject::attributes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->attributes())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->attributes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInteractionObject::collaborationUses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlCollaborationUse *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->collaborationUses())
-        set.insert(element->asQObject());
+    foreach (QUmlCollaborationUse *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->collaborationUses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInteractionObject::features() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->features())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->features())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInteractionObject::generalizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralization *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->generalizations())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralization *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->generalizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInteractionObject::inheritedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->inheritedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->inheritedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInteractionObject::isFinalSpecialization() const
 {
-    return qmodelingobjectproperty_cast<QUmlInteraction *>(this)->isFinalSpecialization();
+    return qmodelingelementproperty_cast<QUmlInteraction *>(this)->isFinalSpecialization();
 }
 
 QObject *QUmlInteractionObject::ownedTemplateSignature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInteraction *>(this)->ownedTemplateSignature())
+    if (!qmodelingelementproperty_cast<QUmlInteraction *>(this)->ownedTemplateSignature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInteraction *>(this)->ownedTemplateSignature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInteraction *>(this)->ownedTemplateSignature()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlInteractionObject::ownedUseCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->ownedUseCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->ownedUseCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInteractionObject::powertypeExtents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralizationSet *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->powertypeExtents())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralizationSet *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->powertypeExtents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInteractionObject::redefinedClassifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->redefinedClassifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->redefinedClassifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlInteractionObject::representation() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInteraction *>(this)->representation())
+    if (!qmodelingelementproperty_cast<QUmlInteraction *>(this)->representation())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInteraction *>(this)->representation()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInteraction *>(this)->representation()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlInteractionObject::substitutions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlSubstitution *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->substitutions())
-        set.insert(element->asQObject());
+    foreach (QUmlSubstitution *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->substitutions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlInteractionObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInteraction *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlInteraction *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInteraction *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInteraction *>(this)->templateParameter()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlInteractionObject::useCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->useCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->useCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -392,24 +395,24 @@ const QSet<QObject *> QUmlInteractionObject::useCases() const
 const QSet<QObject *> QUmlInteractionObject::ownedConnectors() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConnector *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->ownedConnectors())
-        set.insert(element->asQObject());
+    foreach (QUmlConnector *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->ownedConnectors())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInteractionObject::parts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->parts())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->parts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInteractionObject::roles() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConnectableElement *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->roles())
-        set.insert(element->asQObject());
+    foreach (QUmlConnectableElement *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->roles())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -418,8 +421,8 @@ const QSet<QObject *> QUmlInteractionObject::roles() const
 const QSet<QObject *> QUmlInteractionObject::ownedPorts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPort *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->ownedPorts())
-        set.insert(element->asQObject());
+    foreach (QUmlPort *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->ownedPorts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -427,25 +430,25 @@ const QSet<QObject *> QUmlInteractionObject::ownedPorts() const
 
 QObject *QUmlInteractionObject::classifierBehavior() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInteraction *>(this)->classifierBehavior())
+    if (!qmodelingelementproperty_cast<QUmlInteraction *>(this)->classifierBehavior())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInteraction *>(this)->classifierBehavior()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInteraction *>(this)->classifierBehavior()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlInteractionObject::interfaceRealizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterfaceRealization *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->interfaceRealizations())
-        set.insert(element->asQObject());
+    foreach (QUmlInterfaceRealization *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->interfaceRealizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInteractionObject::ownedBehaviors() const
 {
     QSet<QObject *> set;
-    foreach (QUmlBehavior *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->ownedBehaviors())
-        set.insert(element->asQObject());
+    foreach (QUmlBehavior *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->ownedBehaviors())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -454,58 +457,58 @@ const QSet<QObject *> QUmlInteractionObject::ownedBehaviors() const
 const QSet<QObject *> QUmlInteractionObject::extensions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExtension *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->extensions())
-        set.insert(element->asQObject());
+    foreach (QUmlExtension *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->extensions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInteractionObject::isAbstract() const
 {
-    return qmodelingobjectproperty_cast<QUmlInteraction *>(this)->isAbstract();
+    return qmodelingelementproperty_cast<QUmlInteraction *>(this)->isAbstract();
 }
 
 bool QUmlInteractionObject::isActive() const
 {
-    return qmodelingobjectproperty_cast<QUmlInteraction *>(this)->isActive();
+    return qmodelingelementproperty_cast<QUmlInteraction *>(this)->isActive();
 }
 
 const QList<QObject *> QUmlInteractionObject::nestedClassifiers() const
 {
     QList<QObject *> list;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->nestedClassifiers())
-        list.append(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->nestedClassifiers())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QList<QObject *> QUmlInteractionObject::ownedAttributes() const
 {
     QList<QObject *> list;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->ownedAttributes())
-        list.append(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->ownedAttributes())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QList<QObject *> QUmlInteractionObject::ownedOperations() const
 {
     QList<QObject *> list;
-    foreach (QUmlOperation *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->ownedOperations())
-        list.append(element->asQObject());
+    foreach (QUmlOperation *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->ownedOperations())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QSet<QObject *> QUmlInteractionObject::ownedReceptions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlReception *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->ownedReceptions())
-        set.insert(element->asQObject());
+    foreach (QUmlReception *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->ownedReceptions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInteractionObject::superClasses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClass *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->superClasses())
-        set.insert(element->asQObject());
+    foreach (QUmlClass *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->superClasses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -513,63 +516,63 @@ const QSet<QObject *> QUmlInteractionObject::superClasses() const
 
 QObject *QUmlInteractionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInteraction *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlInteraction *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInteraction *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInteraction *>(this)->context()->asQModelingObject();
 }
 
 bool QUmlInteractionObject::isReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlInteraction *>(this)->isReentrant();
+    return qmodelingelementproperty_cast<QUmlInteraction *>(this)->isReentrant();
 }
 
 const QList<QObject *> QUmlInteractionObject::ownedParameters() const
 {
     QList<QObject *> list;
-    foreach (QUmlParameter *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->ownedParameters())
-        list.append(element->asQObject());
+    foreach (QUmlParameter *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->ownedParameters())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QSet<QObject *> QUmlInteractionObject::ownedParameterSets() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterSet *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->ownedParameterSets())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterSet *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->ownedParameterSets())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInteractionObject::postconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->postconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->postconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInteractionObject::preconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->preconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->preconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInteractionObject::redefinedBehaviors() const
 {
     QSet<QObject *> set;
-    foreach (QUmlBehavior *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->redefinedBehaviors())
-        set.insert(element->asQObject());
+    foreach (QUmlBehavior *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->redefinedBehaviors())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlInteractionObject::specification() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInteraction *>(this)->specification())
+    if (!qmodelingelementproperty_cast<QUmlInteraction *>(this)->specification())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInteraction *>(this)->specification()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInteraction *>(this)->specification()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [InteractionFragment]
@@ -577,32 +580,32 @@ QObject *QUmlInteractionObject::specification() const
 const QSet<QObject *> QUmlInteractionObject::covered() const
 {
     QSet<QObject *> set;
-    foreach (QUmlLifeline *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->covered())
-        set.insert(element->asQObject());
+    foreach (QUmlLifeline *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->covered())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlInteractionObject::enclosingInteraction() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInteraction *>(this)->enclosingInteraction())
+    if (!qmodelingelementproperty_cast<QUmlInteraction *>(this)->enclosingInteraction())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInteraction *>(this)->enclosingInteraction()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInteraction *>(this)->enclosingInteraction()->asQModelingObject();
 }
 
 QObject *QUmlInteractionObject::enclosingOperand() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInteraction *>(this)->enclosingOperand())
+    if (!qmodelingelementproperty_cast<QUmlInteraction *>(this)->enclosingOperand())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInteraction *>(this)->enclosingOperand()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInteraction *>(this)->enclosingOperand()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlInteractionObject::generalOrderings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralOrdering *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->generalOrderings())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralOrdering *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->generalOrderings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -611,40 +614,40 @@ const QSet<QObject *> QUmlInteractionObject::generalOrderings() const
 const QSet<QObject *> QUmlInteractionObject::actions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlAction *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->actions())
-        set.insert(element->asQObject());
+    foreach (QUmlAction *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->actions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInteractionObject::formalGates() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGate *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->formalGates())
-        set.insert(element->asQObject());
+    foreach (QUmlGate *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->formalGates())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlInteractionObject::fragments() const
 {
     QList<QObject *> list;
-    foreach (QUmlInteractionFragment *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->fragments())
-        list.append(element->asQObject());
+    foreach (QUmlInteractionFragment *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->fragments())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QSet<QObject *> QUmlInteractionObject::lifelines() const
 {
     QSet<QObject *> set;
-    foreach (QUmlLifeline *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->lifelines())
-        set.insert(element->asQObject());
+    foreach (QUmlLifeline *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->lifelines())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInteractionObject::messages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlMessage *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->messages())
-        set.insert(element->asQObject());
+    foreach (QUmlMessage *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->messages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -653,14 +656,14 @@ const QSet<QObject *> QUmlInteractionObject::messages() const
 QSet<QObject *> QUmlInteractionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInteractionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlInteraction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlInteraction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -668,27 +671,27 @@ bool QUmlInteractionObject::mustBeOwned() const
 QList<QObject *> QUmlInteractionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlInteractionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInteractionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlInteraction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlInteraction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlInteractionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlInteraction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlInteraction *>(this)->separator();
 }
 
 // OPERATIONS [Namespace]
@@ -697,44 +700,44 @@ QSet<QObject *> QUmlInteractionObject::excludeCollisions(QSet<QObject *> imps) c
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlInteractionObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlInteraction *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlInteraction *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlInteractionObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInteractionObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlInteraction *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlInteraction *>(this)->membersAreDistinguishable();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlInteractionObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlInteraction *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlInteraction *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlInteractionObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlInteraction *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlInteraction *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [Type]
@@ -742,12 +745,12 @@ bool QUmlInteractionObject::isTemplateParameter() const
 
 bool QUmlInteractionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlInteraction *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlInteraction *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlInteractionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlInteraction *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlInteraction *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [TemplateableElement]
@@ -755,8 +758,8 @@ bool QUmlInteractionObject::isRedefinitionContextValid(QObject *redefined) const
 QSet<QObject *> QUmlInteractionObject::parameterableElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterableElement *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->parameterableElements())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterableElement *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->parameterableElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -765,52 +768,52 @@ QSet<QObject *> QUmlInteractionObject::parameterableElements() const
 QSet<QObject *> QUmlInteractionObject::allFeatures() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->allFeatures())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->allFeatures())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlInteractionObject::allParents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->allParents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->allParents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInteractionObject::conformsTo(QObject *other) const
 {
-    return qmodelingobjectproperty_cast<QUmlInteraction *>(this)->conformsTo(qmodelingobjectproperty_cast<QUmlClassifier *>(other));
+    return qmodelingelementproperty_cast<QUmlInteraction *>(this)->conformsTo(qmodelingelementproperty_cast<QUmlClassifier *>(other));
 }
 
 bool QUmlInteractionObject::hasVisibilityOf(QObject *n) const
 {
-    return qmodelingobjectproperty_cast<QUmlInteraction *>(this)->hasVisibilityOf(qmodelingobjectproperty_cast<QUmlNamedElement *>(n));
+    return qmodelingelementproperty_cast<QUmlInteraction *>(this)->hasVisibilityOf(qmodelingelementproperty_cast<QUmlNamedElement *>(n));
 }
 
 QSet<QObject *> QUmlInteractionObject::inheritableMembers(QObject *c) const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->inheritableMembers(qmodelingobjectproperty_cast<QUmlClassifier *>(c)))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->inheritableMembers(qmodelingelementproperty_cast<QUmlClassifier *>(c)))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInteractionObject::isTemplate() const
 {
-    return qmodelingobjectproperty_cast<QUmlInteraction *>(this)->isTemplate();
+    return qmodelingelementproperty_cast<QUmlInteraction *>(this)->isTemplate();
 }
 
 bool QUmlInteractionObject::maySpecializeType(QObject *c) const
 {
-    return qmodelingobjectproperty_cast<QUmlInteraction *>(this)->maySpecializeType(qmodelingobjectproperty_cast<QUmlClassifier *>(c));
+    return qmodelingelementproperty_cast<QUmlInteraction *>(this)->maySpecializeType(qmodelingelementproperty_cast<QUmlClassifier *>(c));
 }
 
 QSet<QObject *> QUmlInteractionObject::parents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->parents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->parents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -820,10 +823,10 @@ QSet<QObject *> QUmlInteractionObject::inherit(QSet<QObject *> inhs) const
 {
     QSet<QUmlNamedElement *> inhsConverted;
     foreach (QObject *object, inhs)
-        inhsConverted.insert(qmodelingobjectproperty_cast<QUmlNamedElement *>(object));
+        inhsConverted.insert(qmodelingelementproperty_cast<QUmlNamedElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlInteraction *>(this)->inherit(inhsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlInteraction *>(this)->inherit(inhsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -831,625 +834,789 @@ QSet<QObject *> QUmlInteractionObject::inherit(QSet<QObject *> inhs) const
 
 void QUmlInteractionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlInteractionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlInteractionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlInteractionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlInteractionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlInteractionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlInteractionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlInteractionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->setName(name);
 }
 
 void QUmlInteractionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlInteractionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlInteractionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlInteractionObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlInteractionObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlInteractionObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlInteractionObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlInteractionObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlInteractionObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlInteractionObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlInteractionObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlInteractionObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlInteractionObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlInteractionObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlInteractionObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlInteractionObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlInteractionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->setVisibility(visibility);
 }
 
 void QUmlInteractionObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Type]
 
 void QUmlInteractionObject::setPackage(QObject *package)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->setPackage(qmodelingobjectproperty_cast<QUmlPackage *>(package));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->setPackage(qmodelingelementproperty_cast<QUmlPackage *>(package));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlInteractionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlInteractionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlInteractionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlInteractionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlInteractionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlInteractionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateableElement]
 
 void QUmlInteractionObject::addTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 void QUmlInteractionObject::removeTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Classifier]
 
 void QUmlInteractionObject::addAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlInteractionObject::removeAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlInteractionObject::addCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlInteractionObject::removeCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlInteractionObject::addFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlInteractionObject::removeFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlInteractionObject::addGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlInteractionObject::removeGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlInteractionObject::addInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlInteractionObject::removeInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlInteractionObject::setFinalSpecialization(bool isFinalSpecialization)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->setFinalSpecialization(isFinalSpecialization);
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->setFinalSpecialization(isFinalSpecialization);
 }
 
 void QUmlInteractionObject::unsetFinalSpecialization()
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("finalSpecialization"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
 void QUmlInteractionObject::setOwnedTemplateSignature(QObject *ownedTemplateSignature)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->setOwnedTemplateSignature(qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->setOwnedTemplateSignature(qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
 }
 
 void QUmlInteractionObject::addOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlInteractionObject::removeOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlInteractionObject::addPowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addPowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addPowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlInteractionObject::removePowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removePowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removePowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlInteractionObject::addRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlInteractionObject::removeRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlInteractionObject::setRepresentation(QObject *representation)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->setRepresentation(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(representation));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->setRepresentation(qmodelingelementproperty_cast<QUmlCollaborationUse *>(representation));
 }
 
 void QUmlInteractionObject::addSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlInteractionObject::removeSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlInteractionObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
 }
 
 void QUmlInteractionObject::addUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 void QUmlInteractionObject::removeUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [StructuredClassifier]
 
 void QUmlInteractionObject::addOwnedConnector(QObject *ownedConnector)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addOwnedConnector(qmodelingobjectproperty_cast<QUmlConnector *>(ownedConnector));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addOwnedConnector(qmodelingelementproperty_cast<QUmlConnector *>(ownedConnector));
 }
 
 void QUmlInteractionObject::removeOwnedConnector(QObject *ownedConnector)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeOwnedConnector(qmodelingobjectproperty_cast<QUmlConnector *>(ownedConnector));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeOwnedConnector(qmodelingelementproperty_cast<QUmlConnector *>(ownedConnector));
 }
 
 void QUmlInteractionObject::addPart(QObject *part)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addPart(qmodelingobjectproperty_cast<QUmlProperty *>(part));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addPart(qmodelingelementproperty_cast<QUmlProperty *>(part));
 }
 
 void QUmlInteractionObject::removePart(QObject *part)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removePart(qmodelingobjectproperty_cast<QUmlProperty *>(part));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removePart(qmodelingelementproperty_cast<QUmlProperty *>(part));
 }
 
 void QUmlInteractionObject::addRole(QObject *role)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addRole(qmodelingobjectproperty_cast<QUmlConnectableElement *>(role));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addRole(qmodelingelementproperty_cast<QUmlConnectableElement *>(role));
 }
 
 void QUmlInteractionObject::removeRole(QObject *role)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeRole(qmodelingobjectproperty_cast<QUmlConnectableElement *>(role));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeRole(qmodelingelementproperty_cast<QUmlConnectableElement *>(role));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [EncapsulatedClassifier]
 
 void QUmlInteractionObject::addOwnedPort(QObject *ownedPort)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addOwnedPort(qmodelingobjectproperty_cast<QUmlPort *>(ownedPort));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addOwnedPort(qmodelingelementproperty_cast<QUmlPort *>(ownedPort));
 }
 
 void QUmlInteractionObject::removeOwnedPort(QObject *ownedPort)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeOwnedPort(qmodelingobjectproperty_cast<QUmlPort *>(ownedPort));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeOwnedPort(qmodelingelementproperty_cast<QUmlPort *>(ownedPort));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [BehavioredClassifier]
 
 void QUmlInteractionObject::setClassifierBehavior(QObject *classifierBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->setClassifierBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(classifierBehavior));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->setClassifierBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(classifierBehavior));
 }
 
 void QUmlInteractionObject::addInterfaceRealization(QObject *interfaceRealization)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addInterfaceRealization(qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addInterfaceRealization(qmodelingelementproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
 }
 
 void QUmlInteractionObject::removeInterfaceRealization(QObject *interfaceRealization)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeInterfaceRealization(qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeInterfaceRealization(qmodelingelementproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
 }
 
 void QUmlInteractionObject::addOwnedBehavior(QObject *ownedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addOwnedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(ownedBehavior));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addOwnedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(ownedBehavior));
 }
 
 void QUmlInteractionObject::removeOwnedBehavior(QObject *ownedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeOwnedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(ownedBehavior));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeOwnedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(ownedBehavior));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Class]
 
 void QUmlInteractionObject::addExtension(QObject *extension)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addExtension(qmodelingobjectproperty_cast<QUmlExtension *>(extension));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addExtension(qmodelingelementproperty_cast<QUmlExtension *>(extension));
 }
 
 void QUmlInteractionObject::removeExtension(QObject *extension)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeExtension(qmodelingobjectproperty_cast<QUmlExtension *>(extension));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeExtension(qmodelingelementproperty_cast<QUmlExtension *>(extension));
 }
 
 void QUmlInteractionObject::setAbstract(bool isAbstract)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->setAbstract(isAbstract);
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->setAbstract(isAbstract);
 }
 
 void QUmlInteractionObject::unsetAbstract()
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("abstract"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
 void QUmlInteractionObject::setActive(bool isActive)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->setActive(isActive);
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->setActive(isActive);
 }
 
 void QUmlInteractionObject::unsetActive()
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("active"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("active"));
 }
 
 void QUmlInteractionObject::addNestedClassifier(QObject *nestedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addNestedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(nestedClassifier));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addNestedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(nestedClassifier));
 }
 
 void QUmlInteractionObject::removeNestedClassifier(QObject *nestedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeNestedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(nestedClassifier));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeNestedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(nestedClassifier));
 }
 
 void QUmlInteractionObject::addOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlInteractionObject::removeOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlInteractionObject::addOwnedOperation(QObject *ownedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addOwnedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(ownedOperation));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addOwnedOperation(qmodelingelementproperty_cast<QUmlOperation *>(ownedOperation));
 }
 
 void QUmlInteractionObject::removeOwnedOperation(QObject *ownedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeOwnedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(ownedOperation));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeOwnedOperation(qmodelingelementproperty_cast<QUmlOperation *>(ownedOperation));
 }
 
 void QUmlInteractionObject::addOwnedReception(QObject *ownedReception)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addOwnedReception(qmodelingobjectproperty_cast<QUmlReception *>(ownedReception));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addOwnedReception(qmodelingelementproperty_cast<QUmlReception *>(ownedReception));
 }
 
 void QUmlInteractionObject::removeOwnedReception(QObject *ownedReception)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeOwnedReception(qmodelingobjectproperty_cast<QUmlReception *>(ownedReception));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeOwnedReception(qmodelingelementproperty_cast<QUmlReception *>(ownedReception));
 }
 
 void QUmlInteractionObject::addSuperClass(QObject *superClass)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addSuperClass(qmodelingobjectproperty_cast<QUmlClass *>(superClass));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addSuperClass(qmodelingelementproperty_cast<QUmlClass *>(superClass));
 }
 
 void QUmlInteractionObject::removeSuperClass(QObject *superClass)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeSuperClass(qmodelingobjectproperty_cast<QUmlClass *>(superClass));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeSuperClass(qmodelingelementproperty_cast<QUmlClass *>(superClass));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Behavior]
 
 void QUmlInteractionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->setContext(qmodelingobjectproperty_cast<QUmlBehavioredClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->setContext(qmodelingelementproperty_cast<QUmlBehavioredClassifier *>(context));
 }
 
 void QUmlInteractionObject::setReentrant(bool isReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->setReentrant(isReentrant);
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->setReentrant(isReentrant);
 }
 
 void QUmlInteractionObject::unsetReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("reentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("reentrant"));
 }
 
 void QUmlInteractionObject::addOwnedParameter(QObject *ownedParameter)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addOwnedParameter(qmodelingobjectproperty_cast<QUmlParameter *>(ownedParameter));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addOwnedParameter(qmodelingelementproperty_cast<QUmlParameter *>(ownedParameter));
 }
 
 void QUmlInteractionObject::removeOwnedParameter(QObject *ownedParameter)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeOwnedParameter(qmodelingobjectproperty_cast<QUmlParameter *>(ownedParameter));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeOwnedParameter(qmodelingelementproperty_cast<QUmlParameter *>(ownedParameter));
 }
 
 void QUmlInteractionObject::addOwnedParameterSet(QObject *ownedParameterSet)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addOwnedParameterSet(qmodelingobjectproperty_cast<QUmlParameterSet *>(ownedParameterSet));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addOwnedParameterSet(qmodelingelementproperty_cast<QUmlParameterSet *>(ownedParameterSet));
 }
 
 void QUmlInteractionObject::removeOwnedParameterSet(QObject *ownedParameterSet)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeOwnedParameterSet(qmodelingobjectproperty_cast<QUmlParameterSet *>(ownedParameterSet));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeOwnedParameterSet(qmodelingelementproperty_cast<QUmlParameterSet *>(ownedParameterSet));
 }
 
 void QUmlInteractionObject::addPostcondition(QObject *postcondition)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(postcondition));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(postcondition));
 }
 
 void QUmlInteractionObject::removePostcondition(QObject *postcondition)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removePostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(postcondition));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removePostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(postcondition));
 }
 
 void QUmlInteractionObject::addPrecondition(QObject *precondition)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(precondition));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(precondition));
 }
 
 void QUmlInteractionObject::removePrecondition(QObject *precondition)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removePrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(precondition));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removePrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(precondition));
 }
 
 void QUmlInteractionObject::addRedefinedBehavior(QObject *redefinedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addRedefinedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(redefinedBehavior));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addRedefinedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(redefinedBehavior));
 }
 
 void QUmlInteractionObject::removeRedefinedBehavior(QObject *redefinedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeRedefinedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(redefinedBehavior));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeRedefinedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(redefinedBehavior));
 }
 
 void QUmlInteractionObject::setSpecification(QObject *specification)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->setSpecification(qmodelingobjectproperty_cast<QUmlBehavioralFeature *>(specification));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->setSpecification(qmodelingelementproperty_cast<QUmlBehavioralFeature *>(specification));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [InteractionFragment]
 
 void QUmlInteractionObject::addCovered(QObject *covered)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addCovered(qmodelingobjectproperty_cast<QUmlLifeline *>(covered));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addCovered(qmodelingelementproperty_cast<QUmlLifeline *>(covered));
 }
 
 void QUmlInteractionObject::removeCovered(QObject *covered)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeCovered(qmodelingobjectproperty_cast<QUmlLifeline *>(covered));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeCovered(qmodelingelementproperty_cast<QUmlLifeline *>(covered));
 }
 
 void QUmlInteractionObject::setEnclosingInteraction(QObject *enclosingInteraction)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->setEnclosingInteraction(qmodelingobjectproperty_cast<QUmlInteraction *>(enclosingInteraction));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->setEnclosingInteraction(qmodelingelementproperty_cast<QUmlInteraction *>(enclosingInteraction));
 }
 
 void QUmlInteractionObject::setEnclosingOperand(QObject *enclosingOperand)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->setEnclosingOperand(qmodelingobjectproperty_cast<QUmlInteractionOperand *>(enclosingOperand));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->setEnclosingOperand(qmodelingelementproperty_cast<QUmlInteractionOperand *>(enclosingOperand));
 }
 
 void QUmlInteractionObject::addGeneralOrdering(QObject *generalOrdering)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addGeneralOrdering(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addGeneralOrdering(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
 }
 
 void QUmlInteractionObject::removeGeneralOrdering(QObject *generalOrdering)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeGeneralOrdering(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeGeneralOrdering(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Interaction]
 
 void QUmlInteractionObject::addAction(QObject *action)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addAction(qmodelingobjectproperty_cast<QUmlAction *>(action));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addAction(qmodelingelementproperty_cast<QUmlAction *>(action));
 }
 
 void QUmlInteractionObject::removeAction(QObject *action)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeAction(qmodelingobjectproperty_cast<QUmlAction *>(action));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeAction(qmodelingelementproperty_cast<QUmlAction *>(action));
 }
 
 void QUmlInteractionObject::addFormalGate(QObject *formalGate)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addFormalGate(qmodelingobjectproperty_cast<QUmlGate *>(formalGate));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addFormalGate(qmodelingelementproperty_cast<QUmlGate *>(formalGate));
 }
 
 void QUmlInteractionObject::removeFormalGate(QObject *formalGate)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeFormalGate(qmodelingobjectproperty_cast<QUmlGate *>(formalGate));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeFormalGate(qmodelingelementproperty_cast<QUmlGate *>(formalGate));
 }
 
 void QUmlInteractionObject::addFragment(QObject *fragment)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addFragment(qmodelingobjectproperty_cast<QUmlInteractionFragment *>(fragment));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addFragment(qmodelingelementproperty_cast<QUmlInteractionFragment *>(fragment));
 }
 
 void QUmlInteractionObject::removeFragment(QObject *fragment)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeFragment(qmodelingobjectproperty_cast<QUmlInteractionFragment *>(fragment));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeFragment(qmodelingelementproperty_cast<QUmlInteractionFragment *>(fragment));
 }
 
 void QUmlInteractionObject::addLifeline(QObject *lifeline)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addLifeline(qmodelingobjectproperty_cast<QUmlLifeline *>(lifeline));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addLifeline(qmodelingelementproperty_cast<QUmlLifeline *>(lifeline));
 }
 
 void QUmlInteractionObject::removeLifeline(QObject *lifeline)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeLifeline(qmodelingobjectproperty_cast<QUmlLifeline *>(lifeline));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeLifeline(qmodelingelementproperty_cast<QUmlLifeline *>(lifeline));
 }
 
 void QUmlInteractionObject::addMessage(QObject *message)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->addMessage(qmodelingobjectproperty_cast<QUmlMessage *>(message));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->addMessage(qmodelingelementproperty_cast<QUmlMessage *>(message));
 }
 
 void QUmlInteractionObject::removeMessage(QObject *message)
 {
-    qmodelingobjectproperty_cast<QUmlInteraction *>(this)->removeMessage(qmodelingobjectproperty_cast<QUmlMessage *>(message));
+    qmodelingelementproperty_cast<QUmlInteraction *>(this)->removeMessage(qmodelingelementproperty_cast<QUmlMessage *>(message));
+}
+
+
+void QUmlInteractionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlType");
+    d->groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
+
+    d->propertyGroups << QStringLiteral("QUmlStructuredClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedConnectors"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parts"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("roles"))));
+
+    d->propertyGroups << QStringLiteral("QUmlEncapsulatedClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlEncapsulatedClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedPorts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlBehavioredClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifierBehavior"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interfaceRealizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedBehaviors"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClass");
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extensions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isActive"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedReceptions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superClasses"))));
+
+    d->propertyGroups << QStringLiteral("QUmlBehavior");
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameters"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameterSets"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("postconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("preconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedBehaviors"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("specification"))));
+
+    d->propertyGroups << QStringLiteral("QUmlInteractionFragment");
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("covered"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingInteraction"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingOperand"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalOrderings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlInteraction");
+    d->groupProperties.insert(QStringLiteral("QUmlInteraction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("actions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteraction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("formalGates"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteraction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("fragments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteraction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lifelines"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteraction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("messages"))));
+}
+
+void QUmlInteractionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, actions, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, actions, PropertyClassRole, QStringLiteral("QUmlInteraction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, actions, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, actions, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, actions, DocumentationRole, QStringLiteral("Actions owned by the Interaction."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, actions, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, actions, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, actions, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, formalGates, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, formalGates, PropertyClassRole, QStringLiteral("QUmlInteraction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, formalGates, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, formalGates, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, formalGates, DocumentationRole, QStringLiteral("Specifies the gates that form the message interface between this Interaction and any InteractionUses which reference it."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, formalGates, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, formalGates, SubsettedPropertiesRole, QStringLiteral("Namespace-ownedMember"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, formalGates, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, fragments, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, fragments, PropertyClassRole, QStringLiteral("QUmlInteraction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, fragments, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, fragments, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, fragments, DocumentationRole, QStringLiteral("The ordered set of fragments in the Interaction."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, fragments, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, fragments, SubsettedPropertiesRole, QStringLiteral("Namespace-ownedMember"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, fragments, OppositeEndRole, QStringLiteral("InteractionFragment-enclosingInteraction"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, lifelines, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, lifelines, PropertyClassRole, QStringLiteral("QUmlInteraction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, lifelines, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, lifelines, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, lifelines, DocumentationRole, QStringLiteral("Specifies the participants in this Interaction."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, lifelines, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, lifelines, SubsettedPropertiesRole, QStringLiteral("Namespace-ownedMember"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, lifelines, OppositeEndRole, QStringLiteral("Lifeline-interaction"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, messages, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, messages, PropertyClassRole, QStringLiteral("QUmlInteraction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, messages, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, messages, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, messages, DocumentationRole, QStringLiteral("The Messages contained in this Interaction."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, messages, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, messages, SubsettedPropertiesRole, QStringLiteral("Namespace-ownedMember"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteraction, messages, OppositeEndRole, QStringLiteral("Message-interaction"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlinteractionobject_p.h b/src/uml/qobjects/qumlinteractionobject_p.h
index 55d98106..5971ed6d 100644
--- a/src/uml/qobjects/qumlinteractionobject_p.h
+++ b/src/uml/qobjects/qumlinteractionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlInteraction;
-class Q_UML_EXPORT QUmlInteractionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlInteractionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlInteractionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -158,7 +161,7 @@ class Q_UML_EXPORT QUmlInteractionObject : public QObject
     Q_PROPERTY(QSet<QObject *> messages READ messages)
 
 public:
-    Q_INVOKABLE explicit QUmlInteractionObject(QUmlInteraction *qModelingObject);
+    Q_INVOKABLE explicit QUmlInteractionObject(QUmlInteraction *qModelingElement);
     virtual ~QUmlInteractionObject();
 
     // Owned attributes [Element]
@@ -454,6 +457,10 @@ public Q_SLOTS:
     void removeLifeline(QObject *lifeline);
     void addMessage(QObject *message);
     void removeMessage(QObject *message);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlinteractionoperandobject.cpp b/src/uml/qobjects/qumlinteractionoperandobject.cpp
index 230cdbae..3ab0abb8 100644
--- a/src/uml/qobjects/qumlinteractionoperandobject.cpp
+++ b/src/uml/qobjects/qumlinteractionoperandobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlinteractionoperandobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlInteractionOperand>
 #include <QtUml/QUmlComment>
@@ -60,16 +61,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlInteractionOperandObject::QUmlInteractionOperandObject(QUmlInteractionOperand *qModelingObject)
+QUmlInteractionOperandObject::QUmlInteractionOperandObject(QUmlInteractionOperand *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlInteractionOperandObject::~QUmlInteractionOperandObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -78,25 +81,25 @@ QUmlInteractionOperandObject::~QUmlInteractionOperandObject()
 const QSet<QObject *> QUmlInteractionOperandObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInteractionOperandObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlInteractionOperandObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -104,40 +107,40 @@ QObject *QUmlInteractionOperandObject::owner() const
 const QSet<QObject *> QUmlInteractionOperandObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlInteractionOperandObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->name();
 }
 
 QObject *QUmlInteractionOperandObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlInteractionOperandObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlInteractionOperandObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlInteractionOperandObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [InteractionFragment]
@@ -145,32 +148,32 @@ QtUml::VisibilityKind QUmlInteractionOperandObject::visibility() const
 const QSet<QObject *> QUmlInteractionOperandObject::covered() const
 {
     QSet<QObject *> set;
-    foreach (QUmlLifeline *element, qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->covered())
-        set.insert(element->asQObject());
+    foreach (QUmlLifeline *element, qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->covered())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlInteractionOperandObject::enclosingInteraction() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->enclosingInteraction())
+    if (!qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->enclosingInteraction())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->enclosingInteraction()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->enclosingInteraction()->asQModelingObject();
 }
 
 QObject *QUmlInteractionOperandObject::enclosingOperand() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->enclosingOperand())
+    if (!qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->enclosingOperand())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->enclosingOperand()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->enclosingOperand()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlInteractionOperandObject::generalOrderings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralOrdering *element, qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->generalOrderings())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralOrdering *element, qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->generalOrderings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -179,48 +182,48 @@ const QSet<QObject *> QUmlInteractionOperandObject::generalOrderings() const
 const QSet<QObject *> QUmlInteractionOperandObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInteractionOperandObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInteractionOperandObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInteractionOperandObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInteractionOperandObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInteractionOperandObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -229,17 +232,17 @@ const QSet<QObject *> QUmlInteractionOperandObject::packageImports() const
 const QList<QObject *> QUmlInteractionOperandObject::fragments() const
 {
     QList<QObject *> list;
-    foreach (QUmlInteractionFragment *element, qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->fragments())
-        list.append(element->asQObject());
+    foreach (QUmlInteractionFragment *element, qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->fragments())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 QObject *QUmlInteractionOperandObject::guard() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->guard())
+    if (!qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->guard())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->guard()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->guard()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -247,14 +250,14 @@ QObject *QUmlInteractionOperandObject::guard() const
 QSet<QObject *> QUmlInteractionOperandObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInteractionOperandObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -262,27 +265,27 @@ bool QUmlInteractionOperandObject::mustBeOwned() const
 QList<QObject *> QUmlInteractionOperandObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlInteractionOperandObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInteractionOperandObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlInteractionOperandObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->separator();
 }
 
 // OPERATIONS [Namespace]
@@ -291,207 +294,270 @@ QSet<QObject *> QUmlInteractionOperandObject::excludeCollisions(QSet<QObject *>
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlInteractionOperandObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlInteractionOperandObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInteractionOperandObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->membersAreDistinguishable();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlInteractionOperandObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlInteractionOperandObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlInteractionOperandObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlInteractionOperandObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlInteractionOperandObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlInteractionOperandObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlInteractionOperandObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlInteractionOperandObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->setName(name);
 }
 
 void QUmlInteractionOperandObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlInteractionOperandObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlInteractionOperandObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlInteractionOperandObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [InteractionFragment]
 
 void QUmlInteractionOperandObject::addCovered(QObject *covered)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->addCovered(qmodelingobjectproperty_cast<QUmlLifeline *>(covered));
+    qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->addCovered(qmodelingelementproperty_cast<QUmlLifeline *>(covered));
 }
 
 void QUmlInteractionOperandObject::removeCovered(QObject *covered)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->removeCovered(qmodelingobjectproperty_cast<QUmlLifeline *>(covered));
+    qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->removeCovered(qmodelingelementproperty_cast<QUmlLifeline *>(covered));
 }
 
 void QUmlInteractionOperandObject::setEnclosingInteraction(QObject *enclosingInteraction)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->setEnclosingInteraction(qmodelingobjectproperty_cast<QUmlInteraction *>(enclosingInteraction));
+    qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->setEnclosingInteraction(qmodelingelementproperty_cast<QUmlInteraction *>(enclosingInteraction));
 }
 
 void QUmlInteractionOperandObject::setEnclosingOperand(QObject *enclosingOperand)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->setEnclosingOperand(qmodelingobjectproperty_cast<QUmlInteractionOperand *>(enclosingOperand));
+    qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->setEnclosingOperand(qmodelingelementproperty_cast<QUmlInteractionOperand *>(enclosingOperand));
 }
 
 void QUmlInteractionOperandObject::addGeneralOrdering(QObject *generalOrdering)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->addGeneralOrdering(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
+    qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->addGeneralOrdering(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
 }
 
 void QUmlInteractionOperandObject::removeGeneralOrdering(QObject *generalOrdering)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->removeGeneralOrdering(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
+    qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->removeGeneralOrdering(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlInteractionOperandObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlInteractionOperandObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlInteractionOperandObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlInteractionOperandObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlInteractionOperandObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlInteractionOperandObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlInteractionOperandObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlInteractionOperandObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlInteractionOperandObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlInteractionOperandObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlInteractionOperandObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlInteractionOperandObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [InteractionOperand]
 
 void QUmlInteractionOperandObject::addFragment(QObject *fragment)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->addFragment(qmodelingobjectproperty_cast<QUmlInteractionFragment *>(fragment));
+    qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->addFragment(qmodelingelementproperty_cast<QUmlInteractionFragment *>(fragment));
 }
 
 void QUmlInteractionOperandObject::removeFragment(QObject *fragment)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->removeFragment(qmodelingobjectproperty_cast<QUmlInteractionFragment *>(fragment));
+    qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->removeFragment(qmodelingelementproperty_cast<QUmlInteractionFragment *>(fragment));
 }
 
 void QUmlInteractionOperandObject::setGuard(QObject *guard)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionOperand *>(this)->setGuard(qmodelingobjectproperty_cast<QUmlInteractionConstraint *>(guard));
+    qmodelingelementproperty_cast<QUmlInteractionOperand *>(this)->setGuard(qmodelingelementproperty_cast<QUmlInteractionConstraint *>(guard));
+}
+
+
+void QUmlInteractionOperandObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlInteractionFragment");
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("covered"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingInteraction"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingOperand"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalOrderings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlInteractionOperand");
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionOperand"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("fragments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionOperand"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("guard"))));
+}
+
+void QUmlInteractionOperandObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionOperand, fragments, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionOperand, fragments, PropertyClassRole, QStringLiteral("QUmlInteractionOperand"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionOperand, fragments, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionOperand, fragments, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionOperand, fragments, DocumentationRole, QStringLiteral("The fragments of the operand."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionOperand, fragments, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionOperand, fragments, SubsettedPropertiesRole, QStringLiteral("Namespace-ownedMember"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionOperand, fragments, OppositeEndRole, QStringLiteral("InteractionFragment-enclosingOperand"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionOperand, guard, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionOperand, guard, PropertyClassRole, QStringLiteral("QUmlInteractionOperand"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionOperand, guard, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionOperand, guard, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionOperand, guard, DocumentationRole, QStringLiteral("Constraint of the operand."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionOperand, guard, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionOperand, guard, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionOperand, guard, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlinteractionoperandobject_p.h b/src/uml/qobjects/qumlinteractionoperandobject_p.h
index 1c5c4352..18a9ca0c 100644
--- a/src/uml/qobjects/qumlinteractionoperandobject_p.h
+++ b/src/uml/qobjects/qumlinteractionoperandobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlInteractionOperand;
-class Q_UML_EXPORT QUmlInteractionOperandObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlInteractionOperandObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlInteractionOperandObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -90,7 +93,7 @@ class Q_UML_EXPORT QUmlInteractionOperandObject : public QObject
     Q_PROPERTY(QObject * guard READ guard WRITE setGuard)
 
 public:
-    Q_INVOKABLE explicit QUmlInteractionOperandObject(QUmlInteractionOperand *qModelingObject);
+    Q_INVOKABLE explicit QUmlInteractionOperandObject(QUmlInteractionOperand *qModelingElement);
     virtual ~QUmlInteractionOperandObject();
 
     // Owned attributes [Element]
@@ -184,6 +187,10 @@ public Q_SLOTS:
     void addFragment(QObject *fragment);
     void removeFragment(QObject *fragment);
     void setGuard(QObject *guard = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlinteractionuseobject.cpp b/src/uml/qobjects/qumlinteractionuseobject.cpp
index b86a1048..e60b0055 100644
--- a/src/uml/qobjects/qumlinteractionuseobject.cpp
+++ b/src/uml/qobjects/qumlinteractionuseobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlinteractionuseobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlInteractionUse>
 #include <QtUml/QUmlComment>
@@ -58,16 +59,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlInteractionUseObject::QUmlInteractionUseObject(QUmlInteractionUse *qModelingObject)
+QUmlInteractionUseObject::QUmlInteractionUseObject(QUmlInteractionUse *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlInteractionUseObject::~QUmlInteractionUseObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -76,25 +79,25 @@ QUmlInteractionUseObject::~QUmlInteractionUseObject()
 const QSet<QObject *> QUmlInteractionUseObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInteractionUseObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlInteractionUseObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -102,40 +105,40 @@ QObject *QUmlInteractionUseObject::owner() const
 const QSet<QObject *> QUmlInteractionUseObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlInteractionUseObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->name();
 }
 
 QObject *QUmlInteractionUseObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlInteractionUseObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlInteractionUseObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlInteractionUseObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [InteractionFragment]
@@ -143,32 +146,32 @@ QtUml::VisibilityKind QUmlInteractionUseObject::visibility() const
 const QSet<QObject *> QUmlInteractionUseObject::covered() const
 {
     QSet<QObject *> set;
-    foreach (QUmlLifeline *element, qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->covered())
-        set.insert(element->asQObject());
+    foreach (QUmlLifeline *element, qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->covered())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlInteractionUseObject::enclosingInteraction() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->enclosingInteraction())
+    if (!qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->enclosingInteraction())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->enclosingInteraction()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->enclosingInteraction()->asQModelingObject();
 }
 
 QObject *QUmlInteractionUseObject::enclosingOperand() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->enclosingOperand())
+    if (!qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->enclosingOperand())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->enclosingOperand()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->enclosingOperand()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlInteractionUseObject::generalOrderings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralOrdering *element, qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->generalOrderings())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralOrdering *element, qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->generalOrderings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -177,41 +180,41 @@ const QSet<QObject *> QUmlInteractionUseObject::generalOrderings() const
 const QSet<QObject *> QUmlInteractionUseObject::actualGates() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGate *element, qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->actualGates())
-        set.insert(element->asQObject());
+    foreach (QUmlGate *element, qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->actualGates())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlInteractionUseObject::arguments() const
 {
     QList<QObject *> list;
-    foreach (QUmlValueSpecification *element, qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->arguments())
-        list.append(element->asQObject());
+    foreach (QUmlValueSpecification *element, qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->arguments())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 QObject *QUmlInteractionUseObject::refersTo() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->refersTo())
+    if (!qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->refersTo())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->refersTo()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->refersTo()->asQModelingObject();
 }
 
 QObject *QUmlInteractionUseObject::returnValue() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->returnValue())
+    if (!qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->returnValue())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->returnValue()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->returnValue()->asQModelingObject();
 }
 
 QObject *QUmlInteractionUseObject::returnValueRecipient() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->returnValueRecipient())
+    if (!qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->returnValueRecipient())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->returnValueRecipient()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->returnValueRecipient()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -219,14 +222,14 @@ QObject *QUmlInteractionUseObject::returnValueRecipient() const
 QSet<QObject *> QUmlInteractionUseObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInteractionUseObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -234,160 +237,245 @@ bool QUmlInteractionUseObject::mustBeOwned() const
 QList<QObject *> QUmlInteractionUseObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlInteractionUseObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInteractionUseObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlInteractionUseObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlInteractionUseObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlInteractionUseObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlInteractionUseObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlInteractionUseObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlInteractionUseObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlInteractionUseObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlInteractionUseObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlInteractionUseObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->setName(name);
 }
 
 void QUmlInteractionUseObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlInteractionUseObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlInteractionUseObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlInteractionUseObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [InteractionFragment]
 
 void QUmlInteractionUseObject::addCovered(QObject *covered)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->addCovered(qmodelingobjectproperty_cast<QUmlLifeline *>(covered));
+    qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->addCovered(qmodelingelementproperty_cast<QUmlLifeline *>(covered));
 }
 
 void QUmlInteractionUseObject::removeCovered(QObject *covered)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->removeCovered(qmodelingobjectproperty_cast<QUmlLifeline *>(covered));
+    qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->removeCovered(qmodelingelementproperty_cast<QUmlLifeline *>(covered));
 }
 
 void QUmlInteractionUseObject::setEnclosingInteraction(QObject *enclosingInteraction)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->setEnclosingInteraction(qmodelingobjectproperty_cast<QUmlInteraction *>(enclosingInteraction));
+    qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->setEnclosingInteraction(qmodelingelementproperty_cast<QUmlInteraction *>(enclosingInteraction));
 }
 
 void QUmlInteractionUseObject::setEnclosingOperand(QObject *enclosingOperand)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->setEnclosingOperand(qmodelingobjectproperty_cast<QUmlInteractionOperand *>(enclosingOperand));
+    qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->setEnclosingOperand(qmodelingelementproperty_cast<QUmlInteractionOperand *>(enclosingOperand));
 }
 
 void QUmlInteractionUseObject::addGeneralOrdering(QObject *generalOrdering)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->addGeneralOrdering(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
+    qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->addGeneralOrdering(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
 }
 
 void QUmlInteractionUseObject::removeGeneralOrdering(QObject *generalOrdering)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->removeGeneralOrdering(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
+    qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->removeGeneralOrdering(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [InteractionUse]
 
 void QUmlInteractionUseObject::addActualGate(QObject *actualGate)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->addActualGate(qmodelingobjectproperty_cast<QUmlGate *>(actualGate));
+    qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->addActualGate(qmodelingelementproperty_cast<QUmlGate *>(actualGate));
 }
 
 void QUmlInteractionUseObject::removeActualGate(QObject *actualGate)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->removeActualGate(qmodelingobjectproperty_cast<QUmlGate *>(actualGate));
+    qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->removeActualGate(qmodelingelementproperty_cast<QUmlGate *>(actualGate));
 }
 
 void QUmlInteractionUseObject::addArgument(QObject *argument)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->addArgument(qmodelingobjectproperty_cast<QUmlValueSpecification *>(argument));
+    qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->addArgument(qmodelingelementproperty_cast<QUmlValueSpecification *>(argument));
 }
 
 void QUmlInteractionUseObject::removeArgument(QObject *argument)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->removeArgument(qmodelingobjectproperty_cast<QUmlValueSpecification *>(argument));
+    qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->removeArgument(qmodelingelementproperty_cast<QUmlValueSpecification *>(argument));
 }
 
 void QUmlInteractionUseObject::setRefersTo(QObject *refersTo)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->setRefersTo(qmodelingobjectproperty_cast<QUmlInteraction *>(refersTo));
+    qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->setRefersTo(qmodelingelementproperty_cast<QUmlInteraction *>(refersTo));
 }
 
 void QUmlInteractionUseObject::setReturnValue(QObject *returnValue)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->setReturnValue(qmodelingobjectproperty_cast<QUmlValueSpecification *>(returnValue));
+    qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->setReturnValue(qmodelingelementproperty_cast<QUmlValueSpecification *>(returnValue));
 }
 
 void QUmlInteractionUseObject::setReturnValueRecipient(QObject *returnValueRecipient)
 {
-    qmodelingobjectproperty_cast<QUmlInteractionUse *>(this)->setReturnValueRecipient(qmodelingobjectproperty_cast<QUmlProperty *>(returnValueRecipient));
+    qmodelingelementproperty_cast<QUmlInteractionUse *>(this)->setReturnValueRecipient(qmodelingelementproperty_cast<QUmlProperty *>(returnValueRecipient));
+}
+
+
+void QUmlInteractionUseObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlInteractionFragment");
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("covered"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingInteraction"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingOperand"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalOrderings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlInteractionUse");
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionUse"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("actualGates"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionUse"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("arguments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionUse"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("refersTo"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionUse"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("returnValue"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionUse"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("returnValueRecipient"))));
+}
+
+void QUmlInteractionUseObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, actualGates, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, actualGates, PropertyClassRole, QStringLiteral("QUmlInteractionUse"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, actualGates, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, actualGates, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, actualGates, DocumentationRole, QStringLiteral("The actual gates of the InteractionUse"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, actualGates, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, actualGates, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, actualGates, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, arguments, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, arguments, PropertyClassRole, QStringLiteral("QUmlInteractionUse"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, arguments, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, arguments, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, arguments, DocumentationRole, QStringLiteral("The actual arguments of the Interaction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, arguments, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, arguments, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, arguments, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, refersTo, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, refersTo, PropertyClassRole, QStringLiteral("QUmlInteractionUse"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, refersTo, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, refersTo, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, refersTo, DocumentationRole, QStringLiteral("Refers to the Interaction that defines its meaning"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, refersTo, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, refersTo, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, refersTo, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, returnValue, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, returnValue, PropertyClassRole, QStringLiteral("QUmlInteractionUse"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, returnValue, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, returnValue, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, returnValue, DocumentationRole, QStringLiteral("The value of the executed Interaction."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, returnValue, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, returnValue, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, returnValue, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, returnValueRecipient, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, returnValueRecipient, PropertyClassRole, QStringLiteral("QUmlInteractionUse"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, returnValueRecipient, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, returnValueRecipient, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, returnValueRecipient, DocumentationRole, QStringLiteral("The recipient of the return value."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, returnValueRecipient, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, returnValueRecipient, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInteractionUse, returnValueRecipient, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlinteractionuseobject_p.h b/src/uml/qobjects/qumlinteractionuseobject_p.h
index f991d454..b849390b 100644
--- a/src/uml/qobjects/qumlinteractionuseobject_p.h
+++ b/src/uml/qobjects/qumlinteractionuseobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlInteractionUse;
-class Q_UML_EXPORT QUmlInteractionUseObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlInteractionUseObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlInteractionUseObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -85,7 +88,7 @@ class Q_UML_EXPORT QUmlInteractionUseObject : public QObject
     Q_PROPERTY(QObject * returnValueRecipient READ returnValueRecipient WRITE setReturnValueRecipient)
 
 public:
-    Q_INVOKABLE explicit QUmlInteractionUseObject(QUmlInteractionUse *qModelingObject);
+    Q_INVOKABLE explicit QUmlInteractionUseObject(QUmlInteractionUse *qModelingElement);
     virtual ~QUmlInteractionUseObject();
 
     // Owned attributes [Element]
@@ -158,6 +161,10 @@ public Q_SLOTS:
     void setRefersTo(QObject *refersTo = 0);
     void setReturnValue(QObject *returnValue = 0);
     void setReturnValueRecipient(QObject *returnValueRecipient = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlinterfaceobject.cpp b/src/uml/qobjects/qumlinterfaceobject.cpp
index 1a56a226..0fed3004 100644
--- a/src/uml/qobjects/qumlinterfaceobject.cpp
+++ b/src/uml/qobjects/qumlinterfaceobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlinterfaceobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlInterface>
 #include <QtUml/QUmlClassifier>
@@ -74,16 +75,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlInterfaceObject::QUmlInterfaceObject(QUmlInterface *qModelingObject)
+QUmlInterfaceObject::QUmlInterfaceObject(QUmlInterface *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlInterfaceObject::~QUmlInterfaceObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlInterface *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlInterface *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -92,25 +95,25 @@ QUmlInterfaceObject::~QUmlInterfaceObject()
 const QSet<QObject *> QUmlInterfaceObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInterfaceObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlInterfaceObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInterface *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlInterface *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInterface *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInterface *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -118,35 +121,35 @@ QObject *QUmlInterfaceObject::owner() const
 const QSet<QObject *> QUmlInterfaceObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlInterfaceObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlInterface *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlInterface *>(this)->name();
 }
 
 QObject *QUmlInterfaceObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInterface *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlInterface *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInterface *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInterface *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlInterfaceObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInterface *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlInterface *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInterface *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInterface *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlInterfaceObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlInterface *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlInterface *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [Namespace]
@@ -154,48 +157,48 @@ QString QUmlInterfaceObject::qualifiedName() const
 const QSet<QObject *> QUmlInterfaceObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInterfaceObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInterfaceObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInterfaceObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInterfaceObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInterfaceObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -203,49 +206,49 @@ const QSet<QObject *> QUmlInterfaceObject::packageImports() const
 
 QObject *QUmlInterfaceObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInterface *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlInterface *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInterface *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInterface *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlInterfaceObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlInterface *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlInterface *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Type]
 
 QObject *QUmlInterfaceObject::package() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInterface *>(this)->package())
+    if (!qmodelingelementproperty_cast<QUmlInterface *>(this)->package())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInterface *>(this)->package()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInterface *>(this)->package()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlInterfaceObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlInterface *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlInterface *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlInterfaceObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInterfaceObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -254,8 +257,8 @@ const QSet<QObject *> QUmlInterfaceObject::redefinitionContexts() const
 const QSet<QObject *> QUmlInterfaceObject::templateBindings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTemplateBinding *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->templateBindings())
-        set.insert(element->asQObject());
+    foreach (QUmlTemplateBinding *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->templateBindings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -264,122 +267,122 @@ const QSet<QObject *> QUmlInterfaceObject::templateBindings() const
 const QSet<QObject *> QUmlInterfaceObject::attributes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->attributes())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->attributes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInterfaceObject::collaborationUses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlCollaborationUse *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->collaborationUses())
-        set.insert(element->asQObject());
+    foreach (QUmlCollaborationUse *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->collaborationUses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInterfaceObject::features() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->features())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->features())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInterfaceObject::generals() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->generals())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->generals())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInterfaceObject::generalizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralization *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->generalizations())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralization *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->generalizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInterfaceObject::inheritedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->inheritedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->inheritedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInterfaceObject::isAbstract() const
 {
-    return qmodelingobjectproperty_cast<QUmlInterface *>(this)->isAbstract();
+    return qmodelingelementproperty_cast<QUmlInterface *>(this)->isAbstract();
 }
 
 bool QUmlInterfaceObject::isFinalSpecialization() const
 {
-    return qmodelingobjectproperty_cast<QUmlInterface *>(this)->isFinalSpecialization();
+    return qmodelingelementproperty_cast<QUmlInterface *>(this)->isFinalSpecialization();
 }
 
 QObject *QUmlInterfaceObject::ownedTemplateSignature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInterface *>(this)->ownedTemplateSignature())
+    if (!qmodelingelementproperty_cast<QUmlInterface *>(this)->ownedTemplateSignature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInterface *>(this)->ownedTemplateSignature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInterface *>(this)->ownedTemplateSignature()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlInterfaceObject::ownedUseCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->ownedUseCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->ownedUseCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInterfaceObject::powertypeExtents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralizationSet *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->powertypeExtents())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralizationSet *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->powertypeExtents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInterfaceObject::redefinedClassifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->redefinedClassifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->redefinedClassifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlInterfaceObject::representation() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInterface *>(this)->representation())
+    if (!qmodelingelementproperty_cast<QUmlInterface *>(this)->representation())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInterface *>(this)->representation()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInterface *>(this)->representation()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlInterfaceObject::substitutions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlSubstitution *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->substitutions())
-        set.insert(element->asQObject());
+    foreach (QUmlSubstitution *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->substitutions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlInterfaceObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInterface *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlInterface *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInterface *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInterface *>(this)->templateParameter()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlInterfaceObject::useCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->useCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->useCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -388,48 +391,48 @@ const QSet<QObject *> QUmlInterfaceObject::useCases() const
 const QList<QObject *> QUmlInterfaceObject::nestedClassifiers() const
 {
     QList<QObject *> list;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->nestedClassifiers())
-        list.append(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->nestedClassifiers())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QList<QObject *> QUmlInterfaceObject::ownedAttributes() const
 {
     QList<QObject *> list;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->ownedAttributes())
-        list.append(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->ownedAttributes())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QList<QObject *> QUmlInterfaceObject::ownedOperations() const
 {
     QList<QObject *> list;
-    foreach (QUmlOperation *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->ownedOperations())
-        list.append(element->asQObject());
+    foreach (QUmlOperation *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->ownedOperations())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QSet<QObject *> QUmlInterfaceObject::ownedReceptions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlReception *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->ownedReceptions())
-        set.insert(element->asQObject());
+    foreach (QUmlReception *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->ownedReceptions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlInterfaceObject::protocol() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInterface *>(this)->protocol())
+    if (!qmodelingelementproperty_cast<QUmlInterface *>(this)->protocol())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInterface *>(this)->protocol()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInterface *>(this)->protocol()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlInterfaceObject::redefinedInterfaces() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterface *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->redefinedInterfaces())
-        set.insert(element->asQObject());
+    foreach (QUmlInterface *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->redefinedInterfaces())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -438,14 +441,14 @@ const QSet<QObject *> QUmlInterfaceObject::redefinedInterfaces() const
 QSet<QObject *> QUmlInterfaceObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInterfaceObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlInterface *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlInterface *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -453,27 +456,27 @@ bool QUmlInterfaceObject::mustBeOwned() const
 QList<QObject *> QUmlInterfaceObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlInterfaceObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInterfaceObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlInterface *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlInterface *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlInterfaceObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlInterface *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlInterface *>(this)->separator();
 }
 
 // OPERATIONS [Namespace]
@@ -482,44 +485,44 @@ QSet<QObject *> QUmlInterfaceObject::excludeCollisions(QSet<QObject *> imps) con
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlInterfaceObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlInterface *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlInterface *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlInterfaceObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInterfaceObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlInterface *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlInterface *>(this)->membersAreDistinguishable();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlInterfaceObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlInterface *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlInterface *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlInterfaceObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlInterface *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlInterface *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [Type]
@@ -527,12 +530,12 @@ bool QUmlInterfaceObject::isTemplateParameter() const
 
 bool QUmlInterfaceObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlInterface *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlInterface *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlInterfaceObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlInterface *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlInterface *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [TemplateableElement]
@@ -540,8 +543,8 @@ bool QUmlInterfaceObject::isRedefinitionContextValid(QObject *redefined) const
 QSet<QObject *> QUmlInterfaceObject::parameterableElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterableElement *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->parameterableElements())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterableElement *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->parameterableElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -550,63 +553,63 @@ QSet<QObject *> QUmlInterfaceObject::parameterableElements() const
 QSet<QObject *> QUmlInterfaceObject::allFeatures() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->allFeatures())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->allFeatures())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlInterfaceObject::allParents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->allParents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->allParents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInterfaceObject::conformsTo(QObject *other) const
 {
-    return qmodelingobjectproperty_cast<QUmlInterface *>(this)->conformsTo(qmodelingobjectproperty_cast<QUmlClassifier *>(other));
+    return qmodelingelementproperty_cast<QUmlInterface *>(this)->conformsTo(qmodelingelementproperty_cast<QUmlClassifier *>(other));
 }
 
 bool QUmlInterfaceObject::hasVisibilityOf(QObject *n) const
 {
-    return qmodelingobjectproperty_cast<QUmlInterface *>(this)->hasVisibilityOf(qmodelingobjectproperty_cast<QUmlNamedElement *>(n));
+    return qmodelingelementproperty_cast<QUmlInterface *>(this)->hasVisibilityOf(qmodelingelementproperty_cast<QUmlNamedElement *>(n));
 }
 
 QSet<QObject *> QUmlInterfaceObject::inherit(QSet<QObject *> inhs) const
 {
     QSet<QUmlNamedElement *> inhsConverted;
     foreach (QObject *object, inhs)
-        inhsConverted.insert(qmodelingobjectproperty_cast<QUmlNamedElement *>(object));
+        inhsConverted.insert(qmodelingelementproperty_cast<QUmlNamedElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->inherit(inhsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->inherit(inhsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlInterfaceObject::inheritableMembers(QObject *c) const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->inheritableMembers(qmodelingobjectproperty_cast<QUmlClassifier *>(c)))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->inheritableMembers(qmodelingelementproperty_cast<QUmlClassifier *>(c)))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInterfaceObject::isTemplate() const
 {
-    return qmodelingobjectproperty_cast<QUmlInterface *>(this)->isTemplate();
+    return qmodelingelementproperty_cast<QUmlInterface *>(this)->isTemplate();
 }
 
 bool QUmlInterfaceObject::maySpecializeType(QObject *c) const
 {
-    return qmodelingobjectproperty_cast<QUmlInterface *>(this)->maySpecializeType(qmodelingobjectproperty_cast<QUmlClassifier *>(c));
+    return qmodelingelementproperty_cast<QUmlInterface *>(this)->maySpecializeType(qmodelingelementproperty_cast<QUmlClassifier *>(c));
 }
 
 QSet<QObject *> QUmlInterfaceObject::parents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlInterface *>(this)->parents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlInterface *>(this)->parents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -614,393 +617,528 @@ QSet<QObject *> QUmlInterfaceObject::parents() const
 
 void QUmlInterfaceObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlInterfaceObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlInterfaceObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlInterfaceObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlInterfaceObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlInterfaceObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlInterfaceObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlInterfaceObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->setName(name);
 }
 
 void QUmlInterfaceObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlInterfaceObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlInterfaceObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlInterfaceObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlInterfaceObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlInterfaceObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlInterfaceObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlInterfaceObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlInterfaceObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlInterfaceObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlInterfaceObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlInterfaceObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlInterfaceObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlInterfaceObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlInterfaceObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlInterfaceObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlInterfaceObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->setVisibility(visibility);
 }
 
 void QUmlInterfaceObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Type]
 
 void QUmlInterfaceObject::setPackage(QObject *package)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->setPackage(qmodelingobjectproperty_cast<QUmlPackage *>(package));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->setPackage(qmodelingelementproperty_cast<QUmlPackage *>(package));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlInterfaceObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlInterfaceObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlInterfaceObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlInterfaceObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlInterfaceObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlInterfaceObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateableElement]
 
 void QUmlInterfaceObject::addTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->addTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->addTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 void QUmlInterfaceObject::removeTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->removeTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->removeTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Classifier]
 
 void QUmlInterfaceObject::addAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->addAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->addAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlInterfaceObject::removeAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->removeAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->removeAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlInterfaceObject::addCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->addCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->addCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlInterfaceObject::removeCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->removeCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->removeCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlInterfaceObject::addFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->addFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->addFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlInterfaceObject::removeFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->removeFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->removeFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlInterfaceObject::addGeneral(QObject *general)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->addGeneral(qmodelingobjectproperty_cast<QUmlClassifier *>(general));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->addGeneral(qmodelingelementproperty_cast<QUmlClassifier *>(general));
 }
 
 void QUmlInterfaceObject::removeGeneral(QObject *general)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->removeGeneral(qmodelingobjectproperty_cast<QUmlClassifier *>(general));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->removeGeneral(qmodelingelementproperty_cast<QUmlClassifier *>(general));
 }
 
 void QUmlInterfaceObject::addGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->addGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->addGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlInterfaceObject::removeGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->removeGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->removeGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlInterfaceObject::addInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->addInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->addInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlInterfaceObject::removeInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->removeInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->removeInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlInterfaceObject::setAbstract(bool isAbstract)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->setAbstract(isAbstract);
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->setAbstract(isAbstract);
 }
 
 void QUmlInterfaceObject::unsetAbstract()
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("abstract"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
 void QUmlInterfaceObject::setFinalSpecialization(bool isFinalSpecialization)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->setFinalSpecialization(isFinalSpecialization);
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->setFinalSpecialization(isFinalSpecialization);
 }
 
 void QUmlInterfaceObject::unsetFinalSpecialization()
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("finalSpecialization"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
 void QUmlInterfaceObject::setOwnedTemplateSignature(QObject *ownedTemplateSignature)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->setOwnedTemplateSignature(qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->setOwnedTemplateSignature(qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
 }
 
 void QUmlInterfaceObject::addOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->addOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->addOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlInterfaceObject::removeOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->removeOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->removeOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlInterfaceObject::addPowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->addPowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->addPowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlInterfaceObject::removePowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->removePowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->removePowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlInterfaceObject::addRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->addRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->addRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlInterfaceObject::removeRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->removeRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->removeRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlInterfaceObject::setRepresentation(QObject *representation)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->setRepresentation(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(representation));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->setRepresentation(qmodelingelementproperty_cast<QUmlCollaborationUse *>(representation));
 }
 
 void QUmlInterfaceObject::addSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->addSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->addSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlInterfaceObject::removeSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->removeSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->removeSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlInterfaceObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
 }
 
 void QUmlInterfaceObject::addUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->addUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->addUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 void QUmlInterfaceObject::removeUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->removeUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->removeUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Interface]
 
 void QUmlInterfaceObject::addNestedClassifier(QObject *nestedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->addNestedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(nestedClassifier));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->addNestedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(nestedClassifier));
 }
 
 void QUmlInterfaceObject::removeNestedClassifier(QObject *nestedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->removeNestedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(nestedClassifier));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->removeNestedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(nestedClassifier));
 }
 
 void QUmlInterfaceObject::addOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->addOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->addOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlInterfaceObject::removeOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->removeOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->removeOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlInterfaceObject::addOwnedOperation(QObject *ownedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->addOwnedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(ownedOperation));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->addOwnedOperation(qmodelingelementproperty_cast<QUmlOperation *>(ownedOperation));
 }
 
 void QUmlInterfaceObject::removeOwnedOperation(QObject *ownedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->removeOwnedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(ownedOperation));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->removeOwnedOperation(qmodelingelementproperty_cast<QUmlOperation *>(ownedOperation));
 }
 
 void QUmlInterfaceObject::addOwnedReception(QObject *ownedReception)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->addOwnedReception(qmodelingobjectproperty_cast<QUmlReception *>(ownedReception));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->addOwnedReception(qmodelingelementproperty_cast<QUmlReception *>(ownedReception));
 }
 
 void QUmlInterfaceObject::removeOwnedReception(QObject *ownedReception)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->removeOwnedReception(qmodelingobjectproperty_cast<QUmlReception *>(ownedReception));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->removeOwnedReception(qmodelingelementproperty_cast<QUmlReception *>(ownedReception));
 }
 
 void QUmlInterfaceObject::setProtocol(QObject *protocol)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->setProtocol(qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(protocol));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->setProtocol(qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(protocol));
 }
 
 void QUmlInterfaceObject::addRedefinedInterface(QObject *redefinedInterface)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->addRedefinedInterface(qmodelingobjectproperty_cast<QUmlInterface *>(redefinedInterface));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->addRedefinedInterface(qmodelingelementproperty_cast<QUmlInterface *>(redefinedInterface));
 }
 
 void QUmlInterfaceObject::removeRedefinedInterface(QObject *redefinedInterface)
 {
-    qmodelingobjectproperty_cast<QUmlInterface *>(this)->removeRedefinedInterface(qmodelingobjectproperty_cast<QUmlInterface *>(redefinedInterface));
+    qmodelingelementproperty_cast<QUmlInterface *>(this)->removeRedefinedInterface(qmodelingelementproperty_cast<QUmlInterface *>(redefinedInterface));
+}
+
+
+void QUmlInterfaceObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlType");
+    d->groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generals"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
+
+    d->propertyGroups << QStringLiteral("QUmlInterface");
+    d->groupProperties.insert(QStringLiteral("QUmlInterface"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInterface"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInterface"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInterface"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedReceptions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInterface"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("protocol"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInterface"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedInterfaces"))));
+}
+
+void QUmlInterfaceObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, nestedClassifiers, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, nestedClassifiers, PropertyClassRole, QStringLiteral("QUmlInterface"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, nestedClassifiers, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, nestedClassifiers, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, nestedClassifiers, DocumentationRole, QStringLiteral("References all the Classifiers that are defined (nested) within the Class."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, nestedClassifiers, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, nestedClassifiers, SubsettedPropertiesRole, QStringLiteral("A_redefinitionContext_redefinableElement-redefinableElement Namespace-ownedMember"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, nestedClassifiers, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, ownedAttributes, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, ownedAttributes, PropertyClassRole, QStringLiteral("QUmlInterface"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, ownedAttributes, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, ownedAttributes, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, ownedAttributes, DocumentationRole, QStringLiteral("The attributes (i.e. the properties) owned by the class."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, ownedAttributes, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, ownedAttributes, SubsettedPropertiesRole, QStringLiteral("Namespace-ownedMember Classifier-attribute"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, ownedAttributes, OppositeEndRole, QStringLiteral("Property-interface"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, ownedOperations, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, ownedOperations, PropertyClassRole, QStringLiteral("QUmlInterface"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, ownedOperations, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, ownedOperations, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, ownedOperations, DocumentationRole, QStringLiteral("The operations owned by the class."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, ownedOperations, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, ownedOperations, SubsettedPropertiesRole, QStringLiteral("Classifier-feature A_redefinitionContext_redefinableElement-redefinableElement Namespace-ownedMember"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, ownedOperations, OppositeEndRole, QStringLiteral("Operation-interface"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, ownedReceptions, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, ownedReceptions, PropertyClassRole, QStringLiteral("QUmlInterface"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, ownedReceptions, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, ownedReceptions, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, ownedReceptions, DocumentationRole, QStringLiteral("Receptions that objects providing this interface are willing to accept."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, ownedReceptions, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, ownedReceptions, SubsettedPropertiesRole, QStringLiteral("Classifier-feature Namespace-ownedMember"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, ownedReceptions, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, protocol, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, protocol, PropertyClassRole, QStringLiteral("QUmlInterface"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, protocol, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, protocol, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, protocol, DocumentationRole, QStringLiteral("References a protocol state machine specifying the legal sequences of the invocation of the behavioral features described in the interface."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, protocol, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, protocol, SubsettedPropertiesRole, QStringLiteral("Namespace-ownedMember"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, protocol, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, redefinedInterfaces, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, redefinedInterfaces, PropertyClassRole, QStringLiteral("QUmlInterface"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, redefinedInterfaces, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, redefinedInterfaces, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, redefinedInterfaces, DocumentationRole, QStringLiteral("References all the Interfaces redefined by this Interface."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, redefinedInterfaces, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, redefinedInterfaces, SubsettedPropertiesRole, QStringLiteral("Classifier-redefinedClassifier"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterface, redefinedInterfaces, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlinterfaceobject_p.h b/src/uml/qobjects/qumlinterfaceobject_p.h
index 80223cc9..c4789cc8 100644
--- a/src/uml/qobjects/qumlinterfaceobject_p.h
+++ b/src/uml/qobjects/qumlinterfaceobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlInterface;
-class Q_UML_EXPORT QUmlInterfaceObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlInterfaceObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlInterfaceObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -122,7 +125,7 @@ class Q_UML_EXPORT QUmlInterfaceObject : public QObject
     Q_PROPERTY(QSet<QObject *> redefinedInterfaces READ redefinedInterfaces)
 
 public:
-    Q_INVOKABLE explicit QUmlInterfaceObject(QUmlInterface *qModelingObject);
+    Q_INVOKABLE explicit QUmlInterfaceObject(QUmlInterface *qModelingElement);
     virtual ~QUmlInterfaceObject();
 
     // Owned attributes [Element]
@@ -324,6 +327,10 @@ public Q_SLOTS:
     void setProtocol(QObject *protocol = 0);
     void addRedefinedInterface(QObject *redefinedInterface);
     void removeRedefinedInterface(QObject *redefinedInterface);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlinterfacerealizationobject.cpp b/src/uml/qobjects/qumlinterfacerealizationobject.cpp
index 54010f48..96aac145 100644
--- a/src/uml/qobjects/qumlinterfacerealizationobject.cpp
+++ b/src/uml/qobjects/qumlinterfacerealizationobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlinterfacerealizationobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlInterfaceRealization>
 #include <QtUml/QUmlBehavioredClassifier>
@@ -56,16 +57,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlInterfaceRealizationObject::QUmlInterfaceRealizationObject(QUmlInterfaceRealization *qModelingObject)
+QUmlInterfaceRealizationObject::QUmlInterfaceRealizationObject(QUmlInterfaceRealization *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlInterfaceRealizationObject::~QUmlInterfaceRealizationObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -74,43 +77,43 @@ QUmlInterfaceRealizationObject::~QUmlInterfaceRealizationObject()
 const QSet<QObject *> QUmlInterfaceRealizationObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInterfaceRealizationObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlInterfaceRealizationObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlInterfaceRealizationObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlInterfaceRealizationObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -118,42 +121,42 @@ QObject *QUmlInterfaceRealizationObject::templateParameter() const
 const QSet<QObject *> QUmlInterfaceRealizationObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlInterfaceRealizationObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->name();
 }
 
 QObject *QUmlInterfaceRealizationObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlInterfaceRealizationObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlInterfaceRealizationObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlInterfaceRealizationObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Relationship]
@@ -161,8 +164,8 @@ QtUml::VisibilityKind QUmlInterfaceRealizationObject::visibility() const
 const QSet<QObject *> QUmlInterfaceRealizationObject::relatedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->relatedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->relatedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -171,16 +174,16 @@ const QSet<QObject *> QUmlInterfaceRealizationObject::relatedElements() const
 const QSet<QObject *> QUmlInterfaceRealizationObject::sources() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->sources())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->sources())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInterfaceRealizationObject::targets() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->targets())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->targets())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -189,16 +192,16 @@ const QSet<QObject *> QUmlInterfaceRealizationObject::targets() const
 const QSet<QObject *> QUmlInterfaceRealizationObject::clients() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->clients())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->clients())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInterfaceRealizationObject::suppliers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->suppliers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->suppliers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -206,28 +209,28 @@ const QSet<QObject *> QUmlInterfaceRealizationObject::suppliers() const
 
 QObject *QUmlInterfaceRealizationObject::mapping() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->mapping())
+    if (!qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->mapping())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->mapping()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->mapping()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [InterfaceRealization]
 
 QObject *QUmlInterfaceRealizationObject::contract() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->contract())
+    if (!qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->contract())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->contract()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->contract()->asQModelingObject();
 }
 
 QObject *QUmlInterfaceRealizationObject::implementingClassifier() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->implementingClassifier())
+    if (!qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->implementingClassifier())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->implementingClassifier()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->implementingClassifier()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -235,26 +238,26 @@ QObject *QUmlInterfaceRealizationObject::implementingClassifier() const
 QSet<QObject *> QUmlInterfaceRealizationObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInterfaceRealizationObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlInterfaceRealizationObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlInterfaceRealizationObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [NamedElement]
@@ -262,184 +265,256 @@ bool QUmlInterfaceRealizationObject::isTemplateParameter() const
 QList<QObject *> QUmlInterfaceRealizationObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlInterfaceRealizationObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInterfaceRealizationObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlInterfaceRealizationObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlInterfaceRealizationObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlInterfaceRealizationObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlInterfaceRealizationObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlInterfaceRealizationObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlInterfaceRealizationObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlInterfaceRealizationObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlInterfaceRealizationObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlInterfaceRealizationObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlInterfaceRealizationObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlInterfaceRealizationObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->setName(name);
 }
 
 void QUmlInterfaceRealizationObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlInterfaceRealizationObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlInterfaceRealizationObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlInterfaceRealizationObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->setVisibility(visibility);
 }
 
 void QUmlInterfaceRealizationObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Relationship]
 
 void QUmlInterfaceRealizationObject::addRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->addRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->addRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 void QUmlInterfaceRealizationObject::removeRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->removeRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->removeRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [DirectedRelationship]
 
 void QUmlInterfaceRealizationObject::addSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->addSource(qmodelingobjectproperty_cast<QUmlElement *>(source));
+    qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->addSource(qmodelingelementproperty_cast<QUmlElement *>(source));
 }
 
 void QUmlInterfaceRealizationObject::removeSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->removeSource(qmodelingobjectproperty_cast<QUmlElement *>(source));
+    qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->removeSource(qmodelingelementproperty_cast<QUmlElement *>(source));
 }
 
 void QUmlInterfaceRealizationObject::addTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->addTarget(qmodelingobjectproperty_cast<QUmlElement *>(target));
+    qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->addTarget(qmodelingelementproperty_cast<QUmlElement *>(target));
 }
 
 void QUmlInterfaceRealizationObject::removeTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->removeTarget(qmodelingobjectproperty_cast<QUmlElement *>(target));
+    qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->removeTarget(qmodelingelementproperty_cast<QUmlElement *>(target));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Dependency]
 
 void QUmlInterfaceRealizationObject::addClient(QObject *client)
 {
-    qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->addClient(qmodelingobjectproperty_cast<QUmlNamedElement *>(client));
+    qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->addClient(qmodelingelementproperty_cast<QUmlNamedElement *>(client));
 }
 
 void QUmlInterfaceRealizationObject::removeClient(QObject *client)
 {
-    qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->removeClient(qmodelingobjectproperty_cast<QUmlNamedElement *>(client));
+    qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->removeClient(qmodelingelementproperty_cast<QUmlNamedElement *>(client));
 }
 
 void QUmlInterfaceRealizationObject::addSupplier(QObject *supplier)
 {
-    qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->addSupplier(qmodelingobjectproperty_cast<QUmlNamedElement *>(supplier));
+    qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->addSupplier(qmodelingelementproperty_cast<QUmlNamedElement *>(supplier));
 }
 
 void QUmlInterfaceRealizationObject::removeSupplier(QObject *supplier)
 {
-    qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->removeSupplier(qmodelingobjectproperty_cast<QUmlNamedElement *>(supplier));
+    qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->removeSupplier(qmodelingelementproperty_cast<QUmlNamedElement *>(supplier));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Abstraction]
 
 void QUmlInterfaceRealizationObject::setMapping(QObject *mapping)
 {
-    qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->setMapping(qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(mapping));
+    qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->setMapping(qmodelingelementproperty_cast<QUmlOpaqueExpression *>(mapping));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [InterfaceRealization]
 
 void QUmlInterfaceRealizationObject::setContract(QObject *contract)
 {
-    qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->setContract(qmodelingobjectproperty_cast<QUmlInterface *>(contract));
+    qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->setContract(qmodelingelementproperty_cast<QUmlInterface *>(contract));
 }
 
 void QUmlInterfaceRealizationObject::setImplementingClassifier(QObject *implementingClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(this)->setImplementingClassifier(qmodelingobjectproperty_cast<QUmlBehavioredClassifier *>(implementingClassifier));
+    qmodelingelementproperty_cast<QUmlInterfaceRealization *>(this)->setImplementingClassifier(qmodelingelementproperty_cast<QUmlBehavioredClassifier *>(implementingClassifier));
+}
+
+
+void QUmlInterfaceRealizationObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDirectedRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDependency");
+    d->groupProperties.insert(QStringLiteral("QUmlDependency"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clients"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDependency"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("suppliers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAbstraction");
+    d->groupProperties.insert(QStringLiteral("QUmlAbstraction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("mapping"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRealization");
+
+    d->propertyGroups << QStringLiteral("QUmlInterfaceRealization");
+    d->groupProperties.insert(QStringLiteral("QUmlInterfaceRealization"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("contract"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInterfaceRealization"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("implementingClassifier"))));
+}
+
+void QUmlInterfaceRealizationObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterfaceRealization, contract, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterfaceRealization, contract, PropertyClassRole, QStringLiteral("QUmlInterfaceRealization"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterfaceRealization, contract, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterfaceRealization, contract, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterfaceRealization, contract, DocumentationRole, QStringLiteral("References the Interface specifying the conformance contract."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterfaceRealization, contract, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterfaceRealization, contract, SubsettedPropertiesRole, QStringLiteral("Dependency-supplier"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterfaceRealization, contract, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterfaceRealization, implementingClassifier, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterfaceRealization, implementingClassifier, PropertyClassRole, QStringLiteral("QUmlInterfaceRealization"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterfaceRealization, implementingClassifier, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterfaceRealization, implementingClassifier, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterfaceRealization, implementingClassifier, DocumentationRole, QStringLiteral("References the BehavioredClassifier that owns this Interfacerealization (i.e., the classifier that realizes the Interface to which it points)."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterfaceRealization, implementingClassifier, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterfaceRealization, implementingClassifier, SubsettedPropertiesRole, QStringLiteral("Element-owner Dependency-client"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterfaceRealization, implementingClassifier, OppositeEndRole, QStringLiteral("BehavioredClassifier-interfaceRealization"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlinterfacerealizationobject_p.h b/src/uml/qobjects/qumlinterfacerealizationobject_p.h
index 1590b794..914104df 100644
--- a/src/uml/qobjects/qumlinterfacerealizationobject_p.h
+++ b/src/uml/qobjects/qumlinterfacerealizationobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlInterfaceRealization;
-class Q_UML_EXPORT QUmlInterfaceRealizationObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlInterfaceRealizationObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlInterfaceRealizationObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -96,7 +99,7 @@ class Q_UML_EXPORT QUmlInterfaceRealizationObject : public QObject
     Q_PROPERTY(QObject * implementingClassifier READ implementingClassifier WRITE setImplementingClassifier)
 
 public:
-    Q_INVOKABLE explicit QUmlInterfaceRealizationObject(QUmlInterfaceRealization *qModelingObject);
+    Q_INVOKABLE explicit QUmlInterfaceRealizationObject(QUmlInterfaceRealization *qModelingElement);
     virtual ~QUmlInterfaceRealizationObject();
 
     // Owned attributes [Element]
@@ -197,6 +200,10 @@ public Q_SLOTS:
     // Slots for owned attributes [InterfaceRealization]
     void setContract(QObject *contract = 0);
     void setImplementingClassifier(QObject *implementingClassifier = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlinterruptibleactivityregionobject.cpp b/src/uml/qobjects/qumlinterruptibleactivityregionobject.cpp
index 665bd7a7..a6f5dd93 100644
--- a/src/uml/qobjects/qumlinterruptibleactivityregionobject.cpp
+++ b/src/uml/qobjects/qumlinterruptibleactivityregionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlinterruptibleactivityregionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlInterruptibleActivityRegion>
 #include <QtUml/QUmlActivity>
@@ -55,16 +56,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlInterruptibleActivityRegionObject::QUmlInterruptibleActivityRegionObject(QUmlInterruptibleActivityRegion *qModelingObject)
+QUmlInterruptibleActivityRegionObject::QUmlInterruptibleActivityRegionObject(QUmlInterruptibleActivityRegion *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlInterruptibleActivityRegionObject::~QUmlInterruptibleActivityRegionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -73,25 +76,25 @@ QUmlInterruptibleActivityRegionObject::~QUmlInterruptibleActivityRegionObject()
 const QSet<QObject *> QUmlInterruptibleActivityRegionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInterruptibleActivityRegionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlInterruptibleActivityRegionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -99,40 +102,40 @@ QObject *QUmlInterruptibleActivityRegionObject::owner() const
 const QSet<QObject *> QUmlInterruptibleActivityRegionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlInterruptibleActivityRegionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->name();
 }
 
 QObject *QUmlInterruptibleActivityRegionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlInterruptibleActivityRegionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlInterruptibleActivityRegionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlInterruptibleActivityRegionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [ActivityGroup]
@@ -140,41 +143,41 @@ QtUml::VisibilityKind QUmlInterruptibleActivityRegionObject::visibility() const
 const QSet<QObject *> QUmlInterruptibleActivityRegionObject::containedEdges() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->containedEdges())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->containedEdges())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInterruptibleActivityRegionObject::containedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->containedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->containedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlInterruptibleActivityRegionObject::inActivity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->inActivity())
+    if (!qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->inActivity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->inActivity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->inActivity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlInterruptibleActivityRegionObject::subgroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->subgroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->subgroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlInterruptibleActivityRegionObject::superGroup() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->superGroup())
+    if (!qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->superGroup())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->superGroup()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->superGroup()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [InterruptibleActivityRegion]
@@ -182,16 +185,16 @@ QObject *QUmlInterruptibleActivityRegionObject::superGroup() const
 const QSet<QObject *> QUmlInterruptibleActivityRegionObject::interruptingEdges() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->interruptingEdges())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->interruptingEdges())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlInterruptibleActivityRegionObject::nodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->nodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->nodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -200,14 +203,14 @@ const QSet<QObject *> QUmlInterruptibleActivityRegionObject::nodes() const
 QSet<QObject *> QUmlInterruptibleActivityRegionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInterruptibleActivityRegionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -215,155 +218,211 @@ bool QUmlInterruptibleActivityRegionObject::mustBeOwned() const
 QList<QObject *> QUmlInterruptibleActivityRegionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlInterruptibleActivityRegionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlInterruptibleActivityRegionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlInterruptibleActivityRegionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlInterruptibleActivityRegionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlInterruptibleActivityRegionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlInterruptibleActivityRegionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlInterruptibleActivityRegionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlInterruptibleActivityRegionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlInterruptibleActivityRegionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlInterruptibleActivityRegionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlInterruptibleActivityRegionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->setName(name);
 }
 
 void QUmlInterruptibleActivityRegionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlInterruptibleActivityRegionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlInterruptibleActivityRegionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlInterruptibleActivityRegionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityGroup]
 
 void QUmlInterruptibleActivityRegionObject::addContainedEdge(QObject *containedEdge)
 {
-    qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->addContainedEdge(qmodelingobjectproperty_cast<QUmlActivityEdge *>(containedEdge));
+    qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->addContainedEdge(qmodelingelementproperty_cast<QUmlActivityEdge *>(containedEdge));
 }
 
 void QUmlInterruptibleActivityRegionObject::removeContainedEdge(QObject *containedEdge)
 {
-    qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->removeContainedEdge(qmodelingobjectproperty_cast<QUmlActivityEdge *>(containedEdge));
+    qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->removeContainedEdge(qmodelingelementproperty_cast<QUmlActivityEdge *>(containedEdge));
 }
 
 void QUmlInterruptibleActivityRegionObject::addContainedNode(QObject *containedNode)
 {
-    qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->addContainedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(containedNode));
+    qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->addContainedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(containedNode));
 }
 
 void QUmlInterruptibleActivityRegionObject::removeContainedNode(QObject *containedNode)
 {
-    qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->removeContainedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(containedNode));
+    qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->removeContainedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(containedNode));
 }
 
 void QUmlInterruptibleActivityRegionObject::setInActivity(QObject *inActivity)
 {
-    qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->setInActivity(qmodelingobjectproperty_cast<QUmlActivity *>(inActivity));
+    qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->setInActivity(qmodelingelementproperty_cast<QUmlActivity *>(inActivity));
 }
 
 void QUmlInterruptibleActivityRegionObject::addSubgroup(QObject *subgroup)
 {
-    qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->addSubgroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(subgroup));
+    qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->addSubgroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(subgroup));
 }
 
 void QUmlInterruptibleActivityRegionObject::removeSubgroup(QObject *subgroup)
 {
-    qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->removeSubgroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(subgroup));
+    qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->removeSubgroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(subgroup));
 }
 
 void QUmlInterruptibleActivityRegionObject::setSuperGroup(QObject *superGroup)
 {
-    qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->setSuperGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(superGroup));
+    qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->setSuperGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(superGroup));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [InterruptibleActivityRegion]
 
 void QUmlInterruptibleActivityRegionObject::addInterruptingEdge(QObject *interruptingEdge)
 {
-    qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->addInterruptingEdge(qmodelingobjectproperty_cast<QUmlActivityEdge *>(interruptingEdge));
+    qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->addInterruptingEdge(qmodelingelementproperty_cast<QUmlActivityEdge *>(interruptingEdge));
 }
 
 void QUmlInterruptibleActivityRegionObject::removeInterruptingEdge(QObject *interruptingEdge)
 {
-    qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->removeInterruptingEdge(qmodelingobjectproperty_cast<QUmlActivityEdge *>(interruptingEdge));
+    qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->removeInterruptingEdge(qmodelingelementproperty_cast<QUmlActivityEdge *>(interruptingEdge));
 }
 
 void QUmlInterruptibleActivityRegionObject::addNode(QObject *node)
 {
-    qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->addNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(node));
+    qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->addNode(qmodelingelementproperty_cast<QUmlActivityNode *>(node));
 }
 
 void QUmlInterruptibleActivityRegionObject::removeNode(QObject *node)
 {
-    qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(this)->removeNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(node));
+    qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(this)->removeNode(qmodelingelementproperty_cast<QUmlActivityNode *>(node));
+}
+
+
+void QUmlInterruptibleActivityRegionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityGroup");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("containedEdges"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("containedNodes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inActivity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("subgroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superGroup"))));
+
+    d->propertyGroups << QStringLiteral("QUmlInterruptibleActivityRegion");
+    d->groupProperties.insert(QStringLiteral("QUmlInterruptibleActivityRegion"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interruptingEdges"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInterruptibleActivityRegion"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nodes"))));
+}
+
+void QUmlInterruptibleActivityRegionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterruptibleActivityRegion, interruptingEdges, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterruptibleActivityRegion, interruptingEdges, PropertyClassRole, QStringLiteral("QUmlInterruptibleActivityRegion"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterruptibleActivityRegion, interruptingEdges, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterruptibleActivityRegion, interruptingEdges, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterruptibleActivityRegion, interruptingEdges, DocumentationRole, QStringLiteral("The edges leaving the region that will abort other tokens flowing in the region."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterruptibleActivityRegion, interruptingEdges, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterruptibleActivityRegion, interruptingEdges, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterruptibleActivityRegion, interruptingEdges, OppositeEndRole, QStringLiteral("ActivityEdge-interrupts"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterruptibleActivityRegion, nodes, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterruptibleActivityRegion, nodes, PropertyClassRole, QStringLiteral("QUmlInterruptibleActivityRegion"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterruptibleActivityRegion, nodes, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterruptibleActivityRegion, nodes, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterruptibleActivityRegion, nodes, DocumentationRole, QStringLiteral("Nodes immediately contained in the group."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterruptibleActivityRegion, nodes, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterruptibleActivityRegion, nodes, SubsettedPropertiesRole, QStringLiteral("ActivityGroup-containedNode"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterruptibleActivityRegion, nodes, OppositeEndRole, QStringLiteral("ActivityNode-inInterruptibleRegion"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlinterruptibleactivityregionobject_p.h b/src/uml/qobjects/qumlinterruptibleactivityregionobject_p.h
index a2877dc3..9d6d0cc7 100644
--- a/src/uml/qobjects/qumlinterruptibleactivityregionobject_p.h
+++ b/src/uml/qobjects/qumlinterruptibleactivityregionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlInterruptibleActivityRegion;
-class Q_UML_EXPORT QUmlInterruptibleActivityRegionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlInterruptibleActivityRegionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlInterruptibleActivityRegionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -83,7 +86,7 @@ class Q_UML_EXPORT QUmlInterruptibleActivityRegionObject : public QObject
     Q_PROPERTY(QSet<QObject *> nodes READ nodes)
 
 public:
-    Q_INVOKABLE explicit QUmlInterruptibleActivityRegionObject(QUmlInterruptibleActivityRegion *qModelingObject);
+    Q_INVOKABLE explicit QUmlInterruptibleActivityRegionObject(QUmlInterruptibleActivityRegion *qModelingElement);
     virtual ~QUmlInterruptibleActivityRegionObject();
 
     // Owned attributes [Element]
@@ -153,6 +156,10 @@ public Q_SLOTS:
     void removeInterruptingEdge(QObject *interruptingEdge);
     void addNode(QObject *node);
     void removeNode(QObject *node);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlintervalconstraintobject.cpp b/src/uml/qobjects/qumlintervalconstraintobject.cpp
index f24d689c..991de883 100644
--- a/src/uml/qobjects/qumlintervalconstraintobject.cpp
+++ b/src/uml/qobjects/qumlintervalconstraintobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlintervalconstraintobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlIntervalConstraint>
 #include <QtUml/QUmlComment>
@@ -55,16 +56,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlIntervalConstraintObject::QUmlIntervalConstraintObject(QUmlIntervalConstraint *qModelingObject)
+QUmlIntervalConstraintObject::QUmlIntervalConstraintObject(QUmlIntervalConstraint *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlIntervalConstraintObject::~QUmlIntervalConstraintObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -73,43 +76,43 @@ QUmlIntervalConstraintObject::~QUmlIntervalConstraintObject()
 const QSet<QObject *> QUmlIntervalConstraintObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlIntervalConstraintObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlIntervalConstraintObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlIntervalConstraintObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlIntervalConstraintObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -117,42 +120,42 @@ QObject *QUmlIntervalConstraintObject::templateParameter() const
 const QSet<QObject *> QUmlIntervalConstraintObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlIntervalConstraintObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->name();
 }
 
 QObject *QUmlIntervalConstraintObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlIntervalConstraintObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlIntervalConstraintObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlIntervalConstraintObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Constraint]
@@ -160,27 +163,27 @@ QtUml::VisibilityKind QUmlIntervalConstraintObject::visibility() const
 const QList<QObject *> QUmlIntervalConstraintObject::constrainedElements() const
 {
     QList<QObject *> list;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->constrainedElements())
-        list.append(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->constrainedElements())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 QObject *QUmlIntervalConstraintObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->context()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [IntervalConstraint]
 
 QObject *QUmlIntervalConstraintObject::specification() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->specification())
+    if (!qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->specification())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->specification()->asQObject();
+        return qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->specification()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -188,26 +191,26 @@ QObject *QUmlIntervalConstraintObject::specification() const
 QSet<QObject *> QUmlIntervalConstraintObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlIntervalConstraintObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlIntervalConstraintObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlIntervalConstraintObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [NamedElement]
@@ -215,132 +218,182 @@ bool QUmlIntervalConstraintObject::isTemplateParameter() const
 QList<QObject *> QUmlIntervalConstraintObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlIntervalConstraintObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlIntervalConstraintObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlIntervalConstraintObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlIntervalConstraintObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlIntervalConstraintObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlIntervalConstraintObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlIntervalConstraintObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlIntervalConstraintObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlIntervalConstraintObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlIntervalConstraintObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlIntervalConstraintObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlIntervalConstraintObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlIntervalConstraintObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->setName(name);
 }
 
 void QUmlIntervalConstraintObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlIntervalConstraintObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlIntervalConstraintObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlIntervalConstraintObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->setVisibility(visibility);
 }
 
 void QUmlIntervalConstraintObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Constraint]
 
 void QUmlIntervalConstraintObject::addConstrainedElement(QObject *constrainedElement)
 {
-    qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->addConstrainedElement(qmodelingobjectproperty_cast<QUmlElement *>(constrainedElement));
+    qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->addConstrainedElement(qmodelingelementproperty_cast<QUmlElement *>(constrainedElement));
 }
 
 void QUmlIntervalConstraintObject::removeConstrainedElement(QObject *constrainedElement)
 {
-    qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->removeConstrainedElement(qmodelingobjectproperty_cast<QUmlElement *>(constrainedElement));
+    qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->removeConstrainedElement(qmodelingelementproperty_cast<QUmlElement *>(constrainedElement));
 }
 
 void QUmlIntervalConstraintObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->setContext(qmodelingobjectproperty_cast<QUmlNamespace *>(context));
+    qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->setContext(qmodelingelementproperty_cast<QUmlNamespace *>(context));
 }
 // SLOTS FOR OWNED ATTRIBUTES [IntervalConstraint]
 
 void QUmlIntervalConstraintObject::setSpecification(QObject *specification)
 {
-    qmodelingobjectproperty_cast<QUmlIntervalConstraint *>(this)->setSpecification(qmodelingobjectproperty_cast<QUmlInterval *>(specification));
+    qmodelingelementproperty_cast<QUmlIntervalConstraint *>(this)->setSpecification(qmodelingelementproperty_cast<QUmlInterval *>(specification));
+}
+
+
+void QUmlIntervalConstraintObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlConstraint");
+    d->groupProperties.insert(QStringLiteral("QUmlConstraint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("constrainedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlConstraint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+
+    d->propertyGroups << QStringLiteral("QUmlIntervalConstraint");
+    d->groupProperties.insert(QStringLiteral("QUmlIntervalConstraint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("specification"))));
+}
+
+void QUmlIntervalConstraintObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlIntervalConstraint, specification, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlIntervalConstraint, specification, PropertyClassRole, QStringLiteral("QUmlIntervalConstraint"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlIntervalConstraint, specification, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlIntervalConstraint, specification, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlIntervalConstraint, specification, DocumentationRole, QStringLiteral("A condition that must be true when evaluated in order for the constraint to be satisfied."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlIntervalConstraint, specification, RedefinedPropertiesRole, QStringLiteral("Constraint-specification"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlIntervalConstraint, specification, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlIntervalConstraint, specification, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlintervalconstraintobject_p.h b/src/uml/qobjects/qumlintervalconstraintobject_p.h
index 1d6146b1..a8f557f6 100644
--- a/src/uml/qobjects/qumlintervalconstraintobject_p.h
+++ b/src/uml/qobjects/qumlintervalconstraintobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlIntervalConstraint;
-class Q_UML_EXPORT QUmlIntervalConstraintObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlIntervalConstraintObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlIntervalConstraintObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -85,7 +88,7 @@ class Q_UML_EXPORT QUmlIntervalConstraintObject : public QObject
     Q_PROPERTY(QObject * specification READ specification WRITE setSpecification)
 
 public:
-    Q_INVOKABLE explicit QUmlIntervalConstraintObject(QUmlIntervalConstraint *qModelingObject);
+    Q_INVOKABLE explicit QUmlIntervalConstraintObject(QUmlIntervalConstraint *qModelingElement);
     virtual ~QUmlIntervalConstraintObject();
 
     // Owned attributes [Element]
@@ -160,6 +163,10 @@ public Q_SLOTS:
 
     // Slots for owned attributes [IntervalConstraint]
     void setSpecification(QObject *specification = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlintervalobject.cpp b/src/uml/qobjects/qumlintervalobject.cpp
index dcbda38f..120112d9 100644
--- a/src/uml/qobjects/qumlintervalobject.cpp
+++ b/src/uml/qobjects/qumlintervalobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlintervalobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlInterval>
 #include <QtUml/QUmlComment>
@@ -55,16 +56,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlIntervalObject::QUmlIntervalObject(QUmlInterval *qModelingObject)
+QUmlIntervalObject::QUmlIntervalObject(QUmlInterval *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlIntervalObject::~QUmlIntervalObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlInterval *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlInterval *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -73,25 +76,25 @@ QUmlIntervalObject::~QUmlIntervalObject()
 const QSet<QObject *> QUmlIntervalObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlInterval *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlInterval *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlIntervalObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInterval *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInterval *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlIntervalObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInterval *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlInterval *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInterval *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInterval *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -99,88 +102,88 @@ QObject *QUmlIntervalObject::owner() const
 const QSet<QObject *> QUmlIntervalObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlInterval *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlInterval *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlIntervalObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlInterval *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlInterval *>(this)->name();
 }
 
 QObject *QUmlIntervalObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInterval *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlInterval *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInterval *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInterval *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlIntervalObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInterval *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlInterval *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInterval *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInterval *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlIntervalObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlInterval *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlInterval *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [TypedElement]
 
 QObject *QUmlIntervalObject::type() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInterval *>(this)->type())
+    if (!qmodelingelementproperty_cast<QUmlInterval *>(this)->type())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInterval *>(this)->type()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInterval *>(this)->type()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlIntervalObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInterval *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlInterval *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInterval *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInterval *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlIntervalObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInterval *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlInterval *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInterval *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInterval *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlIntervalObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlInterval *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlInterval *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Interval]
 
 QObject *QUmlIntervalObject::max() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInterval *>(this)->max())
+    if (!qmodelingelementproperty_cast<QUmlInterval *>(this)->max())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInterval *>(this)->max()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInterval *>(this)->max()->asQModelingObject();
 }
 
 QObject *QUmlIntervalObject::min() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlInterval *>(this)->min())
+    if (!qmodelingelementproperty_cast<QUmlInterval *>(this)->min())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlInterval *>(this)->min()->asQObject();
+        return qmodelingelementproperty_cast<QUmlInterval *>(this)->min()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -188,14 +191,14 @@ QObject *QUmlIntervalObject::min() const
 QSet<QObject *> QUmlIntervalObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlInterval *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlInterval *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlIntervalObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlInterval *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlInterval *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -203,177 +206,238 @@ bool QUmlIntervalObject::mustBeOwned() const
 QList<QObject *> QUmlIntervalObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlInterval *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlInterval *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlIntervalObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlInterval *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlInterval *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlIntervalObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlInterval *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlInterval *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlIntervalObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlInterval *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlInterval *>(this)->separator();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlIntervalObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlInterval *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlInterval *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [ValueSpecification]
 
 bool QUmlIntervalObject::booleanValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlInterval *>(this)->booleanValue();
+    return qmodelingelementproperty_cast<QUmlInterval *>(this)->booleanValue();
 }
 
 int QUmlIntervalObject::integerValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlInterval *>(this)->integerValue();
+    return qmodelingelementproperty_cast<QUmlInterval *>(this)->integerValue();
 }
 
 bool QUmlIntervalObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlInterval *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlInterval *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlIntervalObject::isComputable() const
 {
-    return qmodelingobjectproperty_cast<QUmlInterval *>(this)->isComputable();
+    return qmodelingelementproperty_cast<QUmlInterval *>(this)->isComputable();
 }
 
 bool QUmlIntervalObject::isNull() const
 {
-    return qmodelingobjectproperty_cast<QUmlInterval *>(this)->isNull();
+    return qmodelingelementproperty_cast<QUmlInterval *>(this)->isNull();
 }
 
 double QUmlIntervalObject::realValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlInterval *>(this)->realValue();
+    return qmodelingelementproperty_cast<QUmlInterval *>(this)->realValue();
 }
 
 QString QUmlIntervalObject::stringValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlInterval *>(this)->stringValue();
+    return qmodelingelementproperty_cast<QUmlInterval *>(this)->stringValue();
 }
 
 int QUmlIntervalObject::unlimitedValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlInterval *>(this)->unlimitedValue();
+    return qmodelingelementproperty_cast<QUmlInterval *>(this)->unlimitedValue();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlIntervalObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlInterval *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlInterval *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlIntervalObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlInterval *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlInterval *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlIntervalObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInterval *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlInterval *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlIntervalObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlInterval *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlInterval *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlIntervalObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlInterval *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlInterval *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlIntervalObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlInterval *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlInterval *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlIntervalObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlInterval *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlInterval *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlIntervalObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlInterval *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlInterval *>(this)->setName(name);
 }
 
 void QUmlIntervalObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlInterval *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlInterval *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlIntervalObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlInterval *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlInterval *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlIntervalObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlInterval *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlInterval *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [TypedElement]
 
 void QUmlIntervalObject::setType(QObject *type)
 {
-    qmodelingobjectproperty_cast<QUmlInterval *>(this)->setType(qmodelingobjectproperty_cast<QUmlType *>(type));
+    qmodelingelementproperty_cast<QUmlInterval *>(this)->setType(qmodelingelementproperty_cast<QUmlType *>(type));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlIntervalObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlInterval *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlInterval *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlIntervalObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlInterval *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlInterval *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlIntervalObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlInterval *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlInterval *>(this)->setVisibility(visibility);
 }
 
 void QUmlIntervalObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlInterval *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Interval]
 
 void QUmlIntervalObject::setMax(QObject *max)
 {
-    qmodelingobjectproperty_cast<QUmlInterval *>(this)->setMax(qmodelingobjectproperty_cast<QUmlValueSpecification *>(max));
+    qmodelingelementproperty_cast<QUmlInterval *>(this)->setMax(qmodelingelementproperty_cast<QUmlValueSpecification *>(max));
 }
 
 void QUmlIntervalObject::setMin(QObject *min)
 {
-    qmodelingobjectproperty_cast<QUmlInterval *>(this)->setMin(qmodelingobjectproperty_cast<QUmlValueSpecification *>(min));
+    qmodelingelementproperty_cast<QUmlInterval *>(this)->setMin(qmodelingelementproperty_cast<QUmlValueSpecification *>(min));
+}
+
+
+void QUmlIntervalObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTypedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlValueSpecification");
+
+    d->propertyGroups << QStringLiteral("QUmlInterval");
+    d->groupProperties.insert(QStringLiteral("QUmlInterval"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("max"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInterval"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("min"))));
+}
+
+void QUmlIntervalObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterval, max, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterval, max, PropertyClassRole, QStringLiteral("QUmlInterval"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterval, max, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterval, max, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterval, max, DocumentationRole, QStringLiteral("Refers to the ValueSpecification denoting the maximum value of the range."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterval, max, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterval, max, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterval, max, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterval, min, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterval, min, PropertyClassRole, QStringLiteral("QUmlInterval"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterval, min, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterval, min, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterval, min, DocumentationRole, QStringLiteral("Refers to the ValueSpecification denoting the minimum value of the range."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterval, min, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterval, min, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlInterval, min, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlintervalobject_p.h b/src/uml/qobjects/qumlintervalobject_p.h
index 1cb149e3..c3b556e8 100644
--- a/src/uml/qobjects/qumlintervalobject_p.h
+++ b/src/uml/qobjects/qumlintervalobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlInterval;
-class Q_UML_EXPORT QUmlIntervalObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlIntervalObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlIntervalObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -85,7 +88,7 @@ class Q_UML_EXPORT QUmlIntervalObject : public QObject
     Q_PROPERTY(QObject * min READ min WRITE setMin)
 
 public:
-    Q_INVOKABLE explicit QUmlIntervalObject(QUmlInterval *qModelingObject);
+    Q_INVOKABLE explicit QUmlIntervalObject(QUmlInterval *qModelingElement);
     virtual ~QUmlIntervalObject();
 
     // Owned attributes [Element]
@@ -168,6 +171,10 @@ public Q_SLOTS:
     // Slots for owned attributes [Interval]
     void setMax(QObject *max = 0);
     void setMin(QObject *min = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumljoinnodeobject.cpp b/src/uml/qobjects/qumljoinnodeobject.cpp
index 6421fb04..ad1ce965 100644
--- a/src/uml/qobjects/qumljoinnodeobject.cpp
+++ b/src/uml/qobjects/qumljoinnodeobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumljoinnodeobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlJoinNode>
 #include <QtUml/QUmlActivity>
@@ -61,16 +62,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlJoinNodeObject::QUmlJoinNodeObject(QUmlJoinNode *qModelingObject)
+QUmlJoinNodeObject::QUmlJoinNodeObject(QUmlJoinNode *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlJoinNodeObject::~QUmlJoinNodeObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlJoinNode *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -79,25 +82,25 @@ QUmlJoinNodeObject::~QUmlJoinNodeObject()
 const QSet<QObject *> QUmlJoinNodeObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlJoinNode *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlJoinNodeObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlJoinNode *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlJoinNodeObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlJoinNode *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlJoinNode *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -105,62 +108,62 @@ QObject *QUmlJoinNodeObject::owner() const
 const QSet<QObject *> QUmlJoinNodeObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlJoinNode *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlJoinNodeObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlJoinNode *>(this)->name();
 }
 
 QObject *QUmlJoinNodeObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlJoinNode *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlJoinNode *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlJoinNodeObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlJoinNode *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlJoinNode *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlJoinNodeObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlJoinNode *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlJoinNodeObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlJoinNode *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlJoinNodeObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlJoinNode *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlJoinNodeObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlJoinNode *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlJoinNodeObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlJoinNode *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -168,65 +171,65 @@ const QSet<QObject *> QUmlJoinNodeObject::redefinitionContexts() const
 
 QObject *QUmlJoinNodeObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlJoinNode *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlJoinNode *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlJoinNodeObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlJoinNode *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlJoinNodeObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlJoinNode *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlJoinNodeObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlJoinNode *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlJoinNodeObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlJoinNode *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlJoinNode *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlJoinNodeObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlJoinNode *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlJoinNodeObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlJoinNode *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlJoinNodeObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlJoinNode *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -234,15 +237,15 @@ const QSet<QObject *> QUmlJoinNodeObject::redefinedNodes() const
 
 bool QUmlJoinNodeObject::isCombineDuplicate() const
 {
-    return qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->isCombineDuplicate();
+    return qmodelingelementproperty_cast<QUmlJoinNode *>(this)->isCombineDuplicate();
 }
 
 QObject *QUmlJoinNodeObject::joinSpec() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->joinSpec())
+    if (!qmodelingelementproperty_cast<QUmlJoinNode *>(this)->joinSpec())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->joinSpec()->asQObject();
+        return qmodelingelementproperty_cast<QUmlJoinNode *>(this)->joinSpec()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -250,14 +253,14 @@ QObject *QUmlJoinNodeObject::joinSpec() const
 QSet<QObject *> QUmlJoinNodeObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlJoinNode *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlJoinNodeObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlJoinNode *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -265,224 +268,292 @@ bool QUmlJoinNodeObject::mustBeOwned() const
 QList<QObject *> QUmlJoinNodeObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlJoinNode *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlJoinNodeObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlJoinNode *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlJoinNodeObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlJoinNode *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlJoinNodeObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlJoinNode *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlJoinNodeObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlJoinNode *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlJoinNodeObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlJoinNode *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlJoinNodeObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlJoinNode *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlJoinNodeObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlJoinNode *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlJoinNodeObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlJoinNode *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlJoinNodeObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlJoinNode *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlJoinNodeObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlJoinNode *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlJoinNodeObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlJoinNode *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlJoinNodeObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlJoinNode *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlJoinNodeObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlJoinNode *>(this)->setName(name);
 }
 
 void QUmlJoinNodeObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlJoinNode *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlJoinNodeObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlJoinNode *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlJoinNodeObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlJoinNode *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlJoinNodeObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlJoinNode *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlJoinNodeObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlJoinNode *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlJoinNodeObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlJoinNodeObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlJoinNode *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlJoinNodeObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlJoinNode *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlJoinNodeObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlJoinNode *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlJoinNodeObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlJoinNode *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlJoinNodeObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlJoinNode *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlJoinNodeObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlJoinNode *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlJoinNodeObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlJoinNode *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlJoinNodeObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlJoinNode *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlJoinNodeObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlJoinNode *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlJoinNodeObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlJoinNode *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlJoinNodeObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlJoinNode *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlJoinNodeObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlJoinNode *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlJoinNodeObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlJoinNode *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlJoinNodeObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlJoinNode *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlJoinNodeObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlJoinNode *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlJoinNodeObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlJoinNode *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlJoinNodeObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlJoinNode *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlJoinNodeObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlJoinNode *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [JoinNode]
 
 void QUmlJoinNodeObject::setCombineDuplicate(bool isCombineDuplicate)
 {
-    qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->setCombineDuplicate(isCombineDuplicate);
+    qmodelingelementproperty_cast<QUmlJoinNode *>(this)->setCombineDuplicate(isCombineDuplicate);
 }
 
 void QUmlJoinNodeObject::unsetCombineDuplicate()
 {
-    qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("combineDuplicate"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("combineDuplicate"));
 }
 
 void QUmlJoinNodeObject::setJoinSpec(QObject *joinSpec)
 {
-    qmodelingobjectproperty_cast<QUmlJoinNode *>(this)->setJoinSpec(qmodelingobjectproperty_cast<QUmlValueSpecification *>(joinSpec));
+    qmodelingelementproperty_cast<QUmlJoinNode *>(this)->setJoinSpec(qmodelingelementproperty_cast<QUmlValueSpecification *>(joinSpec));
+}
+
+
+void QUmlJoinNodeObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlControlNode");
+
+    d->propertyGroups << QStringLiteral("QUmlJoinNode");
+    d->groupProperties.insert(QStringLiteral("QUmlJoinNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isCombineDuplicate"))));
+    d->groupProperties.insert(QStringLiteral("QUmlJoinNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("joinSpec"))));
+}
+
+void QUmlJoinNodeObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlJoinNode, isCombineDuplicate, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlJoinNode, isCombineDuplicate, PropertyClassRole, QStringLiteral("QUmlJoinNode"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlJoinNode, isCombineDuplicate, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlJoinNode, isCombineDuplicate, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlJoinNode, isCombineDuplicate, DocumentationRole, QStringLiteral("Tells whether tokens having objects with the same identity are combined into one by the join."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlJoinNode, isCombineDuplicate, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlJoinNode, isCombineDuplicate, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlJoinNode, isCombineDuplicate, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlJoinNode, joinSpec, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlJoinNode, joinSpec, PropertyClassRole, QStringLiteral("QUmlJoinNode"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlJoinNode, joinSpec, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlJoinNode, joinSpec, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlJoinNode, joinSpec, DocumentationRole, QStringLiteral("A specification giving the conditions under which the join with emit a token. Default is 'and'."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlJoinNode, joinSpec, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlJoinNode, joinSpec, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlJoinNode, joinSpec, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumljoinnodeobject_p.h b/src/uml/qobjects/qumljoinnodeobject_p.h
index 6c3b570a..b0ca69c1 100644
--- a/src/uml/qobjects/qumljoinnodeobject_p.h
+++ b/src/uml/qobjects/qumljoinnodeobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlJoinNode;
-class Q_UML_EXPORT QUmlJoinNodeObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlJoinNodeObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlJoinNodeObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -91,7 +94,7 @@ class Q_UML_EXPORT QUmlJoinNodeObject : public QObject
     Q_PROPERTY(QObject * joinSpec READ joinSpec WRITE setJoinSpec)
 
 public:
-    Q_INVOKABLE explicit QUmlJoinNodeObject(QUmlJoinNode *qModelingObject);
+    Q_INVOKABLE explicit QUmlJoinNodeObject(QUmlJoinNode *qModelingElement);
     virtual ~QUmlJoinNodeObject();
 
     // Owned attributes [Element]
@@ -186,6 +189,10 @@ public Q_SLOTS:
     void setCombineDuplicate(bool isCombineDuplicate);
     void unsetCombineDuplicate();
     void setJoinSpec(QObject *joinSpec = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumllifelineobject.cpp b/src/uml/qobjects/qumllifelineobject.cpp
index 97e23244..c31793d2 100644
--- a/src/uml/qobjects/qumllifelineobject.cpp
+++ b/src/uml/qobjects/qumllifelineobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumllifelineobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlLifeline>
 #include <QtUml/QUmlComment>
@@ -56,16 +57,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlLifelineObject::QUmlLifelineObject(QUmlLifeline *qModelingObject)
+QUmlLifelineObject::QUmlLifelineObject(QUmlLifeline *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlLifelineObject::~QUmlLifelineObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlLifeline *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlLifeline *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -74,25 +77,25 @@ QUmlLifelineObject::~QUmlLifelineObject()
 const QSet<QObject *> QUmlLifelineObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlLifeline *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlLifeline *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlLifelineObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlLifeline *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlLifeline *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlLifelineObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLifeline *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlLifeline *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLifeline *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLifeline *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -100,40 +103,40 @@ QObject *QUmlLifelineObject::owner() const
 const QSet<QObject *> QUmlLifelineObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlLifeline *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlLifeline *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlLifelineObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlLifeline *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlLifeline *>(this)->name();
 }
 
 QObject *QUmlLifelineObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLifeline *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlLifeline *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLifeline *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLifeline *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlLifelineObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLifeline *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlLifeline *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLifeline *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLifeline *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlLifelineObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlLifeline *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlLifeline *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlLifelineObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlLifeline *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlLifeline *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Lifeline]
@@ -141,41 +144,41 @@ QtUml::VisibilityKind QUmlLifelineObject::visibility() const
 const QSet<QObject *> QUmlLifelineObject::coveredBy() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInteractionFragment *element, qmodelingobjectproperty_cast<QUmlLifeline *>(this)->coveredBy())
-        set.insert(element->asQObject());
+    foreach (QUmlInteractionFragment *element, qmodelingelementproperty_cast<QUmlLifeline *>(this)->coveredBy())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlLifelineObject::decomposedAs() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLifeline *>(this)->decomposedAs())
+    if (!qmodelingelementproperty_cast<QUmlLifeline *>(this)->decomposedAs())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLifeline *>(this)->decomposedAs()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLifeline *>(this)->decomposedAs()->asQModelingObject();
 }
 
 QObject *QUmlLifelineObject::interaction() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLifeline *>(this)->interaction())
+    if (!qmodelingelementproperty_cast<QUmlLifeline *>(this)->interaction())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLifeline *>(this)->interaction()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLifeline *>(this)->interaction()->asQModelingObject();
 }
 
 QObject *QUmlLifelineObject::represents() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLifeline *>(this)->represents())
+    if (!qmodelingelementproperty_cast<QUmlLifeline *>(this)->represents())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLifeline *>(this)->represents()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLifeline *>(this)->represents()->asQModelingObject();
 }
 
 QObject *QUmlLifelineObject::selector() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLifeline *>(this)->selector())
+    if (!qmodelingelementproperty_cast<QUmlLifeline *>(this)->selector())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLifeline *>(this)->selector()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLifeline *>(this)->selector()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -183,14 +186,14 @@ QObject *QUmlLifelineObject::selector() const
 QSet<QObject *> QUmlLifelineObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlLifeline *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlLifeline *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlLifelineObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlLifeline *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlLifeline *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -198,123 +201,202 @@ bool QUmlLifelineObject::mustBeOwned() const
 QList<QObject *> QUmlLifelineObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlLifeline *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlLifeline *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlLifelineObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlLifeline *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlLifeline *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlLifelineObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlLifeline *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlLifeline *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlLifelineObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlLifeline *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlLifeline *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlLifelineObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlLifeline *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlLifeline *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlLifelineObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlLifeline *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlLifeline *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlLifelineObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlLifeline *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlLifeline *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlLifelineObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlLifeline *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlLifeline *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlLifelineObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlLifeline *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlLifeline *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlLifelineObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlLifeline *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlLifeline *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlLifelineObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlLifeline *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlLifeline *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlLifelineObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlLifeline *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlLifeline *>(this)->setName(name);
 }
 
 void QUmlLifelineObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlLifeline *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlLifeline *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlLifelineObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlLifeline *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlLifeline *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlLifelineObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlLifeline *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlLifeline *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlLifelineObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlLifeline *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlLifeline *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Lifeline]
 
 void QUmlLifelineObject::addCoveredBy(QObject *coveredBy)
 {
-    qmodelingobjectproperty_cast<QUmlLifeline *>(this)->addCoveredBy(qmodelingobjectproperty_cast<QUmlInteractionFragment *>(coveredBy));
+    qmodelingelementproperty_cast<QUmlLifeline *>(this)->addCoveredBy(qmodelingelementproperty_cast<QUmlInteractionFragment *>(coveredBy));
 }
 
 void QUmlLifelineObject::removeCoveredBy(QObject *coveredBy)
 {
-    qmodelingobjectproperty_cast<QUmlLifeline *>(this)->removeCoveredBy(qmodelingobjectproperty_cast<QUmlInteractionFragment *>(coveredBy));
+    qmodelingelementproperty_cast<QUmlLifeline *>(this)->removeCoveredBy(qmodelingelementproperty_cast<QUmlInteractionFragment *>(coveredBy));
 }
 
 void QUmlLifelineObject::setDecomposedAs(QObject *decomposedAs)
 {
-    qmodelingobjectproperty_cast<QUmlLifeline *>(this)->setDecomposedAs(qmodelingobjectproperty_cast<QUmlPartDecomposition *>(decomposedAs));
+    qmodelingelementproperty_cast<QUmlLifeline *>(this)->setDecomposedAs(qmodelingelementproperty_cast<QUmlPartDecomposition *>(decomposedAs));
 }
 
 void QUmlLifelineObject::setInteraction(QObject *interaction)
 {
-    qmodelingobjectproperty_cast<QUmlLifeline *>(this)->setInteraction(qmodelingobjectproperty_cast<QUmlInteraction *>(interaction));
+    qmodelingelementproperty_cast<QUmlLifeline *>(this)->setInteraction(qmodelingelementproperty_cast<QUmlInteraction *>(interaction));
 }
 
 void QUmlLifelineObject::setRepresents(QObject *represents)
 {
-    qmodelingobjectproperty_cast<QUmlLifeline *>(this)->setRepresents(qmodelingobjectproperty_cast<QUmlConnectableElement *>(represents));
+    qmodelingelementproperty_cast<QUmlLifeline *>(this)->setRepresents(qmodelingelementproperty_cast<QUmlConnectableElement *>(represents));
 }
 
 void QUmlLifelineObject::setSelector(QObject *selector)
 {
-    qmodelingobjectproperty_cast<QUmlLifeline *>(this)->setSelector(qmodelingobjectproperty_cast<QUmlValueSpecification *>(selector));
+    qmodelingelementproperty_cast<QUmlLifeline *>(this)->setSelector(qmodelingelementproperty_cast<QUmlValueSpecification *>(selector));
+}
+
+
+void QUmlLifelineObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlLifeline");
+    d->groupProperties.insert(QStringLiteral("QUmlLifeline"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("coveredBy"))));
+    d->groupProperties.insert(QStringLiteral("QUmlLifeline"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("decomposedAs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlLifeline"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interaction"))));
+    d->groupProperties.insert(QStringLiteral("QUmlLifeline"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("represents"))));
+    d->groupProperties.insert(QStringLiteral("QUmlLifeline"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("selector"))));
+}
+
+void QUmlLifelineObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, coveredBy, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, coveredBy, PropertyClassRole, QStringLiteral("QUmlLifeline"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, coveredBy, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, coveredBy, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, coveredBy, DocumentationRole, QStringLiteral("References the InteractionFragments in which this Lifeline takes part."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, coveredBy, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, coveredBy, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, coveredBy, OppositeEndRole, QStringLiteral("InteractionFragment-covered"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, decomposedAs, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, decomposedAs, PropertyClassRole, QStringLiteral("QUmlLifeline"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, decomposedAs, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, decomposedAs, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, decomposedAs, DocumentationRole, QStringLiteral("References the Interaction that represents the decomposition."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, decomposedAs, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, decomposedAs, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, decomposedAs, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, interaction, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, interaction, PropertyClassRole, QStringLiteral("QUmlLifeline"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, interaction, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, interaction, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, interaction, DocumentationRole, QStringLiteral("References the Interaction enclosing this Lifeline."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, interaction, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, interaction, SubsettedPropertiesRole, QStringLiteral("NamedElement-namespace"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, interaction, OppositeEndRole, QStringLiteral("Interaction-lifeline"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, represents, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, represents, PropertyClassRole, QStringLiteral("QUmlLifeline"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, represents, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, represents, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, represents, DocumentationRole, QStringLiteral("References the ConnectableElement within the classifier that contains the enclosing interaction."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, represents, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, represents, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, represents, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, selector, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, selector, PropertyClassRole, QStringLiteral("QUmlLifeline"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, selector, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, selector, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, selector, DocumentationRole, QStringLiteral("If the referenced ConnectableElement is multivalued, then this specifies the specific individual part within that set."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, selector, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, selector, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLifeline, selector, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumllifelineobject_p.h b/src/uml/qobjects/qumllifelineobject_p.h
index 715e50ae..fa25d673 100644
--- a/src/uml/qobjects/qumllifelineobject_p.h
+++ b/src/uml/qobjects/qumllifelineobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlLifeline;
-class Q_UML_EXPORT QUmlLifelineObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlLifelineObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlLifelineObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -79,7 +82,7 @@ class Q_UML_EXPORT QUmlLifelineObject : public QObject
     Q_PROPERTY(QObject * selector READ selector WRITE setSelector)
 
 public:
-    Q_INVOKABLE explicit QUmlLifelineObject(QUmlLifeline *qModelingObject);
+    Q_INVOKABLE explicit QUmlLifelineObject(QUmlLifeline *qModelingElement);
     virtual ~QUmlLifelineObject();
 
     // Owned attributes [Element]
@@ -137,6 +140,10 @@ public Q_SLOTS:
     void setInteraction(QObject *interaction = 0);
     void setRepresents(QObject *represents = 0);
     void setSelector(QObject *selector = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumllinkendcreationdataobject.cpp b/src/uml/qobjects/qumllinkendcreationdataobject.cpp
index 1e7cb151..13127774 100644
--- a/src/uml/qobjects/qumllinkendcreationdataobject.cpp
+++ b/src/uml/qobjects/qumllinkendcreationdataobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumllinkendcreationdataobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlLinkEndCreationData>
 #include <QtUml/QUmlComment>
@@ -49,16 +50,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlLinkEndCreationDataObject::QUmlLinkEndCreationDataObject(QUmlLinkEndCreationData *qModelingObject)
+QUmlLinkEndCreationDataObject::QUmlLinkEndCreationDataObject(QUmlLinkEndCreationData *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlLinkEndCreationDataObject::~QUmlLinkEndCreationDataObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlLinkEndCreationData *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlLinkEndCreationData *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -67,66 +70,66 @@ QUmlLinkEndCreationDataObject::~QUmlLinkEndCreationDataObject()
 const QSet<QObject *> QUmlLinkEndCreationDataObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlLinkEndCreationData *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlLinkEndCreationData *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlLinkEndCreationDataObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlLinkEndCreationData *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlLinkEndCreationData *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlLinkEndCreationDataObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLinkEndCreationData *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlLinkEndCreationData *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLinkEndCreationData *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLinkEndCreationData *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [LinkEndData]
 
 QObject *QUmlLinkEndCreationDataObject::end() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLinkEndCreationData *>(this)->end())
+    if (!qmodelingelementproperty_cast<QUmlLinkEndCreationData *>(this)->end())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLinkEndCreationData *>(this)->end()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLinkEndCreationData *>(this)->end()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlLinkEndCreationDataObject::qualifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlQualifierValue *element, qmodelingobjectproperty_cast<QUmlLinkEndCreationData *>(this)->qualifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlQualifierValue *element, qmodelingelementproperty_cast<QUmlLinkEndCreationData *>(this)->qualifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlLinkEndCreationDataObject::value() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLinkEndCreationData *>(this)->value())
+    if (!qmodelingelementproperty_cast<QUmlLinkEndCreationData *>(this)->value())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLinkEndCreationData *>(this)->value()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLinkEndCreationData *>(this)->value()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [LinkEndCreationData]
 
 QObject *QUmlLinkEndCreationDataObject::insertAt() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLinkEndCreationData *>(this)->insertAt())
+    if (!qmodelingelementproperty_cast<QUmlLinkEndCreationData *>(this)->insertAt())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLinkEndCreationData *>(this)->insertAt()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLinkEndCreationData *>(this)->insertAt()->asQModelingObject();
 }
 
 bool QUmlLinkEndCreationDataObject::isReplaceAll() const
 {
-    return qmodelingobjectproperty_cast<QUmlLinkEndCreationData *>(this)->isReplaceAll();
+    return qmodelingelementproperty_cast<QUmlLinkEndCreationData *>(this)->isReplaceAll();
 }
 
 // OPERATIONS [Element]
@@ -134,80 +137,127 @@ bool QUmlLinkEndCreationDataObject::isReplaceAll() const
 QSet<QObject *> QUmlLinkEndCreationDataObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlLinkEndCreationData *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlLinkEndCreationData *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlLinkEndCreationDataObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlLinkEndCreationData *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlLinkEndCreationData *>(this)->mustBeOwned();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlLinkEndCreationDataObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlLinkEndCreationData *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlLinkEndCreationData *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlLinkEndCreationDataObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlLinkEndCreationData *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlLinkEndCreationData *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlLinkEndCreationDataObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlLinkEndCreationData *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlLinkEndCreationData *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlLinkEndCreationDataObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlLinkEndCreationData *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlLinkEndCreationData *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlLinkEndCreationDataObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlLinkEndCreationData *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlLinkEndCreationData *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [LinkEndData]
 
 void QUmlLinkEndCreationDataObject::setEnd(QObject *end)
 {
-    qmodelingobjectproperty_cast<QUmlLinkEndCreationData *>(this)->setEnd(qmodelingobjectproperty_cast<QUmlProperty *>(end));
+    qmodelingelementproperty_cast<QUmlLinkEndCreationData *>(this)->setEnd(qmodelingelementproperty_cast<QUmlProperty *>(end));
 }
 
 void QUmlLinkEndCreationDataObject::addQualifier(QObject *qualifier)
 {
-    qmodelingobjectproperty_cast<QUmlLinkEndCreationData *>(this)->addQualifier(qmodelingobjectproperty_cast<QUmlQualifierValue *>(qualifier));
+    qmodelingelementproperty_cast<QUmlLinkEndCreationData *>(this)->addQualifier(qmodelingelementproperty_cast<QUmlQualifierValue *>(qualifier));
 }
 
 void QUmlLinkEndCreationDataObject::removeQualifier(QObject *qualifier)
 {
-    qmodelingobjectproperty_cast<QUmlLinkEndCreationData *>(this)->removeQualifier(qmodelingobjectproperty_cast<QUmlQualifierValue *>(qualifier));
+    qmodelingelementproperty_cast<QUmlLinkEndCreationData *>(this)->removeQualifier(qmodelingelementproperty_cast<QUmlQualifierValue *>(qualifier));
 }
 
 void QUmlLinkEndCreationDataObject::setValue(QObject *value)
 {
-    qmodelingobjectproperty_cast<QUmlLinkEndCreationData *>(this)->setValue(qmodelingobjectproperty_cast<QUmlInputPin *>(value));
+    qmodelingelementproperty_cast<QUmlLinkEndCreationData *>(this)->setValue(qmodelingelementproperty_cast<QUmlInputPin *>(value));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [LinkEndCreationData]
 
 void QUmlLinkEndCreationDataObject::setInsertAt(QObject *insertAt)
 {
-    qmodelingobjectproperty_cast<QUmlLinkEndCreationData *>(this)->setInsertAt(qmodelingobjectproperty_cast<QUmlInputPin *>(insertAt));
+    qmodelingelementproperty_cast<QUmlLinkEndCreationData *>(this)->setInsertAt(qmodelingelementproperty_cast<QUmlInputPin *>(insertAt));
 }
 
 void QUmlLinkEndCreationDataObject::setReplaceAll(bool isReplaceAll)
 {
-    qmodelingobjectproperty_cast<QUmlLinkEndCreationData *>(this)->setReplaceAll(isReplaceAll);
+    qmodelingelementproperty_cast<QUmlLinkEndCreationData *>(this)->setReplaceAll(isReplaceAll);
 }
 
 void QUmlLinkEndCreationDataObject::unsetReplaceAll()
 {
-    qmodelingobjectproperty_cast<QUmlLinkEndCreationData *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("replaceAll"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("replaceAll"));
+}
+
+
+void QUmlLinkEndCreationDataObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlLinkEndData");
+    d->groupProperties.insert(QStringLiteral("QUmlLinkEndData"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("end"))));
+    d->groupProperties.insert(QStringLiteral("QUmlLinkEndData"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlLinkEndData"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("value"))));
+
+    d->propertyGroups << QStringLiteral("QUmlLinkEndCreationData");
+    d->groupProperties.insert(QStringLiteral("QUmlLinkEndCreationData"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("insertAt"))));
+    d->groupProperties.insert(QStringLiteral("QUmlLinkEndCreationData"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isReplaceAll"))));
+}
+
+void QUmlLinkEndCreationDataObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndCreationData, insertAt, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndCreationData, insertAt, PropertyClassRole, QStringLiteral("QUmlLinkEndCreationData"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndCreationData, insertAt, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndCreationData, insertAt, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndCreationData, insertAt, DocumentationRole, QStringLiteral("Specifies where the new link should be inserted for ordered association ends, or where an existing link should be moved to. The type of the input is UnlimitedNatural, but the input cannot be zero. This pin is omitted for association ends that are not ordered."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndCreationData, insertAt, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndCreationData, insertAt, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndCreationData, insertAt, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndCreationData, isReplaceAll, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndCreationData, isReplaceAll, PropertyClassRole, QStringLiteral("QUmlLinkEndCreationData"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndCreationData, isReplaceAll, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndCreationData, isReplaceAll, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndCreationData, isReplaceAll, DocumentationRole, QStringLiteral("Specifies whether the existing links emanating from the object on this end should be destroyed before creating a new link."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndCreationData, isReplaceAll, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndCreationData, isReplaceAll, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndCreationData, isReplaceAll, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumllinkendcreationdataobject_p.h b/src/uml/qobjects/qumllinkendcreationdataobject_p.h
index 2322f68f..7d618b02 100644
--- a/src/uml/qobjects/qumllinkendcreationdataobject_p.h
+++ b/src/uml/qobjects/qumllinkendcreationdataobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 QT_BEGIN_HEADER
 
@@ -52,9 +52,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlLinkEndCreationData;
-class Q_UML_EXPORT QUmlLinkEndCreationDataObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlLinkEndCreationDataObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlLinkEndCreationDataObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -71,7 +74,7 @@ class Q_UML_EXPORT QUmlLinkEndCreationDataObject : public QObject
     Q_PROPERTY(bool isReplaceAll READ isReplaceAll WRITE setReplaceAll RESET unsetReplaceAll)
 
 public:
-    Q_INVOKABLE explicit QUmlLinkEndCreationDataObject(QUmlLinkEndCreationData *qModelingObject);
+    Q_INVOKABLE explicit QUmlLinkEndCreationDataObject(QUmlLinkEndCreationData *qModelingElement);
     virtual ~QUmlLinkEndCreationDataObject();
 
     // Owned attributes [Element]
@@ -111,6 +114,10 @@ public Q_SLOTS:
     void setInsertAt(QObject *insertAt = 0);
     void setReplaceAll(bool isReplaceAll);
     void unsetReplaceAll();
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumllinkenddataobject.cpp b/src/uml/qobjects/qumllinkenddataobject.cpp
index 6dfc8d86..450163fc 100644
--- a/src/uml/qobjects/qumllinkenddataobject.cpp
+++ b/src/uml/qobjects/qumllinkenddataobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumllinkenddataobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlLinkEndData>
 #include <QtUml/QUmlComment>
@@ -49,16 +50,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlLinkEndDataObject::QUmlLinkEndDataObject(QUmlLinkEndData *qModelingObject)
+QUmlLinkEndDataObject::QUmlLinkEndDataObject(QUmlLinkEndData *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlLinkEndDataObject::~QUmlLinkEndDataObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlLinkEndData *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlLinkEndData *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -67,51 +70,51 @@ QUmlLinkEndDataObject::~QUmlLinkEndDataObject()
 const QSet<QObject *> QUmlLinkEndDataObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlLinkEndData *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlLinkEndData *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlLinkEndDataObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlLinkEndData *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlLinkEndData *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlLinkEndDataObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLinkEndData *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlLinkEndData *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLinkEndData *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLinkEndData *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [LinkEndData]
 
 QObject *QUmlLinkEndDataObject::end() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLinkEndData *>(this)->end())
+    if (!qmodelingelementproperty_cast<QUmlLinkEndData *>(this)->end())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLinkEndData *>(this)->end()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLinkEndData *>(this)->end()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlLinkEndDataObject::qualifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlQualifierValue *element, qmodelingobjectproperty_cast<QUmlLinkEndData *>(this)->qualifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlQualifierValue *element, qmodelingelementproperty_cast<QUmlLinkEndData *>(this)->qualifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlLinkEndDataObject::value() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLinkEndData *>(this)->value())
+    if (!qmodelingelementproperty_cast<QUmlLinkEndData *>(this)->value())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLinkEndData *>(this)->value()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLinkEndData *>(this)->value()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -119,63 +122,114 @@ QObject *QUmlLinkEndDataObject::value() const
 QSet<QObject *> QUmlLinkEndDataObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlLinkEndData *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlLinkEndData *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlLinkEndDataObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlLinkEndData *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlLinkEndData *>(this)->mustBeOwned();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlLinkEndDataObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlLinkEndData *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlLinkEndData *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlLinkEndDataObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlLinkEndData *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlLinkEndData *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlLinkEndDataObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlLinkEndData *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlLinkEndData *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlLinkEndDataObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlLinkEndData *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlLinkEndData *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlLinkEndDataObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlLinkEndData *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlLinkEndData *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [LinkEndData]
 
 void QUmlLinkEndDataObject::setEnd(QObject *end)
 {
-    qmodelingobjectproperty_cast<QUmlLinkEndData *>(this)->setEnd(qmodelingobjectproperty_cast<QUmlProperty *>(end));
+    qmodelingelementproperty_cast<QUmlLinkEndData *>(this)->setEnd(qmodelingelementproperty_cast<QUmlProperty *>(end));
 }
 
 void QUmlLinkEndDataObject::addQualifier(QObject *qualifier)
 {
-    qmodelingobjectproperty_cast<QUmlLinkEndData *>(this)->addQualifier(qmodelingobjectproperty_cast<QUmlQualifierValue *>(qualifier));
+    qmodelingelementproperty_cast<QUmlLinkEndData *>(this)->addQualifier(qmodelingelementproperty_cast<QUmlQualifierValue *>(qualifier));
 }
 
 void QUmlLinkEndDataObject::removeQualifier(QObject *qualifier)
 {
-    qmodelingobjectproperty_cast<QUmlLinkEndData *>(this)->removeQualifier(qmodelingobjectproperty_cast<QUmlQualifierValue *>(qualifier));
+    qmodelingelementproperty_cast<QUmlLinkEndData *>(this)->removeQualifier(qmodelingelementproperty_cast<QUmlQualifierValue *>(qualifier));
 }
 
 void QUmlLinkEndDataObject::setValue(QObject *value)
 {
-    qmodelingobjectproperty_cast<QUmlLinkEndData *>(this)->setValue(qmodelingobjectproperty_cast<QUmlInputPin *>(value));
+    qmodelingelementproperty_cast<QUmlLinkEndData *>(this)->setValue(qmodelingelementproperty_cast<QUmlInputPin *>(value));
+}
+
+
+void QUmlLinkEndDataObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlLinkEndData");
+    d->groupProperties.insert(QStringLiteral("QUmlLinkEndData"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("end"))));
+    d->groupProperties.insert(QStringLiteral("QUmlLinkEndData"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlLinkEndData"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("value"))));
+}
+
+void QUmlLinkEndDataObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndData, end, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndData, end, PropertyClassRole, QStringLiteral("QUmlLinkEndData"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndData, end, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndData, end, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndData, end, DocumentationRole, QStringLiteral("Association end for which this link-end data specifies values."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndData, end, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndData, end, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndData, end, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndData, qualifiers, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndData, qualifiers, PropertyClassRole, QStringLiteral("QUmlLinkEndData"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndData, qualifiers, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndData, qualifiers, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndData, qualifiers, DocumentationRole, QStringLiteral("List of qualifier values"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndData, qualifiers, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndData, qualifiers, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndData, qualifiers, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndData, value, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndData, value, PropertyClassRole, QStringLiteral("QUmlLinkEndData"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndData, value, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndData, value, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndData, value, DocumentationRole, QStringLiteral("Input pin that provides the specified object for the given end. This pin is omitted if the link-end data specifies an 'open' end for reading."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndData, value, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndData, value, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndData, value, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumllinkenddataobject_p.h b/src/uml/qobjects/qumllinkenddataobject_p.h
index fc9f7ff9..bc079bc4 100644
--- a/src/uml/qobjects/qumllinkenddataobject_p.h
+++ b/src/uml/qobjects/qumllinkenddataobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 QT_BEGIN_HEADER
 
@@ -52,9 +52,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlLinkEndData;
-class Q_UML_EXPORT QUmlLinkEndDataObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlLinkEndDataObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlLinkEndDataObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -67,7 +70,7 @@ class Q_UML_EXPORT QUmlLinkEndDataObject : public QObject
     Q_PROPERTY(QObject * value READ value WRITE setValue)
 
 public:
-    Q_INVOKABLE explicit QUmlLinkEndDataObject(QUmlLinkEndData *qModelingObject);
+    Q_INVOKABLE explicit QUmlLinkEndDataObject(QUmlLinkEndData *qModelingElement);
     virtual ~QUmlLinkEndDataObject();
 
     // Owned attributes [Element]
@@ -98,6 +101,10 @@ public Q_SLOTS:
     void addQualifier(QObject *qualifier);
     void removeQualifier(QObject *qualifier);
     void setValue(QObject *value = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumllinkenddestructiondataobject.cpp b/src/uml/qobjects/qumllinkenddestructiondataobject.cpp
index 2b111d5a..c012765c 100644
--- a/src/uml/qobjects/qumllinkenddestructiondataobject.cpp
+++ b/src/uml/qobjects/qumllinkenddestructiondataobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumllinkenddestructiondataobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlLinkEndDestructionData>
 #include <QtUml/QUmlComment>
@@ -49,16 +50,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlLinkEndDestructionDataObject::QUmlLinkEndDestructionDataObject(QUmlLinkEndDestructionData *qModelingObject)
+QUmlLinkEndDestructionDataObject::QUmlLinkEndDestructionDataObject(QUmlLinkEndDestructionData *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlLinkEndDestructionDataObject::~QUmlLinkEndDestructionDataObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlLinkEndDestructionData *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlLinkEndDestructionData *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -67,66 +70,66 @@ QUmlLinkEndDestructionDataObject::~QUmlLinkEndDestructionDataObject()
 const QSet<QObject *> QUmlLinkEndDestructionDataObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlLinkEndDestructionData *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlLinkEndDestructionData *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlLinkEndDestructionDataObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlLinkEndDestructionData *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlLinkEndDestructionData *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlLinkEndDestructionDataObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLinkEndDestructionData *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlLinkEndDestructionData *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLinkEndDestructionData *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLinkEndDestructionData *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [LinkEndData]
 
 QObject *QUmlLinkEndDestructionDataObject::end() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLinkEndDestructionData *>(this)->end())
+    if (!qmodelingelementproperty_cast<QUmlLinkEndDestructionData *>(this)->end())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLinkEndDestructionData *>(this)->end()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLinkEndDestructionData *>(this)->end()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlLinkEndDestructionDataObject::qualifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlQualifierValue *element, qmodelingobjectproperty_cast<QUmlLinkEndDestructionData *>(this)->qualifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlQualifierValue *element, qmodelingelementproperty_cast<QUmlLinkEndDestructionData *>(this)->qualifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlLinkEndDestructionDataObject::value() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLinkEndDestructionData *>(this)->value())
+    if (!qmodelingelementproperty_cast<QUmlLinkEndDestructionData *>(this)->value())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLinkEndDestructionData *>(this)->value()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLinkEndDestructionData *>(this)->value()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [LinkEndDestructionData]
 
 QObject *QUmlLinkEndDestructionDataObject::destroyAt() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLinkEndDestructionData *>(this)->destroyAt())
+    if (!qmodelingelementproperty_cast<QUmlLinkEndDestructionData *>(this)->destroyAt())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLinkEndDestructionData *>(this)->destroyAt()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLinkEndDestructionData *>(this)->destroyAt()->asQModelingObject();
 }
 
 bool QUmlLinkEndDestructionDataObject::isDestroyDuplicates() const
 {
-    return qmodelingobjectproperty_cast<QUmlLinkEndDestructionData *>(this)->isDestroyDuplicates();
+    return qmodelingelementproperty_cast<QUmlLinkEndDestructionData *>(this)->isDestroyDuplicates();
 }
 
 // OPERATIONS [Element]
@@ -134,80 +137,127 @@ bool QUmlLinkEndDestructionDataObject::isDestroyDuplicates() const
 QSet<QObject *> QUmlLinkEndDestructionDataObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlLinkEndDestructionData *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlLinkEndDestructionData *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlLinkEndDestructionDataObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlLinkEndDestructionData *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlLinkEndDestructionData *>(this)->mustBeOwned();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlLinkEndDestructionDataObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlLinkEndDestructionData *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlLinkEndDestructionData *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlLinkEndDestructionDataObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlLinkEndDestructionData *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlLinkEndDestructionData *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlLinkEndDestructionDataObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlLinkEndDestructionData *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlLinkEndDestructionData *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlLinkEndDestructionDataObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlLinkEndDestructionData *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlLinkEndDestructionData *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlLinkEndDestructionDataObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlLinkEndDestructionData *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlLinkEndDestructionData *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [LinkEndData]
 
 void QUmlLinkEndDestructionDataObject::setEnd(QObject *end)
 {
-    qmodelingobjectproperty_cast<QUmlLinkEndDestructionData *>(this)->setEnd(qmodelingobjectproperty_cast<QUmlProperty *>(end));
+    qmodelingelementproperty_cast<QUmlLinkEndDestructionData *>(this)->setEnd(qmodelingelementproperty_cast<QUmlProperty *>(end));
 }
 
 void QUmlLinkEndDestructionDataObject::addQualifier(QObject *qualifier)
 {
-    qmodelingobjectproperty_cast<QUmlLinkEndDestructionData *>(this)->addQualifier(qmodelingobjectproperty_cast<QUmlQualifierValue *>(qualifier));
+    qmodelingelementproperty_cast<QUmlLinkEndDestructionData *>(this)->addQualifier(qmodelingelementproperty_cast<QUmlQualifierValue *>(qualifier));
 }
 
 void QUmlLinkEndDestructionDataObject::removeQualifier(QObject *qualifier)
 {
-    qmodelingobjectproperty_cast<QUmlLinkEndDestructionData *>(this)->removeQualifier(qmodelingobjectproperty_cast<QUmlQualifierValue *>(qualifier));
+    qmodelingelementproperty_cast<QUmlLinkEndDestructionData *>(this)->removeQualifier(qmodelingelementproperty_cast<QUmlQualifierValue *>(qualifier));
 }
 
 void QUmlLinkEndDestructionDataObject::setValue(QObject *value)
 {
-    qmodelingobjectproperty_cast<QUmlLinkEndDestructionData *>(this)->setValue(qmodelingobjectproperty_cast<QUmlInputPin *>(value));
+    qmodelingelementproperty_cast<QUmlLinkEndDestructionData *>(this)->setValue(qmodelingelementproperty_cast<QUmlInputPin *>(value));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [LinkEndDestructionData]
 
 void QUmlLinkEndDestructionDataObject::setDestroyAt(QObject *destroyAt)
 {
-    qmodelingobjectproperty_cast<QUmlLinkEndDestructionData *>(this)->setDestroyAt(qmodelingobjectproperty_cast<QUmlInputPin *>(destroyAt));
+    qmodelingelementproperty_cast<QUmlLinkEndDestructionData *>(this)->setDestroyAt(qmodelingelementproperty_cast<QUmlInputPin *>(destroyAt));
 }
 
 void QUmlLinkEndDestructionDataObject::setDestroyDuplicates(bool isDestroyDuplicates)
 {
-    qmodelingobjectproperty_cast<QUmlLinkEndDestructionData *>(this)->setDestroyDuplicates(isDestroyDuplicates);
+    qmodelingelementproperty_cast<QUmlLinkEndDestructionData *>(this)->setDestroyDuplicates(isDestroyDuplicates);
 }
 
 void QUmlLinkEndDestructionDataObject::unsetDestroyDuplicates()
 {
-    qmodelingobjectproperty_cast<QUmlLinkEndDestructionData *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("destroyDuplicates"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("destroyDuplicates"));
+}
+
+
+void QUmlLinkEndDestructionDataObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlLinkEndData");
+    d->groupProperties.insert(QStringLiteral("QUmlLinkEndData"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("end"))));
+    d->groupProperties.insert(QStringLiteral("QUmlLinkEndData"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlLinkEndData"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("value"))));
+
+    d->propertyGroups << QStringLiteral("QUmlLinkEndDestructionData");
+    d->groupProperties.insert(QStringLiteral("QUmlLinkEndDestructionData"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("destroyAt"))));
+    d->groupProperties.insert(QStringLiteral("QUmlLinkEndDestructionData"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isDestroyDuplicates"))));
+}
+
+void QUmlLinkEndDestructionDataObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndDestructionData, destroyAt, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndDestructionData, destroyAt, PropertyClassRole, QStringLiteral("QUmlLinkEndDestructionData"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndDestructionData, destroyAt, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndDestructionData, destroyAt, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndDestructionData, destroyAt, DocumentationRole, QStringLiteral("Specifies the position of an existing link to be destroyed in ordered nonunique association ends. The type of the pin is UnlimitedNatural, but the value cannot be zero or unlimited."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndDestructionData, destroyAt, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndDestructionData, destroyAt, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndDestructionData, destroyAt, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndDestructionData, isDestroyDuplicates, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndDestructionData, isDestroyDuplicates, PropertyClassRole, QStringLiteral("QUmlLinkEndDestructionData"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndDestructionData, isDestroyDuplicates, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndDestructionData, isDestroyDuplicates, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndDestructionData, isDestroyDuplicates, DocumentationRole, QStringLiteral("Specifies whether to destroy duplicates of the value in nonunique association ends."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndDestructionData, isDestroyDuplicates, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndDestructionData, isDestroyDuplicates, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLinkEndDestructionData, isDestroyDuplicates, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumllinkenddestructiondataobject_p.h b/src/uml/qobjects/qumllinkenddestructiondataobject_p.h
index 7626deb0..f5f3bba6 100644
--- a/src/uml/qobjects/qumllinkenddestructiondataobject_p.h
+++ b/src/uml/qobjects/qumllinkenddestructiondataobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 QT_BEGIN_HEADER
 
@@ -52,9 +52,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlLinkEndDestructionData;
-class Q_UML_EXPORT QUmlLinkEndDestructionDataObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlLinkEndDestructionDataObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlLinkEndDestructionDataObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -71,7 +74,7 @@ class Q_UML_EXPORT QUmlLinkEndDestructionDataObject : public QObject
     Q_PROPERTY(bool isDestroyDuplicates READ isDestroyDuplicates WRITE setDestroyDuplicates RESET unsetDestroyDuplicates)
 
 public:
-    Q_INVOKABLE explicit QUmlLinkEndDestructionDataObject(QUmlLinkEndDestructionData *qModelingObject);
+    Q_INVOKABLE explicit QUmlLinkEndDestructionDataObject(QUmlLinkEndDestructionData *qModelingElement);
     virtual ~QUmlLinkEndDestructionDataObject();
 
     // Owned attributes [Element]
@@ -111,6 +114,10 @@ public Q_SLOTS:
     void setDestroyAt(QObject *destroyAt = 0);
     void setDestroyDuplicates(bool isDestroyDuplicates);
     void unsetDestroyDuplicates();
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlliteralbooleanobject.cpp b/src/uml/qobjects/qumlliteralbooleanobject.cpp
index 69c3a0d2..e84cc8e1 100644
--- a/src/uml/qobjects/qumlliteralbooleanobject.cpp
+++ b/src/uml/qobjects/qumlliteralbooleanobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlliteralbooleanobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlLiteralBoolean>
 #include <QtUml/QUmlComment>
@@ -54,16 +55,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlLiteralBooleanObject::QUmlLiteralBooleanObject(QUmlLiteralBoolean *qModelingObject)
+QUmlLiteralBooleanObject::QUmlLiteralBooleanObject(QUmlLiteralBoolean *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlLiteralBooleanObject::~QUmlLiteralBooleanObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -72,25 +75,25 @@ QUmlLiteralBooleanObject::~QUmlLiteralBooleanObject()
 const QSet<QObject *> QUmlLiteralBooleanObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlLiteralBooleanObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlLiteralBooleanObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -98,77 +101,77 @@ QObject *QUmlLiteralBooleanObject::owner() const
 const QSet<QObject *> QUmlLiteralBooleanObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlLiteralBooleanObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->name();
 }
 
 QObject *QUmlLiteralBooleanObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlLiteralBooleanObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlLiteralBooleanObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [TypedElement]
 
 QObject *QUmlLiteralBooleanObject::type() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->type())
+    if (!qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->type())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->type()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->type()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlLiteralBooleanObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlLiteralBooleanObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlLiteralBooleanObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [LiteralBoolean]
 
 bool QUmlLiteralBooleanObject::value() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->value();
+    return qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->value();
 }
 
 // OPERATIONS [Element]
@@ -176,14 +179,14 @@ bool QUmlLiteralBooleanObject::value() const
 QSet<QObject *> QUmlLiteralBooleanObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlLiteralBooleanObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -191,179 +194,233 @@ bool QUmlLiteralBooleanObject::mustBeOwned() const
 QList<QObject *> QUmlLiteralBooleanObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlLiteralBooleanObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlLiteralBooleanObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlLiteralBooleanObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->separator();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlLiteralBooleanObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [ValueSpecification]
 
 int QUmlLiteralBooleanObject::integerValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->integerValue();
+    return qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->integerValue();
 }
 
 bool QUmlLiteralBooleanObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlLiteralBooleanObject::isNull() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->isNull();
+    return qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->isNull();
 }
 
 double QUmlLiteralBooleanObject::realValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->realValue();
+    return qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->realValue();
 }
 
 QString QUmlLiteralBooleanObject::stringValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->stringValue();
+    return qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->stringValue();
 }
 
 int QUmlLiteralBooleanObject::unlimitedValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->unlimitedValue();
+    return qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->unlimitedValue();
 }
 
 // OPERATIONS [LiteralBoolean]
 
 bool QUmlLiteralBooleanObject::booleanValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->booleanValue();
+    return qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->booleanValue();
 }
 
 bool QUmlLiteralBooleanObject::isComputable() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->isComputable();
+    return qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->isComputable();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlLiteralBooleanObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlLiteralBooleanObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlLiteralBooleanObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlLiteralBooleanObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlLiteralBooleanObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlLiteralBooleanObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlLiteralBooleanObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlLiteralBooleanObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->setName(name);
 }
 
 void QUmlLiteralBooleanObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlLiteralBooleanObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlLiteralBooleanObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [TypedElement]
 
 void QUmlLiteralBooleanObject::setType(QObject *type)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->setType(qmodelingobjectproperty_cast<QUmlType *>(type));
+    qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->setType(qmodelingelementproperty_cast<QUmlType *>(type));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlLiteralBooleanObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlLiteralBooleanObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlLiteralBooleanObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->setVisibility(visibility);
 }
 
 void QUmlLiteralBooleanObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [LiteralBoolean]
 
 void QUmlLiteralBooleanObject::setValue(bool value)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->setValue(value);
+    qmodelingelementproperty_cast<QUmlLiteralBoolean *>(this)->setValue(value);
 }
 
 void QUmlLiteralBooleanObject::unsetValue()
 {
-    qmodelingobjectproperty_cast<QUmlLiteralBoolean *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("value"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("value"));
+}
+
+
+void QUmlLiteralBooleanObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTypedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlValueSpecification");
+
+    d->propertyGroups << QStringLiteral("QUmlLiteralSpecification");
+
+    d->propertyGroups << QStringLiteral("QUmlLiteralBoolean");
+    d->groupProperties.insert(QStringLiteral("QUmlLiteralBoolean"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("value"))));
+}
+
+void QUmlLiteralBooleanObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralBoolean, value, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralBoolean, value, PropertyClassRole, QStringLiteral("QUmlLiteralBoolean"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralBoolean, value, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralBoolean, value, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralBoolean, value, DocumentationRole, QStringLiteral("The specified Boolean value."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralBoolean, value, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralBoolean, value, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralBoolean, value, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlliteralbooleanobject_p.h b/src/uml/qobjects/qumlliteralbooleanobject_p.h
index be0423fe..3b72027b 100644
--- a/src/uml/qobjects/qumlliteralbooleanobject_p.h
+++ b/src/uml/qobjects/qumlliteralbooleanobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlLiteralBoolean;
-class Q_UML_EXPORT QUmlLiteralBooleanObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlLiteralBooleanObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlLiteralBooleanObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -84,7 +87,7 @@ class Q_UML_EXPORT QUmlLiteralBooleanObject : public QObject
     Q_PROPERTY(bool value READ value WRITE setValue RESET unsetValue)
 
 public:
-    Q_INVOKABLE explicit QUmlLiteralBooleanObject(QUmlLiteralBoolean *qModelingObject);
+    Q_INVOKABLE explicit QUmlLiteralBooleanObject(QUmlLiteralBoolean *qModelingElement);
     virtual ~QUmlLiteralBooleanObject();
 
     // Owned attributes [Element]
@@ -168,6 +171,10 @@ public Q_SLOTS:
     // Slots for owned attributes [LiteralBoolean]
     void setValue(bool value);
     void unsetValue();
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlliteralintegerobject.cpp b/src/uml/qobjects/qumlliteralintegerobject.cpp
index 0c7cd5ac..1df152af 100644
--- a/src/uml/qobjects/qumlliteralintegerobject.cpp
+++ b/src/uml/qobjects/qumlliteralintegerobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlliteralintegerobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlLiteralInteger>
 #include <QtUml/QUmlComment>
@@ -54,16 +55,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlLiteralIntegerObject::QUmlLiteralIntegerObject(QUmlLiteralInteger *qModelingObject)
+QUmlLiteralIntegerObject::QUmlLiteralIntegerObject(QUmlLiteralInteger *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlLiteralIntegerObject::~QUmlLiteralIntegerObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -72,25 +75,25 @@ QUmlLiteralIntegerObject::~QUmlLiteralIntegerObject()
 const QSet<QObject *> QUmlLiteralIntegerObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlLiteralIntegerObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlLiteralIntegerObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -98,77 +101,77 @@ QObject *QUmlLiteralIntegerObject::owner() const
 const QSet<QObject *> QUmlLiteralIntegerObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlLiteralIntegerObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->name();
 }
 
 QObject *QUmlLiteralIntegerObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlLiteralIntegerObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlLiteralIntegerObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [TypedElement]
 
 QObject *QUmlLiteralIntegerObject::type() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->type())
+    if (!qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->type())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->type()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->type()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlLiteralIntegerObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlLiteralIntegerObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlLiteralIntegerObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [LiteralInteger]
 
 int QUmlLiteralIntegerObject::value() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->value();
+    return qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->value();
 }
 
 // OPERATIONS [Element]
@@ -176,14 +179,14 @@ int QUmlLiteralIntegerObject::value() const
 QSet<QObject *> QUmlLiteralIntegerObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlLiteralIntegerObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -191,179 +194,233 @@ bool QUmlLiteralIntegerObject::mustBeOwned() const
 QList<QObject *> QUmlLiteralIntegerObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlLiteralIntegerObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlLiteralIntegerObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlLiteralIntegerObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->separator();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlLiteralIntegerObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [ValueSpecification]
 
 bool QUmlLiteralIntegerObject::booleanValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->booleanValue();
+    return qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->booleanValue();
 }
 
 bool QUmlLiteralIntegerObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlLiteralIntegerObject::isNull() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->isNull();
+    return qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->isNull();
 }
 
 double QUmlLiteralIntegerObject::realValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->realValue();
+    return qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->realValue();
 }
 
 QString QUmlLiteralIntegerObject::stringValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->stringValue();
+    return qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->stringValue();
 }
 
 int QUmlLiteralIntegerObject::unlimitedValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->unlimitedValue();
+    return qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->unlimitedValue();
 }
 
 // OPERATIONS [LiteralInteger]
 
 int QUmlLiteralIntegerObject::integerValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->integerValue();
+    return qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->integerValue();
 }
 
 bool QUmlLiteralIntegerObject::isComputable() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->isComputable();
+    return qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->isComputable();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlLiteralIntegerObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlLiteralIntegerObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlLiteralIntegerObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlLiteralIntegerObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlLiteralIntegerObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlLiteralIntegerObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlLiteralIntegerObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlLiteralIntegerObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->setName(name);
 }
 
 void QUmlLiteralIntegerObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlLiteralIntegerObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlLiteralIntegerObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [TypedElement]
 
 void QUmlLiteralIntegerObject::setType(QObject *type)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->setType(qmodelingobjectproperty_cast<QUmlType *>(type));
+    qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->setType(qmodelingelementproperty_cast<QUmlType *>(type));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlLiteralIntegerObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlLiteralIntegerObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlLiteralIntegerObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->setVisibility(visibility);
 }
 
 void QUmlLiteralIntegerObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [LiteralInteger]
 
 void QUmlLiteralIntegerObject::setValue(int value)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->setValue(value);
+    qmodelingelementproperty_cast<QUmlLiteralInteger *>(this)->setValue(value);
 }
 
 void QUmlLiteralIntegerObject::unsetValue()
 {
-    qmodelingobjectproperty_cast<QUmlLiteralInteger *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("value"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("value"));
+}
+
+
+void QUmlLiteralIntegerObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTypedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlValueSpecification");
+
+    d->propertyGroups << QStringLiteral("QUmlLiteralSpecification");
+
+    d->propertyGroups << QStringLiteral("QUmlLiteralInteger");
+    d->groupProperties.insert(QStringLiteral("QUmlLiteralInteger"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("value"))));
+}
+
+void QUmlLiteralIntegerObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralInteger, value, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralInteger, value, PropertyClassRole, QStringLiteral("QUmlLiteralInteger"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralInteger, value, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralInteger, value, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralInteger, value, DocumentationRole, QStringLiteral("The specified Integer value."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralInteger, value, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralInteger, value, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralInteger, value, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlliteralintegerobject_p.h b/src/uml/qobjects/qumlliteralintegerobject_p.h
index 0a676699..3c88a9c1 100644
--- a/src/uml/qobjects/qumlliteralintegerobject_p.h
+++ b/src/uml/qobjects/qumlliteralintegerobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlLiteralInteger;
-class Q_UML_EXPORT QUmlLiteralIntegerObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlLiteralIntegerObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlLiteralIntegerObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -84,7 +87,7 @@ class Q_UML_EXPORT QUmlLiteralIntegerObject : public QObject
     Q_PROPERTY(int value READ value WRITE setValue RESET unsetValue)
 
 public:
-    Q_INVOKABLE explicit QUmlLiteralIntegerObject(QUmlLiteralInteger *qModelingObject);
+    Q_INVOKABLE explicit QUmlLiteralIntegerObject(QUmlLiteralInteger *qModelingElement);
     virtual ~QUmlLiteralIntegerObject();
 
     // Owned attributes [Element]
@@ -168,6 +171,10 @@ public Q_SLOTS:
     // Slots for owned attributes [LiteralInteger]
     void setValue(int value);
     void unsetValue();
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlliteralnullobject.cpp b/src/uml/qobjects/qumlliteralnullobject.cpp
index 48977afe..a42b14d5 100644
--- a/src/uml/qobjects/qumlliteralnullobject.cpp
+++ b/src/uml/qobjects/qumlliteralnullobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlliteralnullobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlLiteralNull>
 #include <QtUml/QUmlComment>
@@ -54,16 +55,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlLiteralNullObject::QUmlLiteralNullObject(QUmlLiteralNull *qModelingObject)
+QUmlLiteralNullObject::QUmlLiteralNullObject(QUmlLiteralNull *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlLiteralNullObject::~QUmlLiteralNullObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -72,25 +75,25 @@ QUmlLiteralNullObject::~QUmlLiteralNullObject()
 const QSet<QObject *> QUmlLiteralNullObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlLiteralNullObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlLiteralNullObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -98,70 +101,70 @@ QObject *QUmlLiteralNullObject::owner() const
 const QSet<QObject *> QUmlLiteralNullObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlLiteralNullObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->name();
 }
 
 QObject *QUmlLiteralNullObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlLiteralNullObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlLiteralNullObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [TypedElement]
 
 QObject *QUmlLiteralNullObject::type() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->type())
+    if (!qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->type())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->type()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->type()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlLiteralNullObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlLiteralNullObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlLiteralNullObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->visibility();
 }
 
 // OPERATIONS [Element]
@@ -169,14 +172,14 @@ QtUml::VisibilityKind QUmlLiteralNullObject::visibility() const
 QSet<QObject *> QUmlLiteralNullObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlLiteralNullObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -184,167 +187,210 @@ bool QUmlLiteralNullObject::mustBeOwned() const
 QList<QObject *> QUmlLiteralNullObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlLiteralNullObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlLiteralNullObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlLiteralNullObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->separator();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlLiteralNullObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [ValueSpecification]
 
 bool QUmlLiteralNullObject::booleanValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->booleanValue();
+    return qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->booleanValue();
 }
 
 int QUmlLiteralNullObject::integerValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->integerValue();
+    return qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->integerValue();
 }
 
 bool QUmlLiteralNullObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 double QUmlLiteralNullObject::realValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->realValue();
+    return qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->realValue();
 }
 
 QString QUmlLiteralNullObject::stringValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->stringValue();
+    return qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->stringValue();
 }
 
 int QUmlLiteralNullObject::unlimitedValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->unlimitedValue();
+    return qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->unlimitedValue();
 }
 
 // OPERATIONS [LiteralNull]
 
 bool QUmlLiteralNullObject::isComputable() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->isComputable();
+    return qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->isComputable();
 }
 
 bool QUmlLiteralNullObject::isNull() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->isNull();
+    return qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->isNull();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlLiteralNullObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlLiteralNullObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlLiteralNullObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlLiteralNullObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlLiteralNullObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlLiteralNullObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlLiteralNullObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlLiteralNullObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->setName(name);
 }
 
 void QUmlLiteralNullObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlLiteralNullObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlLiteralNullObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [TypedElement]
 
 void QUmlLiteralNullObject::setType(QObject *type)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->setType(qmodelingobjectproperty_cast<QUmlType *>(type));
+    qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->setType(qmodelingelementproperty_cast<QUmlType *>(type));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlLiteralNullObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlLiteralNullObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlLiteralNullObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlLiteralNull *>(this)->setVisibility(visibility);
 }
 
 void QUmlLiteralNullObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlLiteralNull *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
+}
+
+
+void QUmlLiteralNullObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTypedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlValueSpecification");
+
+    d->propertyGroups << QStringLiteral("QUmlLiteralSpecification");
+
+    d->propertyGroups << QStringLiteral("QUmlLiteralNull");
+}
+
+void QUmlLiteralNullObject::setPropertyData()
+{
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlliteralnullobject_p.h b/src/uml/qobjects/qumlliteralnullobject_p.h
index e5741d45..8ff2d94b 100644
--- a/src/uml/qobjects/qumlliteralnullobject_p.h
+++ b/src/uml/qobjects/qumlliteralnullobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlLiteralNull;
-class Q_UML_EXPORT QUmlLiteralNullObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlLiteralNullObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlLiteralNullObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -81,7 +84,7 @@ class Q_UML_EXPORT QUmlLiteralNullObject : public QObject
     Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
 public:
-    Q_INVOKABLE explicit QUmlLiteralNullObject(QUmlLiteralNull *qModelingObject);
+    Q_INVOKABLE explicit QUmlLiteralNullObject(QUmlLiteralNull *qModelingElement);
     virtual ~QUmlLiteralNullObject();
 
     // Owned attributes [Element]
@@ -158,6 +161,10 @@ public Q_SLOTS:
     // Slots for owned attributes [PackageableElement]
     void setVisibility(QtUml::VisibilityKind visibility);
     void unsetVisibility();
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlliteralrealobject.cpp b/src/uml/qobjects/qumlliteralrealobject.cpp
index ffb6b013..8592a81d 100644
--- a/src/uml/qobjects/qumlliteralrealobject.cpp
+++ b/src/uml/qobjects/qumlliteralrealobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlliteralrealobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlLiteralReal>
 #include <QtUml/QUmlComment>
@@ -54,16 +55,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlLiteralRealObject::QUmlLiteralRealObject(QUmlLiteralReal *qModelingObject)
+QUmlLiteralRealObject::QUmlLiteralRealObject(QUmlLiteralReal *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlLiteralRealObject::~QUmlLiteralRealObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -72,25 +75,25 @@ QUmlLiteralRealObject::~QUmlLiteralRealObject()
 const QSet<QObject *> QUmlLiteralRealObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlLiteralRealObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlLiteralRealObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -98,77 +101,77 @@ QObject *QUmlLiteralRealObject::owner() const
 const QSet<QObject *> QUmlLiteralRealObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlLiteralRealObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->name();
 }
 
 QObject *QUmlLiteralRealObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlLiteralRealObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlLiteralRealObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [TypedElement]
 
 QObject *QUmlLiteralRealObject::type() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->type())
+    if (!qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->type())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->type()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->type()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlLiteralRealObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlLiteralRealObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlLiteralRealObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [LiteralReal]
 
 double QUmlLiteralRealObject::value() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->value();
+    return qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->value();
 }
 
 // OPERATIONS [Element]
@@ -176,14 +179,14 @@ double QUmlLiteralRealObject::value() const
 QSet<QObject *> QUmlLiteralRealObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlLiteralRealObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -191,174 +194,227 @@ bool QUmlLiteralRealObject::mustBeOwned() const
 QList<QObject *> QUmlLiteralRealObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlLiteralRealObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlLiteralRealObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlLiteralRealObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->separator();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlLiteralRealObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [ValueSpecification]
 
 bool QUmlLiteralRealObject::booleanValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->booleanValue();
+    return qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->booleanValue();
 }
 
 int QUmlLiteralRealObject::integerValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->integerValue();
+    return qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->integerValue();
 }
 
 bool QUmlLiteralRealObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlLiteralRealObject::isNull() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->isNull();
+    return qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->isNull();
 }
 
 QString QUmlLiteralRealObject::stringValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->stringValue();
+    return qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->stringValue();
 }
 
 int QUmlLiteralRealObject::unlimitedValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->unlimitedValue();
+    return qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->unlimitedValue();
 }
 
 // OPERATIONS [LiteralReal]
 
 bool QUmlLiteralRealObject::isComputable() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->isComputable();
+    return qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->isComputable();
 }
 
 double QUmlLiteralRealObject::realValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->realValue();
+    return qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->realValue();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlLiteralRealObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlLiteralRealObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlLiteralRealObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlLiteralRealObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlLiteralRealObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlLiteralRealObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlLiteralRealObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlLiteralRealObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->setName(name);
 }
 
 void QUmlLiteralRealObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlLiteralRealObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlLiteralRealObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [TypedElement]
 
 void QUmlLiteralRealObject::setType(QObject *type)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->setType(qmodelingobjectproperty_cast<QUmlType *>(type));
+    qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->setType(qmodelingelementproperty_cast<QUmlType *>(type));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlLiteralRealObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlLiteralRealObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlLiteralRealObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->setVisibility(visibility);
 }
 
 void QUmlLiteralRealObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [LiteralReal]
 
 void QUmlLiteralRealObject::setValue(double value)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralReal *>(this)->setValue(value);
+    qmodelingelementproperty_cast<QUmlLiteralReal *>(this)->setValue(value);
+}
+
+
+void QUmlLiteralRealObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTypedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlValueSpecification");
+
+    d->propertyGroups << QStringLiteral("QUmlLiteralSpecification");
+
+    d->propertyGroups << QStringLiteral("QUmlLiteralReal");
+    d->groupProperties.insert(QStringLiteral("QUmlLiteralReal"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("value"))));
+}
+
+void QUmlLiteralRealObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralReal, value, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralReal, value, PropertyClassRole, QStringLiteral("QUmlLiteralReal"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralReal, value, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralReal, value, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralReal, value, DocumentationRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralReal, value, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralReal, value, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralReal, value, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlliteralrealobject_p.h b/src/uml/qobjects/qumlliteralrealobject_p.h
index 3971d003..2d295821 100644
--- a/src/uml/qobjects/qumlliteralrealobject_p.h
+++ b/src/uml/qobjects/qumlliteralrealobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlLiteralReal;
-class Q_UML_EXPORT QUmlLiteralRealObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlLiteralRealObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlLiteralRealObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -84,7 +87,7 @@ class Q_UML_EXPORT QUmlLiteralRealObject : public QObject
     Q_PROPERTY(double value READ value WRITE setValue)
 
 public:
-    Q_INVOKABLE explicit QUmlLiteralRealObject(QUmlLiteralReal *qModelingObject);
+    Q_INVOKABLE explicit QUmlLiteralRealObject(QUmlLiteralReal *qModelingElement);
     virtual ~QUmlLiteralRealObject();
 
     // Owned attributes [Element]
@@ -167,6 +170,10 @@ public Q_SLOTS:
 
     // Slots for owned attributes [LiteralReal]
     void setValue(double value);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlliteralstringobject.cpp b/src/uml/qobjects/qumlliteralstringobject.cpp
index f1593e2b..a6818a61 100644
--- a/src/uml/qobjects/qumlliteralstringobject.cpp
+++ b/src/uml/qobjects/qumlliteralstringobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlliteralstringobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlLiteralString>
 #include <QtUml/QUmlComment>
@@ -54,16 +55,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlLiteralStringObject::QUmlLiteralStringObject(QUmlLiteralString *qModelingObject)
+QUmlLiteralStringObject::QUmlLiteralStringObject(QUmlLiteralString *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlLiteralStringObject::~QUmlLiteralStringObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlLiteralString *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -72,25 +75,25 @@ QUmlLiteralStringObject::~QUmlLiteralStringObject()
 const QSet<QObject *> QUmlLiteralStringObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlLiteralString *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlLiteralStringObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlLiteralString *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlLiteralStringObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlLiteralString *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLiteralString *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -98,77 +101,77 @@ QObject *QUmlLiteralStringObject::owner() const
 const QSet<QObject *> QUmlLiteralStringObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlLiteralString *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlLiteralStringObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlLiteralString *>(this)->name();
 }
 
 QObject *QUmlLiteralStringObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlLiteralString *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLiteralString *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlLiteralStringObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlLiteralString *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLiteralString *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlLiteralStringObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlLiteralString *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [TypedElement]
 
 QObject *QUmlLiteralStringObject::type() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->type())
+    if (!qmodelingelementproperty_cast<QUmlLiteralString *>(this)->type())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->type()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLiteralString *>(this)->type()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlLiteralStringObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlLiteralString *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLiteralString *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlLiteralStringObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlLiteralString *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLiteralString *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlLiteralStringObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlLiteralString *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [LiteralString]
 
 QString QUmlLiteralStringObject::value() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->value();
+    return qmodelingelementproperty_cast<QUmlLiteralString *>(this)->value();
 }
 
 // OPERATIONS [Element]
@@ -176,14 +179,14 @@ QString QUmlLiteralStringObject::value() const
 QSet<QObject *> QUmlLiteralStringObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlLiteralString *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlLiteralStringObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlLiteralString *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -191,174 +194,227 @@ bool QUmlLiteralStringObject::mustBeOwned() const
 QList<QObject *> QUmlLiteralStringObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlLiteralString *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlLiteralStringObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlLiteralString *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlLiteralStringObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlLiteralString *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlLiteralStringObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlLiteralString *>(this)->separator();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlLiteralStringObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlLiteralString *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [ValueSpecification]
 
 bool QUmlLiteralStringObject::booleanValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->booleanValue();
+    return qmodelingelementproperty_cast<QUmlLiteralString *>(this)->booleanValue();
 }
 
 int QUmlLiteralStringObject::integerValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->integerValue();
+    return qmodelingelementproperty_cast<QUmlLiteralString *>(this)->integerValue();
 }
 
 bool QUmlLiteralStringObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlLiteralString *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlLiteralStringObject::isNull() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->isNull();
+    return qmodelingelementproperty_cast<QUmlLiteralString *>(this)->isNull();
 }
 
 double QUmlLiteralStringObject::realValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->realValue();
+    return qmodelingelementproperty_cast<QUmlLiteralString *>(this)->realValue();
 }
 
 int QUmlLiteralStringObject::unlimitedValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->unlimitedValue();
+    return qmodelingelementproperty_cast<QUmlLiteralString *>(this)->unlimitedValue();
 }
 
 // OPERATIONS [LiteralString]
 
 bool QUmlLiteralStringObject::isComputable() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->isComputable();
+    return qmodelingelementproperty_cast<QUmlLiteralString *>(this)->isComputable();
 }
 
 QString QUmlLiteralStringObject::stringValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->stringValue();
+    return qmodelingelementproperty_cast<QUmlLiteralString *>(this)->stringValue();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlLiteralStringObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlLiteralString *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlLiteralStringObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlLiteralString *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlLiteralStringObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlLiteralString *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlLiteralStringObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlLiteralString *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlLiteralStringObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlLiteralString *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlLiteralStringObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlLiteralString *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlLiteralStringObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlLiteralString *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlLiteralStringObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlLiteralString *>(this)->setName(name);
 }
 
 void QUmlLiteralStringObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlLiteralString *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlLiteralStringObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlLiteralString *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlLiteralStringObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlLiteralString *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [TypedElement]
 
 void QUmlLiteralStringObject::setType(QObject *type)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->setType(qmodelingobjectproperty_cast<QUmlType *>(type));
+    qmodelingelementproperty_cast<QUmlLiteralString *>(this)->setType(qmodelingelementproperty_cast<QUmlType *>(type));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlLiteralStringObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlLiteralString *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlLiteralStringObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlLiteralString *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlLiteralStringObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlLiteralString *>(this)->setVisibility(visibility);
 }
 
 void QUmlLiteralStringObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [LiteralString]
 
 void QUmlLiteralStringObject::setValue(QString value)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralString *>(this)->setValue(value);
+    qmodelingelementproperty_cast<QUmlLiteralString *>(this)->setValue(value);
+}
+
+
+void QUmlLiteralStringObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTypedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlValueSpecification");
+
+    d->propertyGroups << QStringLiteral("QUmlLiteralSpecification");
+
+    d->propertyGroups << QStringLiteral("QUmlLiteralString");
+    d->groupProperties.insert(QStringLiteral("QUmlLiteralString"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("value"))));
+}
+
+void QUmlLiteralStringObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralString, value, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralString, value, PropertyClassRole, QStringLiteral("QUmlLiteralString"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralString, value, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralString, value, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralString, value, DocumentationRole, QStringLiteral("The specified String value."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralString, value, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralString, value, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralString, value, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlliteralstringobject_p.h b/src/uml/qobjects/qumlliteralstringobject_p.h
index 7fc0b2e2..672de241 100644
--- a/src/uml/qobjects/qumlliteralstringobject_p.h
+++ b/src/uml/qobjects/qumlliteralstringobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlLiteralString;
-class Q_UML_EXPORT QUmlLiteralStringObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlLiteralStringObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlLiteralStringObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -84,7 +87,7 @@ class Q_UML_EXPORT QUmlLiteralStringObject : public QObject
     Q_PROPERTY(QString value READ value WRITE setValue)
 
 public:
-    Q_INVOKABLE explicit QUmlLiteralStringObject(QUmlLiteralString *qModelingObject);
+    Q_INVOKABLE explicit QUmlLiteralStringObject(QUmlLiteralString *qModelingElement);
     virtual ~QUmlLiteralStringObject();
 
     // Owned attributes [Element]
@@ -167,6 +170,10 @@ public Q_SLOTS:
 
     // Slots for owned attributes [LiteralString]
     void setValue(QString value);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlliteralunlimitednaturalobject.cpp b/src/uml/qobjects/qumlliteralunlimitednaturalobject.cpp
index f0a8eb09..928dc1c3 100644
--- a/src/uml/qobjects/qumlliteralunlimitednaturalobject.cpp
+++ b/src/uml/qobjects/qumlliteralunlimitednaturalobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlliteralunlimitednaturalobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlLiteralUnlimitedNatural>
 #include <QtUml/QUmlComment>
@@ -54,16 +55,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlLiteralUnlimitedNaturalObject::QUmlLiteralUnlimitedNaturalObject(QUmlLiteralUnlimitedNatural *qModelingObject)
+QUmlLiteralUnlimitedNaturalObject::QUmlLiteralUnlimitedNaturalObject(QUmlLiteralUnlimitedNatural *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlLiteralUnlimitedNaturalObject::~QUmlLiteralUnlimitedNaturalObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -72,25 +75,25 @@ QUmlLiteralUnlimitedNaturalObject::~QUmlLiteralUnlimitedNaturalObject()
 const QSet<QObject *> QUmlLiteralUnlimitedNaturalObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlLiteralUnlimitedNaturalObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlLiteralUnlimitedNaturalObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -98,77 +101,77 @@ QObject *QUmlLiteralUnlimitedNaturalObject::owner() const
 const QSet<QObject *> QUmlLiteralUnlimitedNaturalObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlLiteralUnlimitedNaturalObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->name();
 }
 
 QObject *QUmlLiteralUnlimitedNaturalObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlLiteralUnlimitedNaturalObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlLiteralUnlimitedNaturalObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [TypedElement]
 
 QObject *QUmlLiteralUnlimitedNaturalObject::type() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->type())
+    if (!qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->type())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->type()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->type()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlLiteralUnlimitedNaturalObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlLiteralUnlimitedNaturalObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlLiteralUnlimitedNaturalObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [LiteralUnlimitedNatural]
 
 int QUmlLiteralUnlimitedNaturalObject::value() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->value();
+    return qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->value();
 }
 
 // OPERATIONS [Element]
@@ -176,14 +179,14 @@ int QUmlLiteralUnlimitedNaturalObject::value() const
 QSet<QObject *> QUmlLiteralUnlimitedNaturalObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlLiteralUnlimitedNaturalObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -191,178 +194,232 @@ bool QUmlLiteralUnlimitedNaturalObject::mustBeOwned() const
 QList<QObject *> QUmlLiteralUnlimitedNaturalObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlLiteralUnlimitedNaturalObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlLiteralUnlimitedNaturalObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlLiteralUnlimitedNaturalObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->separator();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlLiteralUnlimitedNaturalObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [ValueSpecification]
 
 bool QUmlLiteralUnlimitedNaturalObject::booleanValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->booleanValue();
+    return qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->booleanValue();
 }
 
 int QUmlLiteralUnlimitedNaturalObject::integerValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->integerValue();
+    return qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->integerValue();
 }
 
 bool QUmlLiteralUnlimitedNaturalObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlLiteralUnlimitedNaturalObject::isNull() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->isNull();
+    return qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->isNull();
 }
 
 double QUmlLiteralUnlimitedNaturalObject::realValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->realValue();
+    return qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->realValue();
 }
 
 QString QUmlLiteralUnlimitedNaturalObject::stringValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->stringValue();
+    return qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->stringValue();
 }
 // OPERATIONS [LiteralUnlimitedNatural]
 
 bool QUmlLiteralUnlimitedNaturalObject::isComputable() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->isComputable();
+    return qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->isComputable();
 }
 
 int QUmlLiteralUnlimitedNaturalObject::unlimitedValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->unlimitedValue();
+    return qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->unlimitedValue();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlLiteralUnlimitedNaturalObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlLiteralUnlimitedNaturalObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlLiteralUnlimitedNaturalObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlLiteralUnlimitedNaturalObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlLiteralUnlimitedNaturalObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlLiteralUnlimitedNaturalObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlLiteralUnlimitedNaturalObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlLiteralUnlimitedNaturalObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->setName(name);
 }
 
 void QUmlLiteralUnlimitedNaturalObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlLiteralUnlimitedNaturalObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlLiteralUnlimitedNaturalObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [TypedElement]
 
 void QUmlLiteralUnlimitedNaturalObject::setType(QObject *type)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->setType(qmodelingobjectproperty_cast<QUmlType *>(type));
+    qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->setType(qmodelingelementproperty_cast<QUmlType *>(type));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlLiteralUnlimitedNaturalObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlLiteralUnlimitedNaturalObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlLiteralUnlimitedNaturalObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->setVisibility(visibility);
 }
 
 void QUmlLiteralUnlimitedNaturalObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [LiteralUnlimitedNatural]
 
 void QUmlLiteralUnlimitedNaturalObject::setValue(int value)
 {
-    qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->setValue(value);
+    qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->setValue(value);
 }
 
 void QUmlLiteralUnlimitedNaturalObject::unsetValue()
 {
-    qmodelingobjectproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("value"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("value"));
+}
+
+
+void QUmlLiteralUnlimitedNaturalObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTypedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlValueSpecification");
+
+    d->propertyGroups << QStringLiteral("QUmlLiteralSpecification");
+
+    d->propertyGroups << QStringLiteral("QUmlLiteralUnlimitedNatural");
+    d->groupProperties.insert(QStringLiteral("QUmlLiteralUnlimitedNatural"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("value"))));
+}
+
+void QUmlLiteralUnlimitedNaturalObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralUnlimitedNatural, value, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralUnlimitedNatural, value, PropertyClassRole, QStringLiteral("QUmlLiteralUnlimitedNatural"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralUnlimitedNatural, value, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralUnlimitedNatural, value, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralUnlimitedNatural, value, DocumentationRole, QStringLiteral("The specified UnlimitedNatural value."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralUnlimitedNatural, value, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralUnlimitedNatural, value, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLiteralUnlimitedNatural, value, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlliteralunlimitednaturalobject_p.h b/src/uml/qobjects/qumlliteralunlimitednaturalobject_p.h
index 538746e3..69ac309c 100644
--- a/src/uml/qobjects/qumlliteralunlimitednaturalobject_p.h
+++ b/src/uml/qobjects/qumlliteralunlimitednaturalobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlLiteralUnlimitedNatural;
-class Q_UML_EXPORT QUmlLiteralUnlimitedNaturalObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlLiteralUnlimitedNaturalObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlLiteralUnlimitedNaturalObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -84,7 +87,7 @@ class Q_UML_EXPORT QUmlLiteralUnlimitedNaturalObject : public QObject
     Q_PROPERTY(int value READ value WRITE setValue RESET unsetValue)
 
 public:
-    Q_INVOKABLE explicit QUmlLiteralUnlimitedNaturalObject(QUmlLiteralUnlimitedNatural *qModelingObject);
+    Q_INVOKABLE explicit QUmlLiteralUnlimitedNaturalObject(QUmlLiteralUnlimitedNatural *qModelingElement);
     virtual ~QUmlLiteralUnlimitedNaturalObject();
 
     // Owned attributes [Element]
@@ -168,6 +171,10 @@ public Q_SLOTS:
     // Slots for owned attributes [LiteralUnlimitedNatural]
     void setValue(int value);
     void unsetValue();
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlloopnodeobject.cpp b/src/uml/qobjects/qumlloopnodeobject.cpp
index 50330ac3..27bac67e 100644
--- a/src/uml/qobjects/qumlloopnodeobject.cpp
+++ b/src/uml/qobjects/qumlloopnodeobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlloopnodeobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlLoopNode>
 #include <QtUml/QUmlActivity>
@@ -69,16 +70,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlLoopNodeObject::QUmlLoopNodeObject(QUmlLoopNode *qModelingObject)
+QUmlLoopNodeObject::QUmlLoopNodeObject(QUmlLoopNode *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlLoopNodeObject::~QUmlLoopNodeObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlLoopNode *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -87,25 +90,25 @@ QUmlLoopNodeObject::~QUmlLoopNodeObject()
 const QSet<QObject *> QUmlLoopNodeObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlLoopNodeObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlLoopNodeObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlLoopNode *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLoopNode *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -113,62 +116,62 @@ QObject *QUmlLoopNodeObject::owner() const
 const QSet<QObject *> QUmlLoopNodeObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlLoopNodeObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlLoopNode *>(this)->name();
 }
 
 QObject *QUmlLoopNodeObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlLoopNode *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLoopNode *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlLoopNodeObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlLoopNode *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLoopNode *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlLoopNodeObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlLoopNode *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlLoopNodeObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlLoopNode *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlLoopNodeObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlLoopNode *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlLoopNodeObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlLoopNodeObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -177,56 +180,56 @@ const QSet<QObject *> QUmlLoopNodeObject::redefinitionContexts() const
 const QSet<QObject *> QUmlLoopNodeObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlLoopNodeObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlLoopNodeObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlLoopNodeObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlLoopNode *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLoopNode *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlLoopNodeObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlLoopNodeObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlLoopNodeObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -235,8 +238,8 @@ const QSet<QObject *> QUmlLoopNodeObject::redefinedNodes() const
 const QSet<QObject *> QUmlLoopNodeObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -244,46 +247,46 @@ const QSet<QObject *> QUmlLoopNodeObject::handlers() const
 
 QObject *QUmlLoopNodeObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlLoopNode *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLoopNode *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlLoopNodeObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlLoopNodeObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlLoopNode *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlLoopNodeObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlLoopNodeObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlLoopNodeObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -292,48 +295,48 @@ const QList<QObject *> QUmlLoopNodeObject::outputs() const
 const QSet<QObject *> QUmlLoopNodeObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlLoopNodeObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlLoopNodeObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlLoopNodeObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlLoopNodeObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlLoopNodeObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -342,71 +345,71 @@ const QSet<QObject *> QUmlLoopNodeObject::packageImports() const
 const QSet<QObject *> QUmlLoopNodeObject::containedEdges() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->containedEdges())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->containedEdges())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlLoopNodeObject::containedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->containedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->containedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlLoopNodeObject::subgroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->subgroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->subgroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlLoopNodeObject::superGroup() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->superGroup())
+    if (!qmodelingelementproperty_cast<QUmlLoopNode *>(this)->superGroup())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->superGroup()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLoopNode *>(this)->superGroup()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [StructuredActivityNode]
 
 QObject *QUmlLoopNodeObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlLoopNode *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLoopNode *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlLoopNodeObject::edges() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->edges())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->edges())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlLoopNodeObject::mustIsolate() const
 {
-    return qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->mustIsolate();
+    return qmodelingelementproperty_cast<QUmlLoopNode *>(this)->mustIsolate();
 }
 
 const QSet<QObject *> QUmlLoopNodeObject::nodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->nodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->nodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlLoopNodeObject::variables() const
 {
     QSet<QObject *> set;
-    foreach (QUmlVariable *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->variables())
-        set.insert(element->asQObject());
+    foreach (QUmlVariable *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->variables())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -415,69 +418,69 @@ const QSet<QObject *> QUmlLoopNodeObject::variables() const
 const QList<QObject *> QUmlLoopNodeObject::bodyOutputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->bodyOutputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->bodyOutputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QSet<QObject *> QUmlLoopNodeObject::bodyParts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExecutableNode *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->bodyParts())
-        set.insert(element->asQObject());
+    foreach (QUmlExecutableNode *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->bodyParts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlLoopNodeObject::decider() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->decider())
+    if (!qmodelingelementproperty_cast<QUmlLoopNode *>(this)->decider())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->decider()->asQObject();
+        return qmodelingelementproperty_cast<QUmlLoopNode *>(this)->decider()->asQModelingObject();
 }
 
 bool QUmlLoopNodeObject::isTestedFirst() const
 {
-    return qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->isTestedFirst();
+    return qmodelingelementproperty_cast<QUmlLoopNode *>(this)->isTestedFirst();
 }
 
 const QList<QObject *> QUmlLoopNodeObject::loopVariables() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->loopVariables())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->loopVariables())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QList<QObject *> QUmlLoopNodeObject::loopVariableInputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->loopVariableInputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->loopVariableInputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QList<QObject *> QUmlLoopNodeObject::results() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->results())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->results())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QSet<QObject *> QUmlLoopNodeObject::setupParts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExecutableNode *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->setupParts())
-        set.insert(element->asQObject());
+    foreach (QUmlExecutableNode *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->setupParts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlLoopNodeObject::tests() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExecutableNode *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->tests())
-        set.insert(element->asQObject());
+    foreach (QUmlExecutableNode *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->tests())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -486,14 +489,14 @@ const QSet<QObject *> QUmlLoopNodeObject::tests() const
 QSet<QObject *> QUmlLoopNodeObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlLoopNodeObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlLoopNode *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -501,39 +504,39 @@ bool QUmlLoopNodeObject::mustBeOwned() const
 QList<QObject *> QUmlLoopNodeObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlLoopNodeObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlLoopNodeObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlLoopNode *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlLoopNodeObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlLoopNode *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlLoopNodeObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlLoopNode *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlLoopNodeObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlLoopNode *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [Namespace]
@@ -542,497 +545,666 @@ QSet<QObject *> QUmlLoopNodeObject::excludeCollisions(QSet<QObject *> imps) cons
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlLoopNodeObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlLoopNode *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlLoopNodeObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlLoopNode *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlLoopNodeObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlLoopNode *>(this)->membersAreDistinguishable();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlLoopNodeObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlLoopNodeObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlLoopNodeObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlLoopNodeObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlLoopNodeObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlLoopNodeObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlLoopNodeObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlLoopNodeObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->setName(name);
 }
 
 void QUmlLoopNodeObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlLoopNodeObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlLoopNodeObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlLoopNodeObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlLoopNodeObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlLoopNodeObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlLoopNodeObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlLoopNodeObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlLoopNodeObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlLoopNodeObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlLoopNodeObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlLoopNodeObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlLoopNodeObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlLoopNodeObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlLoopNodeObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlLoopNodeObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlLoopNodeObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlLoopNodeObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlLoopNodeObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlLoopNodeObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlLoopNodeObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlLoopNodeObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlLoopNodeObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlLoopNodeObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlLoopNodeObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlLoopNodeObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlLoopNodeObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlLoopNodeObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlLoopNodeObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlLoopNodeObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlLoopNodeObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlLoopNodeObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlLoopNodeObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlLoopNodeObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlLoopNodeObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlLoopNodeObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlLoopNodeObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlLoopNodeObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlLoopNodeObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlLoopNodeObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlLoopNodeObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlLoopNodeObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlLoopNodeObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlLoopNodeObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlLoopNodeObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlLoopNodeObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlLoopNodeObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlLoopNodeObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityGroup]
 
 void QUmlLoopNodeObject::addContainedEdge(QObject *containedEdge)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->addContainedEdge(qmodelingobjectproperty_cast<QUmlActivityEdge *>(containedEdge));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->addContainedEdge(qmodelingelementproperty_cast<QUmlActivityEdge *>(containedEdge));
 }
 
 void QUmlLoopNodeObject::removeContainedEdge(QObject *containedEdge)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->removeContainedEdge(qmodelingobjectproperty_cast<QUmlActivityEdge *>(containedEdge));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->removeContainedEdge(qmodelingelementproperty_cast<QUmlActivityEdge *>(containedEdge));
 }
 
 void QUmlLoopNodeObject::addContainedNode(QObject *containedNode)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->addContainedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(containedNode));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->addContainedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(containedNode));
 }
 
 void QUmlLoopNodeObject::removeContainedNode(QObject *containedNode)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->removeContainedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(containedNode));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->removeContainedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(containedNode));
 }
 
 void QUmlLoopNodeObject::addSubgroup(QObject *subgroup)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->addSubgroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(subgroup));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->addSubgroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(subgroup));
 }
 
 void QUmlLoopNodeObject::removeSubgroup(QObject *subgroup)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->removeSubgroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(subgroup));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->removeSubgroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(subgroup));
 }
 
 void QUmlLoopNodeObject::setSuperGroup(QObject *superGroup)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->setSuperGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(superGroup));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->setSuperGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(superGroup));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [StructuredActivityNode]
 
 void QUmlLoopNodeObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlLoopNodeObject::addEdge(QObject *edge)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->addEdge(qmodelingobjectproperty_cast<QUmlActivityEdge *>(edge));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->addEdge(qmodelingelementproperty_cast<QUmlActivityEdge *>(edge));
 }
 
 void QUmlLoopNodeObject::removeEdge(QObject *edge)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->removeEdge(qmodelingobjectproperty_cast<QUmlActivityEdge *>(edge));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->removeEdge(qmodelingelementproperty_cast<QUmlActivityEdge *>(edge));
 }
 
 void QUmlLoopNodeObject::setMustIsolate(bool mustIsolate)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->setMustIsolate(mustIsolate);
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->setMustIsolate(mustIsolate);
 }
 
 void QUmlLoopNodeObject::unsetMustIsolate()
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("mustIsolate"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("mustIsolate"));
 }
 
 void QUmlLoopNodeObject::addNode(QObject *node)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->addNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(node));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->addNode(qmodelingelementproperty_cast<QUmlActivityNode *>(node));
 }
 
 void QUmlLoopNodeObject::removeNode(QObject *node)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->removeNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(node));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->removeNode(qmodelingelementproperty_cast<QUmlActivityNode *>(node));
 }
 
 void QUmlLoopNodeObject::addVariable(QObject *variable)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->addVariable(qmodelingobjectproperty_cast<QUmlVariable *>(variable));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->addVariable(qmodelingelementproperty_cast<QUmlVariable *>(variable));
 }
 
 void QUmlLoopNodeObject::removeVariable(QObject *variable)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->removeVariable(qmodelingobjectproperty_cast<QUmlVariable *>(variable));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->removeVariable(qmodelingelementproperty_cast<QUmlVariable *>(variable));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [LoopNode]
 
 void QUmlLoopNodeObject::addBodyOutput(QObject *bodyOutput)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->addBodyOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(bodyOutput));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->addBodyOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(bodyOutput));
 }
 
 void QUmlLoopNodeObject::removeBodyOutput(QObject *bodyOutput)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->removeBodyOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(bodyOutput));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->removeBodyOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(bodyOutput));
 }
 
 void QUmlLoopNodeObject::addBodyPart(QObject *bodyPart)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->addBodyPart(qmodelingobjectproperty_cast<QUmlExecutableNode *>(bodyPart));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->addBodyPart(qmodelingelementproperty_cast<QUmlExecutableNode *>(bodyPart));
 }
 
 void QUmlLoopNodeObject::removeBodyPart(QObject *bodyPart)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->removeBodyPart(qmodelingobjectproperty_cast<QUmlExecutableNode *>(bodyPart));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->removeBodyPart(qmodelingelementproperty_cast<QUmlExecutableNode *>(bodyPart));
 }
 
 void QUmlLoopNodeObject::setDecider(QObject *decider)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->setDecider(qmodelingobjectproperty_cast<QUmlOutputPin *>(decider));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->setDecider(qmodelingelementproperty_cast<QUmlOutputPin *>(decider));
 }
 
 void QUmlLoopNodeObject::setTestedFirst(bool isTestedFirst)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->setTestedFirst(isTestedFirst);
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->setTestedFirst(isTestedFirst);
 }
 
 void QUmlLoopNodeObject::unsetTestedFirst()
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("testedFirst"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("testedFirst"));
 }
 
 void QUmlLoopNodeObject::addLoopVariable(QObject *loopVariable)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->addLoopVariable(qmodelingobjectproperty_cast<QUmlOutputPin *>(loopVariable));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->addLoopVariable(qmodelingelementproperty_cast<QUmlOutputPin *>(loopVariable));
 }
 
 void QUmlLoopNodeObject::removeLoopVariable(QObject *loopVariable)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->removeLoopVariable(qmodelingobjectproperty_cast<QUmlOutputPin *>(loopVariable));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->removeLoopVariable(qmodelingelementproperty_cast<QUmlOutputPin *>(loopVariable));
 }
 
 void QUmlLoopNodeObject::addLoopVariableInput(QObject *loopVariableInput)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->addLoopVariableInput(qmodelingobjectproperty_cast<QUmlInputPin *>(loopVariableInput));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->addLoopVariableInput(qmodelingelementproperty_cast<QUmlInputPin *>(loopVariableInput));
 }
 
 void QUmlLoopNodeObject::removeLoopVariableInput(QObject *loopVariableInput)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->removeLoopVariableInput(qmodelingobjectproperty_cast<QUmlInputPin *>(loopVariableInput));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->removeLoopVariableInput(qmodelingelementproperty_cast<QUmlInputPin *>(loopVariableInput));
 }
 
 void QUmlLoopNodeObject::addResult(QObject *result)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->addResult(qmodelingobjectproperty_cast<QUmlOutputPin *>(result));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->addResult(qmodelingelementproperty_cast<QUmlOutputPin *>(result));
 }
 
 void QUmlLoopNodeObject::removeResult(QObject *result)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->removeResult(qmodelingobjectproperty_cast<QUmlOutputPin *>(result));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->removeResult(qmodelingelementproperty_cast<QUmlOutputPin *>(result));
 }
 
 void QUmlLoopNodeObject::addSetupPart(QObject *setupPart)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->addSetupPart(qmodelingobjectproperty_cast<QUmlExecutableNode *>(setupPart));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->addSetupPart(qmodelingelementproperty_cast<QUmlExecutableNode *>(setupPart));
 }
 
 void QUmlLoopNodeObject::removeSetupPart(QObject *setupPart)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->removeSetupPart(qmodelingobjectproperty_cast<QUmlExecutableNode *>(setupPart));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->removeSetupPart(qmodelingelementproperty_cast<QUmlExecutableNode *>(setupPart));
 }
 
 void QUmlLoopNodeObject::addTest(QObject *test)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->addTest(qmodelingobjectproperty_cast<QUmlExecutableNode *>(test));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->addTest(qmodelingelementproperty_cast<QUmlExecutableNode *>(test));
 }
 
 void QUmlLoopNodeObject::removeTest(QObject *test)
 {
-    qmodelingobjectproperty_cast<QUmlLoopNode *>(this)->removeTest(qmodelingobjectproperty_cast<QUmlExecutableNode *>(test));
+    qmodelingelementproperty_cast<QUmlLoopNode *>(this)->removeTest(qmodelingelementproperty_cast<QUmlExecutableNode *>(test));
+}
+
+
+void QUmlLoopNodeObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityGroup");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("containedEdges"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("containedNodes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("subgroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superGroup"))));
+
+    d->propertyGroups << QStringLiteral("QUmlStructuredActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("edges"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("mustIsolate"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nodes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("variables"))));
+
+    d->propertyGroups << QStringLiteral("QUmlLoopNode");
+    d->groupProperties.insert(QStringLiteral("QUmlLoopNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("bodyOutputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlLoopNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("bodyParts"))));
+    d->groupProperties.insert(QStringLiteral("QUmlLoopNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("decider"))));
+    d->groupProperties.insert(QStringLiteral("QUmlLoopNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isTestedFirst"))));
+    d->groupProperties.insert(QStringLiteral("QUmlLoopNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("loopVariables"))));
+    d->groupProperties.insert(QStringLiteral("QUmlLoopNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("loopVariableInputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlLoopNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("results"))));
+    d->groupProperties.insert(QStringLiteral("QUmlLoopNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("setupParts"))));
+    d->groupProperties.insert(QStringLiteral("QUmlLoopNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("tests"))));
+}
+
+void QUmlLoopNodeObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, bodyOutputs, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, bodyOutputs, PropertyClassRole, QStringLiteral("QUmlLoopNode"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, bodyOutputs, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, bodyOutputs, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, bodyOutputs, DocumentationRole, QStringLiteral("A list of output pins within the body fragment the values of which are moved to the loop variable pins after completion of execution of the body, before the next iteration of the loop begins or before the loop exits."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, bodyOutputs, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, bodyOutputs, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, bodyOutputs, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, bodyParts, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, bodyParts, PropertyClassRole, QStringLiteral("QUmlLoopNode"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, bodyParts, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, bodyParts, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, bodyParts, DocumentationRole, QStringLiteral("The set of nodes and edges that perform the repetitive computations of the loop. The body section is executed as long as the test section produces a true value."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, bodyParts, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, bodyParts, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, bodyParts, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, decider, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, decider, PropertyClassRole, QStringLiteral("QUmlLoopNode"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, decider, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, decider, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, decider, DocumentationRole, QStringLiteral("An output pin within the test fragment the value of which is examined after execution of the test to determine whether to execute the loop body."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, decider, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, decider, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, decider, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, isTestedFirst, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, isTestedFirst, PropertyClassRole, QStringLiteral("QUmlLoopNode"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, isTestedFirst, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, isTestedFirst, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, isTestedFirst, DocumentationRole, QStringLiteral("If true, the test is performed before the first execution of the body. If false, the body is executed once before the test is performed."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, isTestedFirst, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, isTestedFirst, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, isTestedFirst, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, loopVariables, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, loopVariables, PropertyClassRole, QStringLiteral("QUmlLoopNode"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, loopVariables, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, loopVariables, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, loopVariables, DocumentationRole, QStringLiteral("A list of output pins that hold the values of the loop variables during an execution of the loop. When the test fails, the values are movied to the result pins of the loop."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, loopVariables, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, loopVariables, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, loopVariables, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, loopVariableInputs, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, loopVariableInputs, PropertyClassRole, QStringLiteral("QUmlLoopNode"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, loopVariableInputs, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, loopVariableInputs, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, loopVariableInputs, DocumentationRole, QStringLiteral("A list of values that are moved into the loop variable pins before the first iteration of the loop."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, loopVariableInputs, RedefinedPropertiesRole, QStringLiteral("StructuredActivityNode-structuredNodeInput"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, loopVariableInputs, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, loopVariableInputs, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, results, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, results, PropertyClassRole, QStringLiteral("QUmlLoopNode"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, results, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, results, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, results, DocumentationRole, QStringLiteral("A list of output pins that constitute the data flow output of the entire loop."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, results, RedefinedPropertiesRole, QStringLiteral("StructuredActivityNode-structuredNodeOutput"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, results, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, results, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, setupParts, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, setupParts, PropertyClassRole, QStringLiteral("QUmlLoopNode"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, setupParts, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, setupParts, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, setupParts, DocumentationRole, QStringLiteral("The set of nodes and edges that initialize values or perform other setup computations for the loop."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, setupParts, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, setupParts, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, setupParts, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, tests, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, tests, PropertyClassRole, QStringLiteral("QUmlLoopNode"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, tests, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, tests, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, tests, DocumentationRole, QStringLiteral("The set of nodes, edges, and designated value that compute a Boolean value to determine if another execution of the body will be performed."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, tests, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, tests, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlLoopNode, tests, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlloopnodeobject_p.h b/src/uml/qobjects/qumlloopnodeobject_p.h
index 71109caf..b26ecbc3 100644
--- a/src/uml/qobjects/qumlloopnodeobject_p.h
+++ b/src/uml/qobjects/qumlloopnodeobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlLoopNode;
-class Q_UML_EXPORT QUmlLoopNodeObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlLoopNodeObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlLoopNodeObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -129,7 +132,7 @@ class Q_UML_EXPORT QUmlLoopNodeObject : public QObject
     Q_PROPERTY(QSet<QObject *> tests READ tests)
 
 public:
-    Q_INVOKABLE explicit QUmlLoopNodeObject(QUmlLoopNode *qModelingObject);
+    Q_INVOKABLE explicit QUmlLoopNodeObject(QUmlLoopNode *qModelingElement);
     virtual ~QUmlLoopNodeObject();
 
     // Owned attributes [Element]
@@ -332,6 +335,10 @@ public Q_SLOTS:
     void removeSetupPart(QObject *setupPart);
     void addTest(QObject *test);
     void removeTest(QObject *test);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlmanifestationobject.cpp b/src/uml/qobjects/qumlmanifestationobject.cpp
index 736a6302..6cc627ab 100644
--- a/src/uml/qobjects/qumlmanifestationobject.cpp
+++ b/src/uml/qobjects/qumlmanifestationobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlmanifestationobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlManifestation>
 #include <QtUml/QUmlComment>
@@ -55,16 +56,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlManifestationObject::QUmlManifestationObject(QUmlManifestation *qModelingObject)
+QUmlManifestationObject::QUmlManifestationObject(QUmlManifestation *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlManifestationObject::~QUmlManifestationObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlManifestation *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlManifestation *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -73,43 +76,43 @@ QUmlManifestationObject::~QUmlManifestationObject()
 const QSet<QObject *> QUmlManifestationObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlManifestation *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlManifestation *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlManifestationObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlManifestation *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlManifestation *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlManifestationObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlManifestation *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlManifestation *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlManifestation *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlManifestation *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlManifestationObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlManifestation *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlManifestation *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlManifestation *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlManifestation *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlManifestationObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlManifestation *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlManifestation *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlManifestation *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlManifestation *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -117,42 +120,42 @@ QObject *QUmlManifestationObject::templateParameter() const
 const QSet<QObject *> QUmlManifestationObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlManifestation *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlManifestation *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlManifestationObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlManifestation *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlManifestation *>(this)->name();
 }
 
 QObject *QUmlManifestationObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlManifestation *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlManifestation *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlManifestation *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlManifestation *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlManifestationObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlManifestation *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlManifestation *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlManifestation *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlManifestation *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlManifestationObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlManifestation *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlManifestation *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlManifestationObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlManifestation *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlManifestation *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Relationship]
@@ -160,8 +163,8 @@ QtUml::VisibilityKind QUmlManifestationObject::visibility() const
 const QSet<QObject *> QUmlManifestationObject::relatedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlManifestation *>(this)->relatedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlManifestation *>(this)->relatedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -170,16 +173,16 @@ const QSet<QObject *> QUmlManifestationObject::relatedElements() const
 const QSet<QObject *> QUmlManifestationObject::sources() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlManifestation *>(this)->sources())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlManifestation *>(this)->sources())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlManifestationObject::targets() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlManifestation *>(this)->targets())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlManifestation *>(this)->targets())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -188,16 +191,16 @@ const QSet<QObject *> QUmlManifestationObject::targets() const
 const QSet<QObject *> QUmlManifestationObject::clients() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlManifestation *>(this)->clients())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlManifestation *>(this)->clients())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlManifestationObject::suppliers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlManifestation *>(this)->suppliers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlManifestation *>(this)->suppliers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -205,20 +208,20 @@ const QSet<QObject *> QUmlManifestationObject::suppliers() const
 
 QObject *QUmlManifestationObject::mapping() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlManifestation *>(this)->mapping())
+    if (!qmodelingelementproperty_cast<QUmlManifestation *>(this)->mapping())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlManifestation *>(this)->mapping()->asQObject();
+        return qmodelingelementproperty_cast<QUmlManifestation *>(this)->mapping()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [Manifestation]
 
 QObject *QUmlManifestationObject::utilizedElement() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlManifestation *>(this)->utilizedElement())
+    if (!qmodelingelementproperty_cast<QUmlManifestation *>(this)->utilizedElement())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlManifestation *>(this)->utilizedElement()->asQObject();
+        return qmodelingelementproperty_cast<QUmlManifestation *>(this)->utilizedElement()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -226,26 +229,26 @@ QObject *QUmlManifestationObject::utilizedElement() const
 QSet<QObject *> QUmlManifestationObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlManifestation *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlManifestation *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlManifestationObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlManifestation *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlManifestation *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlManifestationObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlManifestation *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlManifestation *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlManifestationObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlManifestation *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlManifestation *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [NamedElement]
@@ -253,179 +256,239 @@ bool QUmlManifestationObject::isTemplateParameter() const
 QList<QObject *> QUmlManifestationObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlManifestation *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlManifestation *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlManifestationObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlManifestation *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlManifestation *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlManifestationObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlManifestation *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlManifestation *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlManifestationObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlManifestation *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlManifestation *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlManifestationObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlManifestation *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlManifestation *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlManifestationObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlManifestation *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlManifestation *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlManifestationObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlManifestation *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlManifestation *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlManifestationObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlManifestation *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlManifestation *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlManifestationObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlManifestation *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlManifestation *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlManifestationObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlManifestation *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlManifestation *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlManifestationObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlManifestation *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlManifestation *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlManifestationObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlManifestation *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlManifestation *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlManifestationObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlManifestation *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlManifestation *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlManifestationObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlManifestation *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlManifestation *>(this)->setName(name);
 }
 
 void QUmlManifestationObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlManifestation *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlManifestation *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlManifestationObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlManifestation *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlManifestation *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlManifestationObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlManifestation *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlManifestation *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlManifestationObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlManifestation *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlManifestation *>(this)->setVisibility(visibility);
 }
 
 void QUmlManifestationObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlManifestation *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Relationship]
 
 void QUmlManifestationObject::addRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlManifestation *>(this)->addRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlManifestation *>(this)->addRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 void QUmlManifestationObject::removeRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlManifestation *>(this)->removeRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlManifestation *>(this)->removeRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [DirectedRelationship]
 
 void QUmlManifestationObject::addSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlManifestation *>(this)->addSource(qmodelingobjectproperty_cast<QUmlElement *>(source));
+    qmodelingelementproperty_cast<QUmlManifestation *>(this)->addSource(qmodelingelementproperty_cast<QUmlElement *>(source));
 }
 
 void QUmlManifestationObject::removeSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlManifestation *>(this)->removeSource(qmodelingobjectproperty_cast<QUmlElement *>(source));
+    qmodelingelementproperty_cast<QUmlManifestation *>(this)->removeSource(qmodelingelementproperty_cast<QUmlElement *>(source));
 }
 
 void QUmlManifestationObject::addTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlManifestation *>(this)->addTarget(qmodelingobjectproperty_cast<QUmlElement *>(target));
+    qmodelingelementproperty_cast<QUmlManifestation *>(this)->addTarget(qmodelingelementproperty_cast<QUmlElement *>(target));
 }
 
 void QUmlManifestationObject::removeTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlManifestation *>(this)->removeTarget(qmodelingobjectproperty_cast<QUmlElement *>(target));
+    qmodelingelementproperty_cast<QUmlManifestation *>(this)->removeTarget(qmodelingelementproperty_cast<QUmlElement *>(target));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Dependency]
 
 void QUmlManifestationObject::addClient(QObject *client)
 {
-    qmodelingobjectproperty_cast<QUmlManifestation *>(this)->addClient(qmodelingobjectproperty_cast<QUmlNamedElement *>(client));
+    qmodelingelementproperty_cast<QUmlManifestation *>(this)->addClient(qmodelingelementproperty_cast<QUmlNamedElement *>(client));
 }
 
 void QUmlManifestationObject::removeClient(QObject *client)
 {
-    qmodelingobjectproperty_cast<QUmlManifestation *>(this)->removeClient(qmodelingobjectproperty_cast<QUmlNamedElement *>(client));
+    qmodelingelementproperty_cast<QUmlManifestation *>(this)->removeClient(qmodelingelementproperty_cast<QUmlNamedElement *>(client));
 }
 
 void QUmlManifestationObject::addSupplier(QObject *supplier)
 {
-    qmodelingobjectproperty_cast<QUmlManifestation *>(this)->addSupplier(qmodelingobjectproperty_cast<QUmlNamedElement *>(supplier));
+    qmodelingelementproperty_cast<QUmlManifestation *>(this)->addSupplier(qmodelingelementproperty_cast<QUmlNamedElement *>(supplier));
 }
 
 void QUmlManifestationObject::removeSupplier(QObject *supplier)
 {
-    qmodelingobjectproperty_cast<QUmlManifestation *>(this)->removeSupplier(qmodelingobjectproperty_cast<QUmlNamedElement *>(supplier));
+    qmodelingelementproperty_cast<QUmlManifestation *>(this)->removeSupplier(qmodelingelementproperty_cast<QUmlNamedElement *>(supplier));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Abstraction]
 
 void QUmlManifestationObject::setMapping(QObject *mapping)
 {
-    qmodelingobjectproperty_cast<QUmlManifestation *>(this)->setMapping(qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(mapping));
+    qmodelingelementproperty_cast<QUmlManifestation *>(this)->setMapping(qmodelingelementproperty_cast<QUmlOpaqueExpression *>(mapping));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Manifestation]
 
 void QUmlManifestationObject::setUtilizedElement(QObject *utilizedElement)
 {
-    qmodelingobjectproperty_cast<QUmlManifestation *>(this)->setUtilizedElement(qmodelingobjectproperty_cast<QUmlPackageableElement *>(utilizedElement));
+    qmodelingelementproperty_cast<QUmlManifestation *>(this)->setUtilizedElement(qmodelingelementproperty_cast<QUmlPackageableElement *>(utilizedElement));
+}
+
+
+void QUmlManifestationObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDirectedRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDependency");
+    d->groupProperties.insert(QStringLiteral("QUmlDependency"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clients"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDependency"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("suppliers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAbstraction");
+    d->groupProperties.insert(QStringLiteral("QUmlAbstraction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("mapping"))));
+
+    d->propertyGroups << QStringLiteral("QUmlManifestation");
+    d->groupProperties.insert(QStringLiteral("QUmlManifestation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("utilizedElement"))));
+}
+
+void QUmlManifestationObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlManifestation, utilizedElement, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlManifestation, utilizedElement, PropertyClassRole, QStringLiteral("QUmlManifestation"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlManifestation, utilizedElement, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlManifestation, utilizedElement, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlManifestation, utilizedElement, DocumentationRole, QStringLiteral("The model element that is utilized in the manifestation in an Artifact."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlManifestation, utilizedElement, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlManifestation, utilizedElement, SubsettedPropertiesRole, QStringLiteral("Dependency-supplier"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlManifestation, utilizedElement, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlmanifestationobject_p.h b/src/uml/qobjects/qumlmanifestationobject_p.h
index cef3bc8f..683067b2 100644
--- a/src/uml/qobjects/qumlmanifestationobject_p.h
+++ b/src/uml/qobjects/qumlmanifestationobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlManifestation;
-class Q_UML_EXPORT QUmlManifestationObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlManifestationObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlManifestationObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -95,7 +98,7 @@ class Q_UML_EXPORT QUmlManifestationObject : public QObject
     Q_PROPERTY(QObject * utilizedElement READ utilizedElement WRITE setUtilizedElement)
 
 public:
-    Q_INVOKABLE explicit QUmlManifestationObject(QUmlManifestation *qModelingObject);
+    Q_INVOKABLE explicit QUmlManifestationObject(QUmlManifestation *qModelingElement);
     virtual ~QUmlManifestationObject();
 
     // Owned attributes [Element]
@@ -194,6 +197,10 @@ public Q_SLOTS:
 
     // Slots for owned attributes [Manifestation]
     void setUtilizedElement(QObject *utilizedElement = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlmergenodeobject.cpp b/src/uml/qobjects/qumlmergenodeobject.cpp
index be2221e7..4e67b27c 100644
--- a/src/uml/qobjects/qumlmergenodeobject.cpp
+++ b/src/uml/qobjects/qumlmergenodeobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlmergenodeobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlMergeNode>
 #include <QtUml/QUmlActivity>
@@ -60,16 +61,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlMergeNodeObject::QUmlMergeNodeObject(QUmlMergeNode *qModelingObject)
+QUmlMergeNodeObject::QUmlMergeNodeObject(QUmlMergeNode *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlMergeNodeObject::~QUmlMergeNodeObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlMergeNode *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -78,25 +81,25 @@ QUmlMergeNodeObject::~QUmlMergeNodeObject()
 const QSet<QObject *> QUmlMergeNodeObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlMergeNode *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlMergeNodeObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlMergeNode *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlMergeNodeObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlMergeNode *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlMergeNode *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -104,62 +107,62 @@ QObject *QUmlMergeNodeObject::owner() const
 const QSet<QObject *> QUmlMergeNodeObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlMergeNode *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlMergeNodeObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlMergeNode *>(this)->name();
 }
 
 QObject *QUmlMergeNodeObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlMergeNode *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlMergeNode *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlMergeNodeObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlMergeNode *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlMergeNode *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlMergeNodeObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlMergeNode *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlMergeNodeObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlMergeNode *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlMergeNodeObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlMergeNode *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlMergeNodeObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlMergeNode *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlMergeNodeObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlMergeNode *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -167,65 +170,65 @@ const QSet<QObject *> QUmlMergeNodeObject::redefinitionContexts() const
 
 QObject *QUmlMergeNodeObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlMergeNode *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlMergeNode *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlMergeNodeObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlMergeNode *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlMergeNodeObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlMergeNode *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlMergeNodeObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlMergeNode *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlMergeNodeObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlMergeNode *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlMergeNode *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlMergeNodeObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlMergeNode *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlMergeNodeObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlMergeNode *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlMergeNodeObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlMergeNode *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -234,14 +237,14 @@ const QSet<QObject *> QUmlMergeNodeObject::redefinedNodes() const
 QSet<QObject *> QUmlMergeNodeObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlMergeNode *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlMergeNodeObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlMergeNode *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -249,207 +252,254 @@ bool QUmlMergeNodeObject::mustBeOwned() const
 QList<QObject *> QUmlMergeNodeObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlMergeNode *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlMergeNodeObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlMergeNode *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlMergeNodeObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlMergeNode *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlMergeNodeObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlMergeNode *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlMergeNodeObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlMergeNode *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlMergeNodeObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlMergeNode *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlMergeNodeObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlMergeNode *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlMergeNodeObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlMergeNode *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlMergeNodeObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlMergeNode *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlMergeNodeObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlMergeNode *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlMergeNodeObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlMergeNode *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlMergeNodeObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlMergeNode *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlMergeNodeObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlMergeNode *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlMergeNodeObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlMergeNode *>(this)->setName(name);
 }
 
 void QUmlMergeNodeObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlMergeNode *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlMergeNodeObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlMergeNode *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlMergeNodeObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlMergeNode *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlMergeNodeObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlMergeNode *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlMergeNodeObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlMergeNode *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlMergeNodeObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlMergeNodeObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlMergeNode *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlMergeNodeObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlMergeNode *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlMergeNodeObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlMergeNode *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlMergeNodeObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlMergeNode *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlMergeNodeObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlMergeNode *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlMergeNodeObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlMergeNode *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlMergeNodeObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlMergeNode *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlMergeNodeObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlMergeNode *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlMergeNodeObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlMergeNode *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlMergeNodeObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlMergeNode *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlMergeNodeObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlMergeNode *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlMergeNodeObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlMergeNode *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlMergeNodeObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlMergeNode *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlMergeNodeObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlMergeNode *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlMergeNodeObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlMergeNode *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlMergeNodeObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlMergeNode *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlMergeNodeObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlMergeNode *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlMergeNodeObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlMergeNode *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlMergeNode *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
+}
+
+
+void QUmlMergeNodeObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlControlNode");
+
+    d->propertyGroups << QStringLiteral("QUmlMergeNode");
+}
+
+void QUmlMergeNodeObject::setPropertyData()
+{
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlmergenodeobject_p.h b/src/uml/qobjects/qumlmergenodeobject_p.h
index 4ed12e57..39af4010 100644
--- a/src/uml/qobjects/qumlmergenodeobject_p.h
+++ b/src/uml/qobjects/qumlmergenodeobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlMergeNode;
-class Q_UML_EXPORT QUmlMergeNodeObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlMergeNodeObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlMergeNodeObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -87,7 +90,7 @@ class Q_UML_EXPORT QUmlMergeNodeObject : public QObject
     Q_PROPERTY(QSet<QObject *> redefinedNodes READ redefinedNodes)
 
 public:
-    Q_INVOKABLE explicit QUmlMergeNodeObject(QUmlMergeNode *qModelingObject);
+    Q_INVOKABLE explicit QUmlMergeNodeObject(QUmlMergeNode *qModelingElement);
     virtual ~QUmlMergeNodeObject();
 
     // Owned attributes [Element]
@@ -173,6 +176,10 @@ public Q_SLOTS:
     void removeOutgoing(QObject *outgoing);
     void addRedefinedNode(QObject *redefinedNode);
     void removeRedefinedNode(QObject *redefinedNode);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlmessageobject.cpp b/src/uml/qobjects/qumlmessageobject.cpp
index beb084f4..83c4df86 100644
--- a/src/uml/qobjects/qumlmessageobject.cpp
+++ b/src/uml/qobjects/qumlmessageobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlmessageobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlMessage>
 #include <QtUml/QUmlComment>
@@ -55,16 +56,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlMessageObject::QUmlMessageObject(QUmlMessage *qModelingObject)
+QUmlMessageObject::QUmlMessageObject(QUmlMessage *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlMessageObject::~QUmlMessageObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlMessage *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlMessage *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -73,25 +76,25 @@ QUmlMessageObject::~QUmlMessageObject()
 const QSet<QObject *> QUmlMessageObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlMessage *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlMessage *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlMessageObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlMessage *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlMessage *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlMessageObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlMessage *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlMessage *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlMessage *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlMessage *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -99,40 +102,40 @@ QObject *QUmlMessageObject::owner() const
 const QSet<QObject *> QUmlMessageObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlMessage *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlMessage *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlMessageObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlMessage *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlMessage *>(this)->name();
 }
 
 QObject *QUmlMessageObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlMessage *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlMessage *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlMessage *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlMessage *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlMessageObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlMessage *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlMessage *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlMessage *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlMessage *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlMessageObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlMessage *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlMessage *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlMessageObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlMessage *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlMessage *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Message]
@@ -140,59 +143,59 @@ QtUml::VisibilityKind QUmlMessageObject::visibility() const
 const QList<QObject *> QUmlMessageObject::arguments() const
 {
     QList<QObject *> list;
-    foreach (QUmlValueSpecification *element, qmodelingobjectproperty_cast<QUmlMessage *>(this)->arguments())
-        list.append(element->asQObject());
+    foreach (QUmlValueSpecification *element, qmodelingelementproperty_cast<QUmlMessage *>(this)->arguments())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 QObject *QUmlMessageObject::connector() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlMessage *>(this)->connector())
+    if (!qmodelingelementproperty_cast<QUmlMessage *>(this)->connector())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlMessage *>(this)->connector()->asQObject();
+        return qmodelingelementproperty_cast<QUmlMessage *>(this)->connector()->asQModelingObject();
 }
 
 QObject *QUmlMessageObject::interaction() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlMessage *>(this)->interaction())
+    if (!qmodelingelementproperty_cast<QUmlMessage *>(this)->interaction())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlMessage *>(this)->interaction()->asQObject();
+        return qmodelingelementproperty_cast<QUmlMessage *>(this)->interaction()->asQModelingObject();
 }
 
 QtUml::MessageKind QUmlMessageObject::messageKind() const
 {
-    return qmodelingobjectproperty_cast<QUmlMessage *>(this)->messageKind();
+    return qmodelingelementproperty_cast<QUmlMessage *>(this)->messageKind();
 }
 
 QtUml::MessageSort QUmlMessageObject::messageSort() const
 {
-    return qmodelingobjectproperty_cast<QUmlMessage *>(this)->messageSort();
+    return qmodelingelementproperty_cast<QUmlMessage *>(this)->messageSort();
 }
 
 QObject *QUmlMessageObject::receiveEvent() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlMessage *>(this)->receiveEvent())
+    if (!qmodelingelementproperty_cast<QUmlMessage *>(this)->receiveEvent())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlMessage *>(this)->receiveEvent()->asQObject();
+        return qmodelingelementproperty_cast<QUmlMessage *>(this)->receiveEvent()->asQModelingObject();
 }
 
 QObject *QUmlMessageObject::sendEvent() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlMessage *>(this)->sendEvent())
+    if (!qmodelingelementproperty_cast<QUmlMessage *>(this)->sendEvent())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlMessage *>(this)->sendEvent()->asQObject();
+        return qmodelingelementproperty_cast<QUmlMessage *>(this)->sendEvent()->asQModelingObject();
 }
 
 QObject *QUmlMessageObject::signature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlMessage *>(this)->signature())
+    if (!qmodelingelementproperty_cast<QUmlMessage *>(this)->signature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlMessage *>(this)->signature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlMessage *>(this)->signature()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -200,14 +203,14 @@ QObject *QUmlMessageObject::signature() const
 QSet<QObject *> QUmlMessageObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlMessage *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlMessage *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlMessageObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlMessage *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlMessage *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -215,148 +218,259 @@ bool QUmlMessageObject::mustBeOwned() const
 QList<QObject *> QUmlMessageObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlMessage *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlMessage *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlMessageObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlMessage *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlMessage *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlMessageObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlMessage *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlMessage *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlMessageObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlMessage *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlMessage *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlMessageObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlMessage *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlMessage *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlMessageObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlMessage *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlMessage *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlMessageObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlMessage *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlMessage *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlMessageObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlMessage *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlMessage *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlMessageObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlMessage *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlMessage *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlMessageObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlMessage *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlMessage *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlMessageObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlMessage *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlMessage *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlMessageObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlMessage *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlMessage *>(this)->setName(name);
 }
 
 void QUmlMessageObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlMessage *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlMessage *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlMessageObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlMessage *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlMessage *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlMessageObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlMessage *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlMessage *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlMessageObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlMessage *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlMessage *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Message]
 
 void QUmlMessageObject::addArgument(QObject *argument)
 {
-    qmodelingobjectproperty_cast<QUmlMessage *>(this)->addArgument(qmodelingobjectproperty_cast<QUmlValueSpecification *>(argument));
+    qmodelingelementproperty_cast<QUmlMessage *>(this)->addArgument(qmodelingelementproperty_cast<QUmlValueSpecification *>(argument));
 }
 
 void QUmlMessageObject::removeArgument(QObject *argument)
 {
-    qmodelingobjectproperty_cast<QUmlMessage *>(this)->removeArgument(qmodelingobjectproperty_cast<QUmlValueSpecification *>(argument));
+    qmodelingelementproperty_cast<QUmlMessage *>(this)->removeArgument(qmodelingelementproperty_cast<QUmlValueSpecification *>(argument));
 }
 
 void QUmlMessageObject::setConnector(QObject *connector)
 {
-    qmodelingobjectproperty_cast<QUmlMessage *>(this)->setConnector(qmodelingobjectproperty_cast<QUmlConnector *>(connector));
+    qmodelingelementproperty_cast<QUmlMessage *>(this)->setConnector(qmodelingelementproperty_cast<QUmlConnector *>(connector));
 }
 
 void QUmlMessageObject::setInteraction(QObject *interaction)
 {
-    qmodelingobjectproperty_cast<QUmlMessage *>(this)->setInteraction(qmodelingobjectproperty_cast<QUmlInteraction *>(interaction));
+    qmodelingelementproperty_cast<QUmlMessage *>(this)->setInteraction(qmodelingelementproperty_cast<QUmlInteraction *>(interaction));
 }
 
 void QUmlMessageObject::setMessageKind(QtUml::MessageKind messageKind)
 {
-    qmodelingobjectproperty_cast<QUmlMessage *>(this)->setMessageKind(messageKind);
+    qmodelingelementproperty_cast<QUmlMessage *>(this)->setMessageKind(messageKind);
 }
 
 void QUmlMessageObject::unsetMessageKind()
 {
-    qmodelingobjectproperty_cast<QUmlMessage *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("messageKind"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("messageKind"));
 }
 
 void QUmlMessageObject::setMessageSort(QtUml::MessageSort messageSort)
 {
-    qmodelingobjectproperty_cast<QUmlMessage *>(this)->setMessageSort(messageSort);
+    qmodelingelementproperty_cast<QUmlMessage *>(this)->setMessageSort(messageSort);
 }
 
 void QUmlMessageObject::unsetMessageSort()
 {
-    qmodelingobjectproperty_cast<QUmlMessage *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("messageSort"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("messageSort"));
 }
 
 void QUmlMessageObject::setReceiveEvent(QObject *receiveEvent)
 {
-    qmodelingobjectproperty_cast<QUmlMessage *>(this)->setReceiveEvent(qmodelingobjectproperty_cast<QUmlMessageEnd *>(receiveEvent));
+    qmodelingelementproperty_cast<QUmlMessage *>(this)->setReceiveEvent(qmodelingelementproperty_cast<QUmlMessageEnd *>(receiveEvent));
 }
 
 void QUmlMessageObject::setSendEvent(QObject *sendEvent)
 {
-    qmodelingobjectproperty_cast<QUmlMessage *>(this)->setSendEvent(qmodelingobjectproperty_cast<QUmlMessageEnd *>(sendEvent));
+    qmodelingelementproperty_cast<QUmlMessage *>(this)->setSendEvent(qmodelingelementproperty_cast<QUmlMessageEnd *>(sendEvent));
 }
 
 void QUmlMessageObject::setSignature(QObject *signature)
 {
-    qmodelingobjectproperty_cast<QUmlMessage *>(this)->setSignature(qmodelingobjectproperty_cast<QUmlNamedElement *>(signature));
+    qmodelingelementproperty_cast<QUmlMessage *>(this)->setSignature(qmodelingelementproperty_cast<QUmlNamedElement *>(signature));
+}
+
+
+void QUmlMessageObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlMessage");
+    d->groupProperties.insert(QStringLiteral("QUmlMessage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("arguments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMessage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("connector"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMessage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interaction"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMessage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("messageKind"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMessage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("messageSort"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMessage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("receiveEvent"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMessage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sendEvent"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMessage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("signature"))));
+}
+
+void QUmlMessageObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, arguments, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, arguments, PropertyClassRole, QStringLiteral("QUmlMessage"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, arguments, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, arguments, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, arguments, DocumentationRole, QStringLiteral("The arguments of the Message"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, arguments, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, arguments, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, arguments, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, connector, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, connector, PropertyClassRole, QStringLiteral("QUmlMessage"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, connector, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, connector, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, connector, DocumentationRole, QStringLiteral("The Connector on which this Message is sent."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, connector, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, connector, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, connector, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, interaction, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, interaction, PropertyClassRole, QStringLiteral("QUmlMessage"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, interaction, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, interaction, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, interaction, DocumentationRole, QStringLiteral("The enclosing Interaction owning the Message"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, interaction, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, interaction, SubsettedPropertiesRole, QStringLiteral("NamedElement-namespace"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, interaction, OppositeEndRole, QStringLiteral("Interaction-message"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, messageKind, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, messageKind, PropertyClassRole, QStringLiteral("QUmlMessage"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, messageKind, IsDerivedRole, true);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, messageKind, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, messageKind, DocumentationRole, QStringLiteral("The derived kind of the Message (complete, lost, found or unknown)"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, messageKind, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, messageKind, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, messageKind, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, messageSort, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, messageSort, PropertyClassRole, QStringLiteral("QUmlMessage"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, messageSort, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, messageSort, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, messageSort, DocumentationRole, QStringLiteral("The sort of communication reflected by the Message"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, messageSort, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, messageSort, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, messageSort, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, receiveEvent, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, receiveEvent, PropertyClassRole, QStringLiteral("QUmlMessage"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, receiveEvent, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, receiveEvent, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, receiveEvent, DocumentationRole, QStringLiteral("References the Receiving of the Message"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, receiveEvent, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, receiveEvent, SubsettedPropertiesRole, QStringLiteral("A_message_messageEnd-messageEnd"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, receiveEvent, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, sendEvent, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, sendEvent, PropertyClassRole, QStringLiteral("QUmlMessage"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, sendEvent, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, sendEvent, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, sendEvent, DocumentationRole, QStringLiteral("References the Sending of the Message."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, sendEvent, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, sendEvent, SubsettedPropertiesRole, QStringLiteral("A_message_messageEnd-messageEnd"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, sendEvent, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, signature, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, signature, PropertyClassRole, QStringLiteral("QUmlMessage"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, signature, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, signature, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, signature, DocumentationRole, QStringLiteral("The signature of the Message is the specification of its content. It refers either an Operation or a Signal."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, signature, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, signature, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlMessage, signature, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlmessageobject_p.h b/src/uml/qobjects/qumlmessageobject_p.h
index 0486df46..093d7b16 100644
--- a/src/uml/qobjects/qumlmessageobject_p.h
+++ b/src/uml/qobjects/qumlmessageobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlMessage;
-class Q_UML_EXPORT QUmlMessageObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlMessageObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlMessageObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -82,7 +85,7 @@ class Q_UML_EXPORT QUmlMessageObject : public QObject
     Q_PROPERTY(QObject * signature READ signature WRITE setSignature)
 
 public:
-    Q_INVOKABLE explicit QUmlMessageObject(QUmlMessage *qModelingObject);
+    Q_INVOKABLE explicit QUmlMessageObject(QUmlMessage *qModelingElement);
     virtual ~QUmlMessageObject();
 
     // Owned attributes [Element]
@@ -148,6 +151,10 @@ public Q_SLOTS:
     void setReceiveEvent(QObject *receiveEvent = 0);
     void setSendEvent(QObject *sendEvent = 0);
     void setSignature(QObject *signature = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlmessageoccurrencespecificationobject.cpp b/src/uml/qobjects/qumlmessageoccurrencespecificationobject.cpp
index 44ac3274..679c6a62 100644
--- a/src/uml/qobjects/qumlmessageoccurrencespecificationobject.cpp
+++ b/src/uml/qobjects/qumlmessageoccurrencespecificationobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlmessageoccurrencespecificationobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlMessageOccurrenceSpecification>
 #include <QtUml/QUmlComment>
@@ -56,16 +57,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlMessageOccurrenceSpecificationObject::QUmlMessageOccurrenceSpecificationObject(QUmlMessageOccurrenceSpecification *qModelingObject)
+QUmlMessageOccurrenceSpecificationObject::QUmlMessageOccurrenceSpecificationObject(QUmlMessageOccurrenceSpecification *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlMessageOccurrenceSpecificationObject::~QUmlMessageOccurrenceSpecificationObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -74,25 +77,25 @@ QUmlMessageOccurrenceSpecificationObject::~QUmlMessageOccurrenceSpecificationObj
 const QSet<QObject *> QUmlMessageOccurrenceSpecificationObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlMessageOccurrenceSpecificationObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlMessageOccurrenceSpecificationObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -100,65 +103,65 @@ QObject *QUmlMessageOccurrenceSpecificationObject::owner() const
 const QSet<QObject *> QUmlMessageOccurrenceSpecificationObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlMessageOccurrenceSpecificationObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->name();
 }
 
 QObject *QUmlMessageOccurrenceSpecificationObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlMessageOccurrenceSpecificationObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlMessageOccurrenceSpecificationObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlMessageOccurrenceSpecificationObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [InteractionFragment]
 
 QObject *QUmlMessageOccurrenceSpecificationObject::enclosingInteraction() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->enclosingInteraction())
+    if (!qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->enclosingInteraction())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->enclosingInteraction()->asQObject();
+        return qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->enclosingInteraction()->asQModelingObject();
 }
 
 QObject *QUmlMessageOccurrenceSpecificationObject::enclosingOperand() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->enclosingOperand())
+    if (!qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->enclosingOperand())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->enclosingOperand()->asQObject();
+        return qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->enclosingOperand()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlMessageOccurrenceSpecificationObject::generalOrderings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralOrdering *element, qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->generalOrderings())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralOrdering *element, qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->generalOrderings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -166,25 +169,25 @@ const QSet<QObject *> QUmlMessageOccurrenceSpecificationObject::generalOrderings
 
 QObject *QUmlMessageOccurrenceSpecificationObject::covered() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->covered())
+    if (!qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->covered())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->covered()->asQObject();
+        return qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->covered()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlMessageOccurrenceSpecificationObject::toAfters() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralOrdering *element, qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->toAfters())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralOrdering *element, qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->toAfters())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlMessageOccurrenceSpecificationObject::toBefores() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralOrdering *element, qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->toBefores())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralOrdering *element, qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->toBefores())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -192,10 +195,10 @@ const QSet<QObject *> QUmlMessageOccurrenceSpecificationObject::toBefores() cons
 
 QObject *QUmlMessageOccurrenceSpecificationObject::message() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->message())
+    if (!qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->message())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->message()->asQObject();
+        return qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->message()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -203,14 +206,14 @@ QObject *QUmlMessageOccurrenceSpecificationObject::message() const
 QSet<QObject *> QUmlMessageOccurrenceSpecificationObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlMessageOccurrenceSpecificationObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -218,147 +221,189 @@ bool QUmlMessageOccurrenceSpecificationObject::mustBeOwned() const
 QList<QObject *> QUmlMessageOccurrenceSpecificationObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlMessageOccurrenceSpecificationObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlMessageOccurrenceSpecificationObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlMessageOccurrenceSpecificationObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlMessageOccurrenceSpecificationObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlMessageOccurrenceSpecificationObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlMessageOccurrenceSpecificationObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlMessageOccurrenceSpecificationObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlMessageOccurrenceSpecificationObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlMessageOccurrenceSpecificationObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlMessageOccurrenceSpecificationObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlMessageOccurrenceSpecificationObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->setName(name);
 }
 
 void QUmlMessageOccurrenceSpecificationObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlMessageOccurrenceSpecificationObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlMessageOccurrenceSpecificationObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlMessageOccurrenceSpecificationObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [InteractionFragment]
 
 void QUmlMessageOccurrenceSpecificationObject::setEnclosingInteraction(QObject *enclosingInteraction)
 {
-    qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->setEnclosingInteraction(qmodelingobjectproperty_cast<QUmlInteraction *>(enclosingInteraction));
+    qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->setEnclosingInteraction(qmodelingelementproperty_cast<QUmlInteraction *>(enclosingInteraction));
 }
 
 void QUmlMessageOccurrenceSpecificationObject::setEnclosingOperand(QObject *enclosingOperand)
 {
-    qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->setEnclosingOperand(qmodelingobjectproperty_cast<QUmlInteractionOperand *>(enclosingOperand));
+    qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->setEnclosingOperand(qmodelingelementproperty_cast<QUmlInteractionOperand *>(enclosingOperand));
 }
 
 void QUmlMessageOccurrenceSpecificationObject::addGeneralOrdering(QObject *generalOrdering)
 {
-    qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->addGeneralOrdering(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
+    qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->addGeneralOrdering(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
 }
 
 void QUmlMessageOccurrenceSpecificationObject::removeGeneralOrdering(QObject *generalOrdering)
 {
-    qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->removeGeneralOrdering(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
+    qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->removeGeneralOrdering(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [OccurrenceSpecification]
 
 void QUmlMessageOccurrenceSpecificationObject::setCovered(QObject *covered)
 {
-    qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->setCovered(qmodelingobjectproperty_cast<QUmlLifeline *>(covered));
+    qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->setCovered(qmodelingelementproperty_cast<QUmlLifeline *>(covered));
 }
 
 void QUmlMessageOccurrenceSpecificationObject::addToAfter(QObject *toAfter)
 {
-    qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->addToAfter(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(toAfter));
+    qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->addToAfter(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(toAfter));
 }
 
 void QUmlMessageOccurrenceSpecificationObject::removeToAfter(QObject *toAfter)
 {
-    qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->removeToAfter(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(toAfter));
+    qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->removeToAfter(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(toAfter));
 }
 
 void QUmlMessageOccurrenceSpecificationObject::addToBefore(QObject *toBefore)
 {
-    qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->addToBefore(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(toBefore));
+    qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->addToBefore(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(toBefore));
 }
 
 void QUmlMessageOccurrenceSpecificationObject::removeToBefore(QObject *toBefore)
 {
-    qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->removeToBefore(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(toBefore));
+    qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->removeToBefore(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(toBefore));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [MessageEnd]
 
 void QUmlMessageOccurrenceSpecificationObject::setMessage(QObject *message)
 {
-    qmodelingobjectproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->setMessage(qmodelingobjectproperty_cast<QUmlMessage *>(message));
+    qmodelingelementproperty_cast<QUmlMessageOccurrenceSpecification *>(this)->setMessage(qmodelingelementproperty_cast<QUmlMessage *>(message));
+}
+
+
+void QUmlMessageOccurrenceSpecificationObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlInteractionFragment");
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingInteraction"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingOperand"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalOrderings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlOccurrenceSpecification");
+    d->groupProperties.insert(QStringLiteral("QUmlOccurrenceSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("covered"))));
+    d->groupProperties.insert(QStringLiteral("QUmlOccurrenceSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("toAfters"))));
+    d->groupProperties.insert(QStringLiteral("QUmlOccurrenceSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("toBefores"))));
+
+    d->propertyGroups << QStringLiteral("QUmlMessageEnd");
+    d->groupProperties.insert(QStringLiteral("QUmlMessageEnd"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("message"))));
+
+    d->propertyGroups << QStringLiteral("QUmlMessageOccurrenceSpecification");
+}
+
+void QUmlMessageOccurrenceSpecificationObject::setPropertyData()
+{
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlmessageoccurrencespecificationobject_p.h b/src/uml/qobjects/qumlmessageoccurrencespecificationobject_p.h
index ef85795e..ed21b9f8 100644
--- a/src/uml/qobjects/qumlmessageoccurrencespecificationobject_p.h
+++ b/src/uml/qobjects/qumlmessageoccurrencespecificationobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlMessageOccurrenceSpecification;
-class Q_UML_EXPORT QUmlMessageOccurrenceSpecificationObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlMessageOccurrenceSpecificationObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlMessageOccurrenceSpecificationObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -85,7 +88,7 @@ class Q_UML_EXPORT QUmlMessageOccurrenceSpecificationObject : public QObject
     Q_PROPERTY(QObject * message READ message WRITE setMessage)
 
 public:
-    Q_INVOKABLE explicit QUmlMessageOccurrenceSpecificationObject(QUmlMessageOccurrenceSpecification *qModelingObject);
+    Q_INVOKABLE explicit QUmlMessageOccurrenceSpecificationObject(QUmlMessageOccurrenceSpecification *qModelingElement);
     virtual ~QUmlMessageOccurrenceSpecificationObject();
 
     // Owned attributes [Element]
@@ -157,6 +160,10 @@ public Q_SLOTS:
 
     // Slots for owned attributes [MessageEnd]
     void setMessage(QObject *message = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlmodelobject.cpp b/src/uml/qobjects/qumlmodelobject.cpp
index 27da317e..1a4c2906 100644
--- a/src/uml/qobjects/qumlmodelobject.cpp
+++ b/src/uml/qobjects/qumlmodelobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlmodelobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlModel>
 #include <QtUml/QUmlComment>
@@ -64,16 +65,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlModelObject::QUmlModelObject(QUmlModel *qModelingObject)
+QUmlModelObject::QUmlModelObject(QUmlModel *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlModelObject::~QUmlModelObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlModel *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlModel *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -82,25 +85,25 @@ QUmlModelObject::~QUmlModelObject()
 const QSet<QObject *> QUmlModelObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlModel *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlModel *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlModelObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlModel *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlModel *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlModelObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlModel *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlModel *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlModel *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlModel *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -108,35 +111,35 @@ QObject *QUmlModelObject::owner() const
 const QSet<QObject *> QUmlModelObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlModel *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlModel *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlModelObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlModel *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlModel *>(this)->name();
 }
 
 QObject *QUmlModelObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlModel *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlModel *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlModel *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlModel *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlModelObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlModel *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlModel *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlModel *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlModel *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlModelObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlModel *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlModel *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [Namespace]
@@ -144,48 +147,48 @@ QString QUmlModelObject::qualifiedName() const
 const QSet<QObject *> QUmlModelObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlModel *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlModel *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlModelObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlModel *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlModel *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlModelObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlModel *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlModel *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlModelObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlModel *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlModel *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlModelObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlModel *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlModel *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlModelObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlModel *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlModel *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -193,42 +196,42 @@ const QSet<QObject *> QUmlModelObject::packageImports() const
 
 QObject *QUmlModelObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlModel *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlModel *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlModel *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlModel *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlModelObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlModel *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlModel *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlModel *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlModel *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlModelObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlModel *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlModel *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [TemplateableElement]
 
 QObject *QUmlModelObject::ownedTemplateSignature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlModel *>(this)->ownedTemplateSignature())
+    if (!qmodelingelementproperty_cast<QUmlModel *>(this)->ownedTemplateSignature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlModel *>(this)->ownedTemplateSignature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlModel *>(this)->ownedTemplateSignature()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlModelObject::templateBindings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTemplateBinding *element, qmodelingobjectproperty_cast<QUmlModel *>(this)->templateBindings())
-        set.insert(element->asQObject());
+    foreach (QUmlTemplateBinding *element, qmodelingelementproperty_cast<QUmlModel *>(this)->templateBindings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -236,62 +239,62 @@ const QSet<QObject *> QUmlModelObject::templateBindings() const
 
 QString QUmlModelObject::URI() const
 {
-    return qmodelingobjectproperty_cast<QUmlModel *>(this)->URI();
+    return qmodelingelementproperty_cast<QUmlModel *>(this)->URI();
 }
 
 const QSet<QObject *> QUmlModelObject::nestedPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlModel *>(this)->nestedPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlModel *>(this)->nestedPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlModelObject::nestingPackage() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlModel *>(this)->nestingPackage())
+    if (!qmodelingelementproperty_cast<QUmlModel *>(this)->nestingPackage())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlModel *>(this)->nestingPackage()->asQObject();
+        return qmodelingelementproperty_cast<QUmlModel *>(this)->nestingPackage()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlModelObject::ownedStereotypes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlStereotype *element, qmodelingobjectproperty_cast<QUmlModel *>(this)->ownedStereotypes())
-        set.insert(element->asQObject());
+    foreach (QUmlStereotype *element, qmodelingelementproperty_cast<QUmlModel *>(this)->ownedStereotypes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlModelObject::ownedTypes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlType *element, qmodelingobjectproperty_cast<QUmlModel *>(this)->ownedTypes())
-        set.insert(element->asQObject());
+    foreach (QUmlType *element, qmodelingelementproperty_cast<QUmlModel *>(this)->ownedTypes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlModelObject::packageMerges() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageMerge *element, qmodelingobjectproperty_cast<QUmlModel *>(this)->packageMerges())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageMerge *element, qmodelingelementproperty_cast<QUmlModel *>(this)->packageMerges())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlModelObject::packagedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlModel *>(this)->packagedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlModel *>(this)->packagedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlModelObject::profileApplications() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProfileApplication *element, qmodelingobjectproperty_cast<QUmlModel *>(this)->profileApplications())
-        set.insert(element->asQObject());
+    foreach (QUmlProfileApplication *element, qmodelingelementproperty_cast<QUmlModel *>(this)->profileApplications())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -299,7 +302,7 @@ const QSet<QObject *> QUmlModelObject::profileApplications() const
 
 QString QUmlModelObject::viewpoint() const
 {
-    return qmodelingobjectproperty_cast<QUmlModel *>(this)->viewpoint();
+    return qmodelingelementproperty_cast<QUmlModel *>(this)->viewpoint();
 }
 
 // OPERATIONS [Element]
@@ -307,8 +310,8 @@ QString QUmlModelObject::viewpoint() const
 QSet<QObject *> QUmlModelObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlModel *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlModel *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 // OPERATIONS [NamedElement]
@@ -316,27 +319,27 @@ QSet<QObject *> QUmlModelObject::allOwnedElements() const
 QList<QObject *> QUmlModelObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlModel *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlModel *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlModelObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlModel *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlModel *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlModelObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlModel *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlModel *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlModelObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlModel *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlModel *>(this)->separator();
 }
 
 // OPERATIONS [Namespace]
@@ -345,58 +348,58 @@ QSet<QObject *> QUmlModelObject::excludeCollisions(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlModel *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlModel *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlModelObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlModel *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlModel *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlModelObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlModel *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlModel *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlModelObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlModel *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlModel *>(this)->membersAreDistinguishable();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlModelObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlModel *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlModel *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlModelObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlModel *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlModel *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [TemplateableElement]
 
 bool QUmlModelObject::isTemplate() const
 {
-    return qmodelingobjectproperty_cast<QUmlModel *>(this)->isTemplate();
+    return qmodelingelementproperty_cast<QUmlModel *>(this)->isTemplate();
 }
 
 QSet<QObject *> QUmlModelObject::parameterableElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterableElement *element, qmodelingobjectproperty_cast<QUmlModel *>(this)->parameterableElements())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterableElement *element, qmodelingelementproperty_cast<QUmlModel *>(this)->parameterableElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -405,34 +408,34 @@ QSet<QObject *> QUmlModelObject::parameterableElements() const
 QSet<QObject *> QUmlModelObject::allApplicableStereotypes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlStereotype *element, qmodelingobjectproperty_cast<QUmlModel *>(this)->allApplicableStereotypes())
-        set.insert(element->asQObject());
+    foreach (QUmlStereotype *element, qmodelingelementproperty_cast<QUmlModel *>(this)->allApplicableStereotypes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlModelObject::containingProfile() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlModel *>(this)->containingProfile())
+    if (!qmodelingelementproperty_cast<QUmlModel *>(this)->containingProfile())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlModel *>(this)->containingProfile()->asQObject();
+        return qmodelingelementproperty_cast<QUmlModel *>(this)->containingProfile()->asQModelingObject();
 }
 
 bool QUmlModelObject::makesVisible(QObject *el) const
 {
-    return qmodelingobjectproperty_cast<QUmlModel *>(this)->makesVisible(qmodelingobjectproperty_cast<QUmlNamedElement *>(el));
+    return qmodelingelementproperty_cast<QUmlModel *>(this)->makesVisible(qmodelingelementproperty_cast<QUmlNamedElement *>(el));
 }
 
 bool QUmlModelObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlModel *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlModel *>(this)->mustBeOwned();
 }
 
 QSet<QObject *> QUmlModelObject::visibleMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlModel *>(this)->visibleMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlModel *>(this)->visibleMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -440,240 +443,308 @@ QSet<QObject *> QUmlModelObject::visibleMembers() const
 
 void QUmlModelObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlModelObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlModelObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlModelObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlModelObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlModelObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlModelObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlModelObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlModel *>(this)->setName(name);
 }
 
 void QUmlModelObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlModelObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlModelObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlModel *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlModelObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlModelObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlModelObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlModelObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlModelObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlModelObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlModelObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlModelObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlModelObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlModelObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlModelObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlModelObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlModelObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlModelObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlModelObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlModel *>(this)->setVisibility(visibility);
 }
 
 void QUmlModelObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateableElement]
 
 void QUmlModelObject::setOwnedTemplateSignature(QObject *ownedTemplateSignature)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->setOwnedTemplateSignature(qmodelingobjectproperty_cast<QUmlTemplateSignature *>(ownedTemplateSignature));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->setOwnedTemplateSignature(qmodelingelementproperty_cast<QUmlTemplateSignature *>(ownedTemplateSignature));
 }
 
 void QUmlModelObject::addTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->addTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->addTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 void QUmlModelObject::removeTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->removeTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->removeTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Package]
 
 void QUmlModelObject::setURI(QString URI)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->setURI(URI);
+    qmodelingelementproperty_cast<QUmlModel *>(this)->setURI(URI);
 }
 
 void QUmlModelObject::addNestedPackage(QObject *nestedPackage)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->addNestedPackage(qmodelingobjectproperty_cast<QUmlPackage *>(nestedPackage));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->addNestedPackage(qmodelingelementproperty_cast<QUmlPackage *>(nestedPackage));
 }
 
 void QUmlModelObject::removeNestedPackage(QObject *nestedPackage)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->removeNestedPackage(qmodelingobjectproperty_cast<QUmlPackage *>(nestedPackage));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->removeNestedPackage(qmodelingelementproperty_cast<QUmlPackage *>(nestedPackage));
 }
 
 void QUmlModelObject::setNestingPackage(QObject *nestingPackage)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->setNestingPackage(qmodelingobjectproperty_cast<QUmlPackage *>(nestingPackage));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->setNestingPackage(qmodelingelementproperty_cast<QUmlPackage *>(nestingPackage));
 }
 
 void QUmlModelObject::addOwnedStereotype(QObject *ownedStereotype)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->addOwnedStereotype(qmodelingobjectproperty_cast<QUmlStereotype *>(ownedStereotype));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->addOwnedStereotype(qmodelingelementproperty_cast<QUmlStereotype *>(ownedStereotype));
 }
 
 void QUmlModelObject::removeOwnedStereotype(QObject *ownedStereotype)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->removeOwnedStereotype(qmodelingobjectproperty_cast<QUmlStereotype *>(ownedStereotype));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->removeOwnedStereotype(qmodelingelementproperty_cast<QUmlStereotype *>(ownedStereotype));
 }
 
 void QUmlModelObject::addOwnedType(QObject *ownedType)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->addOwnedType(qmodelingobjectproperty_cast<QUmlType *>(ownedType));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->addOwnedType(qmodelingelementproperty_cast<QUmlType *>(ownedType));
 }
 
 void QUmlModelObject::removeOwnedType(QObject *ownedType)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->removeOwnedType(qmodelingobjectproperty_cast<QUmlType *>(ownedType));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->removeOwnedType(qmodelingelementproperty_cast<QUmlType *>(ownedType));
 }
 
 void QUmlModelObject::addPackageMerge(QObject *packageMerge)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->addPackageMerge(qmodelingobjectproperty_cast<QUmlPackageMerge *>(packageMerge));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->addPackageMerge(qmodelingelementproperty_cast<QUmlPackageMerge *>(packageMerge));
 }
 
 void QUmlModelObject::removePackageMerge(QObject *packageMerge)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->removePackageMerge(qmodelingobjectproperty_cast<QUmlPackageMerge *>(packageMerge));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->removePackageMerge(qmodelingelementproperty_cast<QUmlPackageMerge *>(packageMerge));
 }
 
 void QUmlModelObject::addPackagedElement(QObject *packagedElement)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->addPackagedElement(qmodelingobjectproperty_cast<QUmlPackageableElement *>(packagedElement));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->addPackagedElement(qmodelingelementproperty_cast<QUmlPackageableElement *>(packagedElement));
 }
 
 void QUmlModelObject::removePackagedElement(QObject *packagedElement)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->removePackagedElement(qmodelingobjectproperty_cast<QUmlPackageableElement *>(packagedElement));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->removePackagedElement(qmodelingelementproperty_cast<QUmlPackageableElement *>(packagedElement));
 }
 
 void QUmlModelObject::addProfileApplication(QObject *profileApplication)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->addProfileApplication(qmodelingobjectproperty_cast<QUmlProfileApplication *>(profileApplication));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->addProfileApplication(qmodelingelementproperty_cast<QUmlProfileApplication *>(profileApplication));
 }
 
 void QUmlModelObject::removeProfileApplication(QObject *profileApplication)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->removeProfileApplication(qmodelingobjectproperty_cast<QUmlProfileApplication *>(profileApplication));
+    qmodelingelementproperty_cast<QUmlModel *>(this)->removeProfileApplication(qmodelingelementproperty_cast<QUmlProfileApplication *>(profileApplication));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Model]
 
 void QUmlModelObject::setViewpoint(QString viewpoint)
 {
-    qmodelingobjectproperty_cast<QUmlModel *>(this)->setViewpoint(viewpoint);
+    qmodelingelementproperty_cast<QUmlModel *>(this)->setViewpoint(viewpoint);
+}
+
+
+void QUmlModelObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    //d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackage");
+    d->groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("URI"))));
+    d->groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedPackages"))));
+    d->groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestingPackage"))));
+    d->groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedStereotypes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTypes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageMerges"))));
+    d->groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packagedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("profileApplications"))));
+
+    d->propertyGroups << QStringLiteral("QUmlModel");
+    d->groupProperties.insert(QStringLiteral("QUmlModel"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("viewpoint"))));
+}
+
+void QUmlModelObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlModel, viewpoint, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlModel, viewpoint, PropertyClassRole, QStringLiteral("QUmlModel"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlModel, viewpoint, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlModel, viewpoint, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlModel, viewpoint, DocumentationRole, QStringLiteral("The name of the viewpoint that is expressed by a model (This name may refer to a profile definition)."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlModel, viewpoint, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlModel, viewpoint, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlModel, viewpoint, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlmodelobject_p.h b/src/uml/qobjects/qumlmodelobject_p.h
index ba2d414d..084c1df0 100644
--- a/src/uml/qobjects/qumlmodelobject_p.h
+++ b/src/uml/qobjects/qumlmodelobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlModel;
-class Q_UML_EXPORT QUmlModelObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlModelObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlModelObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -103,7 +106,7 @@ class Q_UML_EXPORT QUmlModelObject : public QObject
     Q_PROPERTY(QString viewpoint READ viewpoint WRITE setViewpoint)
 
 public:
-    Q_INVOKABLE explicit QUmlModelObject(QUmlModel *qModelingObject);
+    Q_INVOKABLE explicit QUmlModelObject(QUmlModel *qModelingElement);
     virtual ~QUmlModelObject();
 
     // Owned attributes [Element]
@@ -242,6 +245,10 @@ public Q_SLOTS:
 
     // Slots for owned attributes [Model]
     void setViewpoint(QString viewpoint);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlnodeobject.cpp b/src/uml/qobjects/qumlnodeobject.cpp
index 516e5133..0b46a7c4 100644
--- a/src/uml/qobjects/qumlnodeobject.cpp
+++ b/src/uml/qobjects/qumlnodeobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlnodeobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlNode>
 #include <QtUml/QUmlBehavior>
@@ -81,16 +82,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlNodeObject::QUmlNodeObject(QUmlNode *qModelingObject)
+QUmlNodeObject::QUmlNodeObject(QUmlNode *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlNodeObject::~QUmlNodeObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlNode *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlNode *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -99,25 +102,25 @@ QUmlNodeObject::~QUmlNodeObject()
 const QSet<QObject *> QUmlNodeObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlNode *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlNodeObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlNode *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlNodeObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlNode *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlNode *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlNode *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlNode *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -125,35 +128,35 @@ QObject *QUmlNodeObject::owner() const
 const QSet<QObject *> QUmlNodeObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlNode *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlNodeObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlNode *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlNode *>(this)->name();
 }
 
 QObject *QUmlNodeObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlNode *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlNode *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlNode *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlNode *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlNodeObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlNode *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlNode *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlNode *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlNode *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlNodeObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlNode *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlNode *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [Namespace]
@@ -161,48 +164,48 @@ QString QUmlNodeObject::qualifiedName() const
 const QSet<QObject *> QUmlNodeObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlNode *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlNodeObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlNode *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlNodeObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlNode *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlNodeObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlNode *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlNodeObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlNode *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlNodeObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlNode *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -210,49 +213,49 @@ const QSet<QObject *> QUmlNodeObject::packageImports() const
 
 QObject *QUmlNodeObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlNode *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlNode *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlNode *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlNode *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlNodeObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlNode *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlNode *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Type]
 
 QObject *QUmlNodeObject::package() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlNode *>(this)->package())
+    if (!qmodelingelementproperty_cast<QUmlNode *>(this)->package())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlNode *>(this)->package()->asQObject();
+        return qmodelingelementproperty_cast<QUmlNode *>(this)->package()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlNodeObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlNode *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlNode *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlNodeObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlNode *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlNodeObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlNode *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -261,8 +264,8 @@ const QSet<QObject *> QUmlNodeObject::redefinitionContexts() const
 const QSet<QObject *> QUmlNodeObject::templateBindings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTemplateBinding *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->templateBindings())
-        set.insert(element->asQObject());
+    foreach (QUmlTemplateBinding *element, qmodelingelementproperty_cast<QUmlNode *>(this)->templateBindings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -271,109 +274,109 @@ const QSet<QObject *> QUmlNodeObject::templateBindings() const
 const QSet<QObject *> QUmlNodeObject::attributes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->attributes())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlNode *>(this)->attributes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlNodeObject::collaborationUses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlCollaborationUse *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->collaborationUses())
-        set.insert(element->asQObject());
+    foreach (QUmlCollaborationUse *element, qmodelingelementproperty_cast<QUmlNode *>(this)->collaborationUses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlNodeObject::features() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->features())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlNode *>(this)->features())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlNodeObject::generalizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralization *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->generalizations())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralization *element, qmodelingelementproperty_cast<QUmlNode *>(this)->generalizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlNodeObject::inheritedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->inheritedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlNode *>(this)->inheritedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlNodeObject::isFinalSpecialization() const
 {
-    return qmodelingobjectproperty_cast<QUmlNode *>(this)->isFinalSpecialization();
+    return qmodelingelementproperty_cast<QUmlNode *>(this)->isFinalSpecialization();
 }
 
 QObject *QUmlNodeObject::ownedTemplateSignature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlNode *>(this)->ownedTemplateSignature())
+    if (!qmodelingelementproperty_cast<QUmlNode *>(this)->ownedTemplateSignature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlNode *>(this)->ownedTemplateSignature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlNode *>(this)->ownedTemplateSignature()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlNodeObject::ownedUseCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->ownedUseCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlNode *>(this)->ownedUseCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlNodeObject::powertypeExtents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralizationSet *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->powertypeExtents())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralizationSet *element, qmodelingelementproperty_cast<QUmlNode *>(this)->powertypeExtents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlNodeObject::redefinedClassifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->redefinedClassifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlNode *>(this)->redefinedClassifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlNodeObject::representation() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlNode *>(this)->representation())
+    if (!qmodelingelementproperty_cast<QUmlNode *>(this)->representation())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlNode *>(this)->representation()->asQObject();
+        return qmodelingelementproperty_cast<QUmlNode *>(this)->representation()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlNodeObject::substitutions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlSubstitution *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->substitutions())
-        set.insert(element->asQObject());
+    foreach (QUmlSubstitution *element, qmodelingelementproperty_cast<QUmlNode *>(this)->substitutions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlNodeObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlNode *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlNode *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlNode *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlNode *>(this)->templateParameter()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlNodeObject::useCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->useCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlNode *>(this)->useCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -382,24 +385,24 @@ const QSet<QObject *> QUmlNodeObject::useCases() const
 const QSet<QObject *> QUmlNodeObject::ownedConnectors() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConnector *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->ownedConnectors())
-        set.insert(element->asQObject());
+    foreach (QUmlConnector *element, qmodelingelementproperty_cast<QUmlNode *>(this)->ownedConnectors())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlNodeObject::parts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->parts())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlNode *>(this)->parts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlNodeObject::roles() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConnectableElement *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->roles())
-        set.insert(element->asQObject());
+    foreach (QUmlConnectableElement *element, qmodelingelementproperty_cast<QUmlNode *>(this)->roles())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -408,8 +411,8 @@ const QSet<QObject *> QUmlNodeObject::roles() const
 const QSet<QObject *> QUmlNodeObject::ownedPorts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPort *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->ownedPorts())
-        set.insert(element->asQObject());
+    foreach (QUmlPort *element, qmodelingelementproperty_cast<QUmlNode *>(this)->ownedPorts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -417,25 +420,25 @@ const QSet<QObject *> QUmlNodeObject::ownedPorts() const
 
 QObject *QUmlNodeObject::classifierBehavior() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlNode *>(this)->classifierBehavior())
+    if (!qmodelingelementproperty_cast<QUmlNode *>(this)->classifierBehavior())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlNode *>(this)->classifierBehavior()->asQObject();
+        return qmodelingelementproperty_cast<QUmlNode *>(this)->classifierBehavior()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlNodeObject::interfaceRealizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterfaceRealization *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->interfaceRealizations())
-        set.insert(element->asQObject());
+    foreach (QUmlInterfaceRealization *element, qmodelingelementproperty_cast<QUmlNode *>(this)->interfaceRealizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlNodeObject::ownedBehaviors() const
 {
     QSet<QObject *> set;
-    foreach (QUmlBehavior *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->ownedBehaviors())
-        set.insert(element->asQObject());
+    foreach (QUmlBehavior *element, qmodelingelementproperty_cast<QUmlNode *>(this)->ownedBehaviors())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -444,58 +447,58 @@ const QSet<QObject *> QUmlNodeObject::ownedBehaviors() const
 const QSet<QObject *> QUmlNodeObject::extensions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExtension *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->extensions())
-        set.insert(element->asQObject());
+    foreach (QUmlExtension *element, qmodelingelementproperty_cast<QUmlNode *>(this)->extensions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlNodeObject::isAbstract() const
 {
-    return qmodelingobjectproperty_cast<QUmlNode *>(this)->isAbstract();
+    return qmodelingelementproperty_cast<QUmlNode *>(this)->isAbstract();
 }
 
 bool QUmlNodeObject::isActive() const
 {
-    return qmodelingobjectproperty_cast<QUmlNode *>(this)->isActive();
+    return qmodelingelementproperty_cast<QUmlNode *>(this)->isActive();
 }
 
 const QList<QObject *> QUmlNodeObject::nestedClassifiers() const
 {
     QList<QObject *> list;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->nestedClassifiers())
-        list.append(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlNode *>(this)->nestedClassifiers())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QList<QObject *> QUmlNodeObject::ownedAttributes() const
 {
     QList<QObject *> list;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->ownedAttributes())
-        list.append(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlNode *>(this)->ownedAttributes())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QList<QObject *> QUmlNodeObject::ownedOperations() const
 {
     QList<QObject *> list;
-    foreach (QUmlOperation *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->ownedOperations())
-        list.append(element->asQObject());
+    foreach (QUmlOperation *element, qmodelingelementproperty_cast<QUmlNode *>(this)->ownedOperations())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QSet<QObject *> QUmlNodeObject::ownedReceptions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlReception *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->ownedReceptions())
-        set.insert(element->asQObject());
+    foreach (QUmlReception *element, qmodelingelementproperty_cast<QUmlNode *>(this)->ownedReceptions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlNodeObject::superClasses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClass *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->superClasses())
-        set.insert(element->asQObject());
+    foreach (QUmlClass *element, qmodelingelementproperty_cast<QUmlNode *>(this)->superClasses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -504,16 +507,16 @@ const QSet<QObject *> QUmlNodeObject::superClasses() const
 const QSet<QObject *> QUmlNodeObject::deployedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->deployedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlNode *>(this)->deployedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlNodeObject::deployments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDeployment *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->deployments())
-        set.insert(element->asQObject());
+    foreach (QUmlDeployment *element, qmodelingelementproperty_cast<QUmlNode *>(this)->deployments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -522,8 +525,8 @@ const QSet<QObject *> QUmlNodeObject::deployments() const
 const QSet<QObject *> QUmlNodeObject::nestedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNode *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->nestedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlNode *element, qmodelingelementproperty_cast<QUmlNode *>(this)->nestedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -532,14 +535,14 @@ const QSet<QObject *> QUmlNodeObject::nestedNodes() const
 QSet<QObject *> QUmlNodeObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlNode *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlNodeObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlNode *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlNode *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -547,27 +550,27 @@ bool QUmlNodeObject::mustBeOwned() const
 QList<QObject *> QUmlNodeObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlNode *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlNodeObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlNode *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlNodeObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlNode *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlNode *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlNodeObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlNode *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlNode *>(this)->separator();
 }
 
 // OPERATIONS [Namespace]
@@ -576,44 +579,44 @@ QSet<QObject *> QUmlNodeObject::excludeCollisions(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlNode *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlNodeObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlNode *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlNode *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlNodeObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlNode *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlNodeObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlNode *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlNode *>(this)->membersAreDistinguishable();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlNodeObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlNode *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlNode *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlNodeObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlNode *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlNode *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [Type]
@@ -621,12 +624,12 @@ bool QUmlNodeObject::isTemplateParameter() const
 
 bool QUmlNodeObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlNode *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlNode *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlNodeObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlNode *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlNode *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [TemplateableElement]
@@ -634,8 +637,8 @@ bool QUmlNodeObject::isRedefinitionContextValid(QObject *redefined) const
 QSet<QObject *> QUmlNodeObject::parameterableElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterableElement *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->parameterableElements())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterableElement *element, qmodelingelementproperty_cast<QUmlNode *>(this)->parameterableElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -644,52 +647,52 @@ QSet<QObject *> QUmlNodeObject::parameterableElements() const
 QSet<QObject *> QUmlNodeObject::allFeatures() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->allFeatures())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlNode *>(this)->allFeatures())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlNodeObject::allParents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->allParents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlNode *>(this)->allParents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlNodeObject::conformsTo(QObject *other) const
 {
-    return qmodelingobjectproperty_cast<QUmlNode *>(this)->conformsTo(qmodelingobjectproperty_cast<QUmlClassifier *>(other));
+    return qmodelingelementproperty_cast<QUmlNode *>(this)->conformsTo(qmodelingelementproperty_cast<QUmlClassifier *>(other));
 }
 
 bool QUmlNodeObject::hasVisibilityOf(QObject *n) const
 {
-    return qmodelingobjectproperty_cast<QUmlNode *>(this)->hasVisibilityOf(qmodelingobjectproperty_cast<QUmlNamedElement *>(n));
+    return qmodelingelementproperty_cast<QUmlNode *>(this)->hasVisibilityOf(qmodelingelementproperty_cast<QUmlNamedElement *>(n));
 }
 
 QSet<QObject *> QUmlNodeObject::inheritableMembers(QObject *c) const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->inheritableMembers(qmodelingobjectproperty_cast<QUmlClassifier *>(c)))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlNode *>(this)->inheritableMembers(qmodelingelementproperty_cast<QUmlClassifier *>(c)))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlNodeObject::isTemplate() const
 {
-    return qmodelingobjectproperty_cast<QUmlNode *>(this)->isTemplate();
+    return qmodelingelementproperty_cast<QUmlNode *>(this)->isTemplate();
 }
 
 bool QUmlNodeObject::maySpecializeType(QObject *c) const
 {
-    return qmodelingobjectproperty_cast<QUmlNode *>(this)->maySpecializeType(qmodelingobjectproperty_cast<QUmlClassifier *>(c));
+    return qmodelingelementproperty_cast<QUmlNode *>(this)->maySpecializeType(qmodelingelementproperty_cast<QUmlClassifier *>(c));
 }
 
 QSet<QObject *> QUmlNodeObject::parents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->parents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlNode *>(this)->parents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -699,10 +702,10 @@ QSet<QObject *> QUmlNodeObject::inherit(QSet<QObject *> inhs) const
 {
     QSet<QUmlNamedElement *> inhsConverted;
     foreach (QObject *object, inhs)
-        inhsConverted.insert(qmodelingobjectproperty_cast<QUmlNamedElement *>(object));
+        inhsConverted.insert(qmodelingelementproperty_cast<QUmlNamedElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlNode *>(this)->inherit(inhsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlNode *>(this)->inherit(inhsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -710,503 +713,614 @@ QSet<QObject *> QUmlNodeObject::inherit(QSet<QObject *> inhs) const
 
 void QUmlNodeObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlNodeObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlNodeObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlNodeObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlNodeObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlNodeObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlNodeObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlNodeObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlNode *>(this)->setName(name);
 }
 
 void QUmlNodeObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlNodeObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlNodeObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlNode *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlNodeObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlNodeObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlNodeObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlNodeObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlNodeObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlNodeObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlNodeObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlNodeObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlNodeObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlNodeObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlNodeObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlNodeObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlNodeObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlNodeObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlNode *>(this)->setVisibility(visibility);
 }
 
 void QUmlNodeObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Type]
 
 void QUmlNodeObject::setPackage(QObject *package)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->setPackage(qmodelingobjectproperty_cast<QUmlPackage *>(package));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->setPackage(qmodelingelementproperty_cast<QUmlPackage *>(package));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlNodeObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlNode *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlNodeObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlNodeObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlNodeObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlNodeObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlNodeObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateableElement]
 
 void QUmlNodeObject::addTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->addTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->addTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 void QUmlNodeObject::removeTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->removeTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->removeTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Classifier]
 
 void QUmlNodeObject::addAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->addAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->addAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlNodeObject::removeAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->removeAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->removeAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlNodeObject::addCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->addCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->addCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlNodeObject::removeCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->removeCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->removeCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlNodeObject::addFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->addFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->addFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlNodeObject::removeFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->removeFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->removeFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlNodeObject::addGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->addGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->addGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlNodeObject::removeGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->removeGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->removeGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlNodeObject::addInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->addInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->addInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlNodeObject::removeInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->removeInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->removeInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlNodeObject::setFinalSpecialization(bool isFinalSpecialization)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->setFinalSpecialization(isFinalSpecialization);
+    qmodelingelementproperty_cast<QUmlNode *>(this)->setFinalSpecialization(isFinalSpecialization);
 }
 
 void QUmlNodeObject::unsetFinalSpecialization()
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("finalSpecialization"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
 void QUmlNodeObject::setOwnedTemplateSignature(QObject *ownedTemplateSignature)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->setOwnedTemplateSignature(qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->setOwnedTemplateSignature(qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
 }
 
 void QUmlNodeObject::addOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->addOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->addOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlNodeObject::removeOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->removeOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->removeOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlNodeObject::addPowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->addPowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->addPowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlNodeObject::removePowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->removePowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->removePowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlNodeObject::addRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->addRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->addRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlNodeObject::removeRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->removeRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->removeRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlNodeObject::setRepresentation(QObject *representation)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->setRepresentation(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(representation));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->setRepresentation(qmodelingelementproperty_cast<QUmlCollaborationUse *>(representation));
 }
 
 void QUmlNodeObject::addSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->addSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->addSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlNodeObject::removeSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->removeSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->removeSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlNodeObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
 }
 
 void QUmlNodeObject::addUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->addUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->addUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 void QUmlNodeObject::removeUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->removeUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->removeUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [StructuredClassifier]
 
 void QUmlNodeObject::addOwnedConnector(QObject *ownedConnector)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->addOwnedConnector(qmodelingobjectproperty_cast<QUmlConnector *>(ownedConnector));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->addOwnedConnector(qmodelingelementproperty_cast<QUmlConnector *>(ownedConnector));
 }
 
 void QUmlNodeObject::removeOwnedConnector(QObject *ownedConnector)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->removeOwnedConnector(qmodelingobjectproperty_cast<QUmlConnector *>(ownedConnector));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->removeOwnedConnector(qmodelingelementproperty_cast<QUmlConnector *>(ownedConnector));
 }
 
 void QUmlNodeObject::addPart(QObject *part)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->addPart(qmodelingobjectproperty_cast<QUmlProperty *>(part));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->addPart(qmodelingelementproperty_cast<QUmlProperty *>(part));
 }
 
 void QUmlNodeObject::removePart(QObject *part)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->removePart(qmodelingobjectproperty_cast<QUmlProperty *>(part));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->removePart(qmodelingelementproperty_cast<QUmlProperty *>(part));
 }
 
 void QUmlNodeObject::addRole(QObject *role)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->addRole(qmodelingobjectproperty_cast<QUmlConnectableElement *>(role));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->addRole(qmodelingelementproperty_cast<QUmlConnectableElement *>(role));
 }
 
 void QUmlNodeObject::removeRole(QObject *role)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->removeRole(qmodelingobjectproperty_cast<QUmlConnectableElement *>(role));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->removeRole(qmodelingelementproperty_cast<QUmlConnectableElement *>(role));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [EncapsulatedClassifier]
 
 void QUmlNodeObject::addOwnedPort(QObject *ownedPort)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->addOwnedPort(qmodelingobjectproperty_cast<QUmlPort *>(ownedPort));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->addOwnedPort(qmodelingelementproperty_cast<QUmlPort *>(ownedPort));
 }
 
 void QUmlNodeObject::removeOwnedPort(QObject *ownedPort)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->removeOwnedPort(qmodelingobjectproperty_cast<QUmlPort *>(ownedPort));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->removeOwnedPort(qmodelingelementproperty_cast<QUmlPort *>(ownedPort));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [BehavioredClassifier]
 
 void QUmlNodeObject::setClassifierBehavior(QObject *classifierBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->setClassifierBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(classifierBehavior));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->setClassifierBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(classifierBehavior));
 }
 
 void QUmlNodeObject::addInterfaceRealization(QObject *interfaceRealization)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->addInterfaceRealization(qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->addInterfaceRealization(qmodelingelementproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
 }
 
 void QUmlNodeObject::removeInterfaceRealization(QObject *interfaceRealization)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->removeInterfaceRealization(qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->removeInterfaceRealization(qmodelingelementproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
 }
 
 void QUmlNodeObject::addOwnedBehavior(QObject *ownedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->addOwnedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(ownedBehavior));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->addOwnedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(ownedBehavior));
 }
 
 void QUmlNodeObject::removeOwnedBehavior(QObject *ownedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->removeOwnedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(ownedBehavior));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->removeOwnedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(ownedBehavior));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Class]
 
 void QUmlNodeObject::addExtension(QObject *extension)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->addExtension(qmodelingobjectproperty_cast<QUmlExtension *>(extension));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->addExtension(qmodelingelementproperty_cast<QUmlExtension *>(extension));
 }
 
 void QUmlNodeObject::removeExtension(QObject *extension)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->removeExtension(qmodelingobjectproperty_cast<QUmlExtension *>(extension));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->removeExtension(qmodelingelementproperty_cast<QUmlExtension *>(extension));
 }
 
 void QUmlNodeObject::setAbstract(bool isAbstract)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->setAbstract(isAbstract);
+    qmodelingelementproperty_cast<QUmlNode *>(this)->setAbstract(isAbstract);
 }
 
 void QUmlNodeObject::unsetAbstract()
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("abstract"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
 void QUmlNodeObject::setActive(bool isActive)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->setActive(isActive);
+    qmodelingelementproperty_cast<QUmlNode *>(this)->setActive(isActive);
 }
 
 void QUmlNodeObject::unsetActive()
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("active"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("active"));
 }
 
 void QUmlNodeObject::addNestedClassifier(QObject *nestedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->addNestedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(nestedClassifier));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->addNestedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(nestedClassifier));
 }
 
 void QUmlNodeObject::removeNestedClassifier(QObject *nestedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->removeNestedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(nestedClassifier));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->removeNestedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(nestedClassifier));
 }
 
 void QUmlNodeObject::addOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->addOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->addOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlNodeObject::removeOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->removeOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->removeOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlNodeObject::addOwnedOperation(QObject *ownedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->addOwnedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(ownedOperation));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->addOwnedOperation(qmodelingelementproperty_cast<QUmlOperation *>(ownedOperation));
 }
 
 void QUmlNodeObject::removeOwnedOperation(QObject *ownedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->removeOwnedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(ownedOperation));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->removeOwnedOperation(qmodelingelementproperty_cast<QUmlOperation *>(ownedOperation));
 }
 
 void QUmlNodeObject::addOwnedReception(QObject *ownedReception)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->addOwnedReception(qmodelingobjectproperty_cast<QUmlReception *>(ownedReception));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->addOwnedReception(qmodelingelementproperty_cast<QUmlReception *>(ownedReception));
 }
 
 void QUmlNodeObject::removeOwnedReception(QObject *ownedReception)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->removeOwnedReception(qmodelingobjectproperty_cast<QUmlReception *>(ownedReception));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->removeOwnedReception(qmodelingelementproperty_cast<QUmlReception *>(ownedReception));
 }
 
 void QUmlNodeObject::addSuperClass(QObject *superClass)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->addSuperClass(qmodelingobjectproperty_cast<QUmlClass *>(superClass));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->addSuperClass(qmodelingelementproperty_cast<QUmlClass *>(superClass));
 }
 
 void QUmlNodeObject::removeSuperClass(QObject *superClass)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->removeSuperClass(qmodelingobjectproperty_cast<QUmlClass *>(superClass));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->removeSuperClass(qmodelingelementproperty_cast<QUmlClass *>(superClass));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [DeploymentTarget]
 
 void QUmlNodeObject::addDeployedElement(QObject *deployedElement)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->addDeployedElement(qmodelingobjectproperty_cast<QUmlPackageableElement *>(deployedElement));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->addDeployedElement(qmodelingelementproperty_cast<QUmlPackageableElement *>(deployedElement));
 }
 
 void QUmlNodeObject::removeDeployedElement(QObject *deployedElement)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->removeDeployedElement(qmodelingobjectproperty_cast<QUmlPackageableElement *>(deployedElement));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->removeDeployedElement(qmodelingelementproperty_cast<QUmlPackageableElement *>(deployedElement));
 }
 
 void QUmlNodeObject::addDeployment(QObject *deployment)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->addDeployment(qmodelingobjectproperty_cast<QUmlDeployment *>(deployment));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->addDeployment(qmodelingelementproperty_cast<QUmlDeployment *>(deployment));
 }
 
 void QUmlNodeObject::removeDeployment(QObject *deployment)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->removeDeployment(qmodelingobjectproperty_cast<QUmlDeployment *>(deployment));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->removeDeployment(qmodelingelementproperty_cast<QUmlDeployment *>(deployment));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Node]
 
 void QUmlNodeObject::addNestedNode(QObject *nestedNode)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->addNestedNode(qmodelingobjectproperty_cast<QUmlNode *>(nestedNode));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->addNestedNode(qmodelingelementproperty_cast<QUmlNode *>(nestedNode));
 }
 
 void QUmlNodeObject::removeNestedNode(QObject *nestedNode)
 {
-    qmodelingobjectproperty_cast<QUmlNode *>(this)->removeNestedNode(qmodelingobjectproperty_cast<QUmlNode *>(nestedNode));
+    qmodelingelementproperty_cast<QUmlNode *>(this)->removeNestedNode(qmodelingelementproperty_cast<QUmlNode *>(nestedNode));
+}
+
+
+void QUmlNodeObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlType");
+    d->groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
+
+    d->propertyGroups << QStringLiteral("QUmlStructuredClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedConnectors"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parts"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("roles"))));
+
+    d->propertyGroups << QStringLiteral("QUmlEncapsulatedClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlEncapsulatedClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedPorts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlBehavioredClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifierBehavior"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interfaceRealizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedBehaviors"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClass");
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extensions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isActive"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedReceptions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superClasses"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDeploymentTarget");
+    d->groupProperties.insert(QStringLiteral("QUmlDeploymentTarget"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deployedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDeploymentTarget"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deployments"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNode");
+    d->groupProperties.insert(QStringLiteral("QUmlNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedNodes"))));
+}
+
+void QUmlNodeObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlNode, nestedNodes, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlNode, nestedNodes, PropertyClassRole, QStringLiteral("QUmlNode"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlNode, nestedNodes, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlNode, nestedNodes, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlNode, nestedNodes, DocumentationRole, QStringLiteral("The Nodes that are defined (nested) within the Node."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlNode, nestedNodes, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlNode, nestedNodes, SubsettedPropertiesRole, QStringLiteral("Namespace-ownedMember"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlNode, nestedNodes, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlnodeobject_p.h b/src/uml/qobjects/qumlnodeobject_p.h
index 86f0d704..4145165a 100644
--- a/src/uml/qobjects/qumlnodeobject_p.h
+++ b/src/uml/qobjects/qumlnodeobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlNode;
-class Q_UML_EXPORT QUmlNodeObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlNodeObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlNodeObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -142,7 +145,7 @@ class Q_UML_EXPORT QUmlNodeObject : public QObject
     Q_PROPERTY(QSet<QObject *> nestedNodes READ nestedNodes)
 
 public:
-    Q_INVOKABLE explicit QUmlNodeObject(QUmlNode *qModelingObject);
+    Q_INVOKABLE explicit QUmlNodeObject(QUmlNode *qModelingElement);
     virtual ~QUmlNodeObject();
 
     // Owned attributes [Element]
@@ -396,6 +399,10 @@ public Q_SLOTS:
     // Slots for owned attributes [Node]
     void addNestedNode(QObject *nestedNode);
     void removeNestedNode(QObject *nestedNode);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlobjectflowobject.cpp b/src/uml/qobjects/qumlobjectflowobject.cpp
index aa53315d..266ca5be 100644
--- a/src/uml/qobjects/qumlobjectflowobject.cpp
+++ b/src/uml/qobjects/qumlobjectflowobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlobjectflowobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlObjectFlow>
 #include <QtUml/QUmlActivity>
@@ -62,16 +63,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlObjectFlowObject::QUmlObjectFlowObject(QUmlObjectFlow *qModelingObject)
+QUmlObjectFlowObject::QUmlObjectFlowObject(QUmlObjectFlow *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlObjectFlowObject::~QUmlObjectFlowObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -80,25 +83,25 @@ QUmlObjectFlowObject::~QUmlObjectFlowObject()
 const QSet<QObject *> QUmlObjectFlowObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlObjectFlowObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlObjectFlowObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -106,62 +109,62 @@ QObject *QUmlObjectFlowObject::owner() const
 const QSet<QObject *> QUmlObjectFlowObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlObjectFlowObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->name();
 }
 
 QObject *QUmlObjectFlowObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlObjectFlowObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlObjectFlowObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlObjectFlowObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlObjectFlowObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlObjectFlowObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlObjectFlowObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -169,110 +172,110 @@ const QSet<QObject *> QUmlObjectFlowObject::redefinitionContexts() const
 
 QObject *QUmlObjectFlowObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->activity()->asQModelingObject();
 }
 
 QObject *QUmlObjectFlowObject::guard() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->guard())
+    if (!qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->guard())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->guard()->asQObject();
+        return qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->guard()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlObjectFlowObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlObjectFlowObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlObjectFlowObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 QObject *QUmlObjectFlowObject::interrupts() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->interrupts())
+    if (!qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->interrupts())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->interrupts()->asQObject();
+        return qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->interrupts()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlObjectFlowObject::redefinedEdges() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->redefinedEdges())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->redefinedEdges())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlObjectFlowObject::source() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->source())
+    if (!qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->source())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->source()->asQObject();
+        return qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->source()->asQModelingObject();
 }
 
 QObject *QUmlObjectFlowObject::target() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->target())
+    if (!qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->target())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->target()->asQObject();
+        return qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->target()->asQModelingObject();
 }
 
 QObject *QUmlObjectFlowObject::weight() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->weight())
+    if (!qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->weight())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->weight()->asQObject();
+        return qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->weight()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ObjectFlow]
 
 bool QUmlObjectFlowObject::isMulticast() const
 {
-    return qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->isMulticast();
+    return qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->isMulticast();
 }
 
 bool QUmlObjectFlowObject::isMultireceive() const
 {
-    return qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->isMultireceive();
+    return qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->isMultireceive();
 }
 
 QObject *QUmlObjectFlowObject::selection() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->selection())
+    if (!qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->selection())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->selection()->asQObject();
+        return qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->selection()->asQModelingObject();
 }
 
 QObject *QUmlObjectFlowObject::transformation() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->transformation())
+    if (!qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->transformation())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->transformation()->asQObject();
+        return qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->transformation()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -280,14 +283,14 @@ QObject *QUmlObjectFlowObject::transformation() const
 QSet<QObject *> QUmlObjectFlowObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlObjectFlowObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -295,234 +298,323 @@ bool QUmlObjectFlowObject::mustBeOwned() const
 QList<QObject *> QUmlObjectFlowObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlObjectFlowObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlObjectFlowObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlObjectFlowObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlObjectFlowObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlObjectFlowObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlObjectFlowObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlObjectFlowObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlObjectFlowObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlObjectFlowObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlObjectFlowObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlObjectFlowObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlObjectFlowObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlObjectFlowObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->setName(name);
 }
 
 void QUmlObjectFlowObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlObjectFlowObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlObjectFlowObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlObjectFlowObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlObjectFlowObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlObjectFlowObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlObjectFlowObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlObjectFlowObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlObjectFlowObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlObjectFlowObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityEdge]
 
 void QUmlObjectFlowObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlObjectFlowObject::setGuard(QObject *guard)
 {
-    qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->setGuard(qmodelingobjectproperty_cast<QUmlValueSpecification *>(guard));
+    qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->setGuard(qmodelingelementproperty_cast<QUmlValueSpecification *>(guard));
 }
 
 void QUmlObjectFlowObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlObjectFlowObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlObjectFlowObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlObjectFlowObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlObjectFlowObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlObjectFlowObject::setInterrupts(QObject *interrupts)
 {
-    qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->setInterrupts(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(interrupts));
+    qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->setInterrupts(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(interrupts));
 }
 
 void QUmlObjectFlowObject::addRedefinedEdge(QObject *redefinedEdge)
 {
-    qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->addRedefinedEdge(qmodelingobjectproperty_cast<QUmlActivityEdge *>(redefinedEdge));
+    qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->addRedefinedEdge(qmodelingelementproperty_cast<QUmlActivityEdge *>(redefinedEdge));
 }
 
 void QUmlObjectFlowObject::removeRedefinedEdge(QObject *redefinedEdge)
 {
-    qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->removeRedefinedEdge(qmodelingobjectproperty_cast<QUmlActivityEdge *>(redefinedEdge));
+    qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->removeRedefinedEdge(qmodelingelementproperty_cast<QUmlActivityEdge *>(redefinedEdge));
 }
 
 void QUmlObjectFlowObject::setSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->setSource(qmodelingobjectproperty_cast<QUmlActivityNode *>(source));
+    qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->setSource(qmodelingelementproperty_cast<QUmlActivityNode *>(source));
 }
 
 void QUmlObjectFlowObject::setTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->setTarget(qmodelingobjectproperty_cast<QUmlActivityNode *>(target));
+    qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->setTarget(qmodelingelementproperty_cast<QUmlActivityNode *>(target));
 }
 
 void QUmlObjectFlowObject::setWeight(QObject *weight)
 {
-    qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->setWeight(qmodelingobjectproperty_cast<QUmlValueSpecification *>(weight));
+    qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->setWeight(qmodelingelementproperty_cast<QUmlValueSpecification *>(weight));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ObjectFlow]
 
 void QUmlObjectFlowObject::setMulticast(bool isMulticast)
 {
-    qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->setMulticast(isMulticast);
+    qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->setMulticast(isMulticast);
 }
 
 void QUmlObjectFlowObject::unsetMulticast()
 {
-    qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("multicast"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("multicast"));
 }
 
 void QUmlObjectFlowObject::setMultireceive(bool isMultireceive)
 {
-    qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->setMultireceive(isMultireceive);
+    qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->setMultireceive(isMultireceive);
 }
 
 void QUmlObjectFlowObject::unsetMultireceive()
 {
-    qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("multireceive"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("multireceive"));
 }
 
 void QUmlObjectFlowObject::setSelection(QObject *selection)
 {
-    qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->setSelection(qmodelingobjectproperty_cast<QUmlBehavior *>(selection));
+    qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->setSelection(qmodelingelementproperty_cast<QUmlBehavior *>(selection));
 }
 
 void QUmlObjectFlowObject::setTransformation(QObject *transformation)
 {
-    qmodelingobjectproperty_cast<QUmlObjectFlow *>(this)->setTransformation(qmodelingobjectproperty_cast<QUmlBehavior *>(transformation));
+    qmodelingelementproperty_cast<QUmlObjectFlow *>(this)->setTransformation(qmodelingelementproperty_cast<QUmlBehavior *>(transformation));
+}
+
+
+void QUmlObjectFlowObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityEdge");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("guard"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interrupts"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedEdges"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("source"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("target"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("weight"))));
+
+    d->propertyGroups << QStringLiteral("QUmlObjectFlow");
+    d->groupProperties.insert(QStringLiteral("QUmlObjectFlow"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isMulticast"))));
+    d->groupProperties.insert(QStringLiteral("QUmlObjectFlow"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isMultireceive"))));
+    d->groupProperties.insert(QStringLiteral("QUmlObjectFlow"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("selection"))));
+    d->groupProperties.insert(QStringLiteral("QUmlObjectFlow"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("transformation"))));
+}
+
+void QUmlObjectFlowObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlObjectFlow, isMulticast, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlObjectFlow, isMulticast, PropertyClassRole, QStringLiteral("QUmlObjectFlow"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlObjectFlow, isMulticast, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlObjectFlow, isMulticast, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlObjectFlow, isMulticast, DocumentationRole, QStringLiteral("Tells whether the objects in the flow are passed by multicasting."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlObjectFlow, isMulticast, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlObjectFlow, isMulticast, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlObjectFlow, isMulticast, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlObjectFlow, isMultireceive, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlObjectFlow, isMultireceive, PropertyClassRole, QStringLiteral("QUmlObjectFlow"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlObjectFlow, isMultireceive, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlObjectFlow, isMultireceive, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlObjectFlow, isMultireceive, DocumentationRole, QStringLiteral("Tells whether the objects in the flow are gathered from respondents to multicasting."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlObjectFlow, isMultireceive, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlObjectFlow, isMultireceive, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlObjectFlow, isMultireceive, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlObjectFlow, selection, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlObjectFlow, selection, PropertyClassRole, QStringLiteral("QUmlObjectFlow"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlObjectFlow, selection, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlObjectFlow, selection, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlObjectFlow, selection, DocumentationRole, QStringLiteral("Selects tokens from a source object node."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlObjectFlow, selection, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlObjectFlow, selection, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlObjectFlow, selection, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlObjectFlow, transformation, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlObjectFlow, transformation, PropertyClassRole, QStringLiteral("QUmlObjectFlow"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlObjectFlow, transformation, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlObjectFlow, transformation, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlObjectFlow, transformation, DocumentationRole, QStringLiteral("Changes or replaces data tokens flowing along edge."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlObjectFlow, transformation, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlObjectFlow, transformation, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlObjectFlow, transformation, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlobjectflowobject_p.h b/src/uml/qobjects/qumlobjectflowobject_p.h
index 9d751927..de306c06 100644
--- a/src/uml/qobjects/qumlobjectflowobject_p.h
+++ b/src/uml/qobjects/qumlobjectflowobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlObjectFlow;
-class Q_UML_EXPORT QUmlObjectFlowObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlObjectFlowObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlObjectFlowObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -95,7 +98,7 @@ class Q_UML_EXPORT QUmlObjectFlowObject : public QObject
     Q_PROPERTY(QObject * transformation READ transformation WRITE setTransformation)
 
 public:
-    Q_INVOKABLE explicit QUmlObjectFlowObject(QUmlObjectFlow *qModelingObject);
+    Q_INVOKABLE explicit QUmlObjectFlowObject(QUmlObjectFlow *qModelingElement);
     virtual ~QUmlObjectFlowObject();
 
     // Owned attributes [Element]
@@ -196,6 +199,10 @@ public Q_SLOTS:
     void unsetMultireceive();
     void setSelection(QObject *selection = 0);
     void setTransformation(QObject *transformation = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumloccurrencespecificationobject.cpp b/src/uml/qobjects/qumloccurrencespecificationobject.cpp
index e6425817..e3b9bca7 100644
--- a/src/uml/qobjects/qumloccurrencespecificationobject.cpp
+++ b/src/uml/qobjects/qumloccurrencespecificationobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumloccurrencespecificationobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlOccurrenceSpecification>
 #include <QtUml/QUmlComment>
@@ -55,16 +56,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlOccurrenceSpecificationObject::QUmlOccurrenceSpecificationObject(QUmlOccurrenceSpecification *qModelingObject)
+QUmlOccurrenceSpecificationObject::QUmlOccurrenceSpecificationObject(QUmlOccurrenceSpecification *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlOccurrenceSpecificationObject::~QUmlOccurrenceSpecificationObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -73,25 +76,25 @@ QUmlOccurrenceSpecificationObject::~QUmlOccurrenceSpecificationObject()
 const QSet<QObject *> QUmlOccurrenceSpecificationObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOccurrenceSpecificationObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlOccurrenceSpecificationObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -99,65 +102,65 @@ QObject *QUmlOccurrenceSpecificationObject::owner() const
 const QSet<QObject *> QUmlOccurrenceSpecificationObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlOccurrenceSpecificationObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->name();
 }
 
 QObject *QUmlOccurrenceSpecificationObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlOccurrenceSpecificationObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlOccurrenceSpecificationObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlOccurrenceSpecificationObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [InteractionFragment]
 
 QObject *QUmlOccurrenceSpecificationObject::enclosingInteraction() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->enclosingInteraction())
+    if (!qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->enclosingInteraction())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->enclosingInteraction()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->enclosingInteraction()->asQModelingObject();
 }
 
 QObject *QUmlOccurrenceSpecificationObject::enclosingOperand() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->enclosingOperand())
+    if (!qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->enclosingOperand())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->enclosingOperand()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->enclosingOperand()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlOccurrenceSpecificationObject::generalOrderings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralOrdering *element, qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->generalOrderings())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralOrdering *element, qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->generalOrderings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -165,25 +168,25 @@ const QSet<QObject *> QUmlOccurrenceSpecificationObject::generalOrderings() cons
 
 QObject *QUmlOccurrenceSpecificationObject::covered() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->covered())
+    if (!qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->covered())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->covered()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->covered()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlOccurrenceSpecificationObject::toAfters() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralOrdering *element, qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->toAfters())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralOrdering *element, qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->toAfters())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOccurrenceSpecificationObject::toBefores() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralOrdering *element, qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->toBefores())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralOrdering *element, qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->toBefores())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -192,14 +195,14 @@ const QSet<QObject *> QUmlOccurrenceSpecificationObject::toBefores() const
 QSet<QObject *> QUmlOccurrenceSpecificationObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlOccurrenceSpecificationObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -207,140 +210,204 @@ bool QUmlOccurrenceSpecificationObject::mustBeOwned() const
 QList<QObject *> QUmlOccurrenceSpecificationObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlOccurrenceSpecificationObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlOccurrenceSpecificationObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlOccurrenceSpecificationObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlOccurrenceSpecificationObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlOccurrenceSpecificationObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlOccurrenceSpecificationObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlOccurrenceSpecificationObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlOccurrenceSpecificationObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlOccurrenceSpecificationObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlOccurrenceSpecificationObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlOccurrenceSpecificationObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->setName(name);
 }
 
 void QUmlOccurrenceSpecificationObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlOccurrenceSpecificationObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlOccurrenceSpecificationObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlOccurrenceSpecificationObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [InteractionFragment]
 
 void QUmlOccurrenceSpecificationObject::setEnclosingInteraction(QObject *enclosingInteraction)
 {
-    qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->setEnclosingInteraction(qmodelingobjectproperty_cast<QUmlInteraction *>(enclosingInteraction));
+    qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->setEnclosingInteraction(qmodelingelementproperty_cast<QUmlInteraction *>(enclosingInteraction));
 }
 
 void QUmlOccurrenceSpecificationObject::setEnclosingOperand(QObject *enclosingOperand)
 {
-    qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->setEnclosingOperand(qmodelingobjectproperty_cast<QUmlInteractionOperand *>(enclosingOperand));
+    qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->setEnclosingOperand(qmodelingelementproperty_cast<QUmlInteractionOperand *>(enclosingOperand));
 }
 
 void QUmlOccurrenceSpecificationObject::addGeneralOrdering(QObject *generalOrdering)
 {
-    qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->addGeneralOrdering(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
+    qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->addGeneralOrdering(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
 }
 
 void QUmlOccurrenceSpecificationObject::removeGeneralOrdering(QObject *generalOrdering)
 {
-    qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->removeGeneralOrdering(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
+    qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->removeGeneralOrdering(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [OccurrenceSpecification]
 
 void QUmlOccurrenceSpecificationObject::setCovered(QObject *covered)
 {
-    qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->setCovered(qmodelingobjectproperty_cast<QUmlLifeline *>(covered));
+    qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->setCovered(qmodelingelementproperty_cast<QUmlLifeline *>(covered));
 }
 
 void QUmlOccurrenceSpecificationObject::addToAfter(QObject *toAfter)
 {
-    qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->addToAfter(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(toAfter));
+    qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->addToAfter(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(toAfter));
 }
 
 void QUmlOccurrenceSpecificationObject::removeToAfter(QObject *toAfter)
 {
-    qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->removeToAfter(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(toAfter));
+    qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->removeToAfter(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(toAfter));
 }
 
 void QUmlOccurrenceSpecificationObject::addToBefore(QObject *toBefore)
 {
-    qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->addToBefore(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(toBefore));
+    qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->addToBefore(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(toBefore));
 }
 
 void QUmlOccurrenceSpecificationObject::removeToBefore(QObject *toBefore)
 {
-    qmodelingobjectproperty_cast<QUmlOccurrenceSpecification *>(this)->removeToBefore(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(toBefore));
+    qmodelingelementproperty_cast<QUmlOccurrenceSpecification *>(this)->removeToBefore(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(toBefore));
+}
+
+
+void QUmlOccurrenceSpecificationObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlInteractionFragment");
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingInteraction"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingOperand"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalOrderings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlOccurrenceSpecification");
+    d->groupProperties.insert(QStringLiteral("QUmlOccurrenceSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("covered"))));
+    d->groupProperties.insert(QStringLiteral("QUmlOccurrenceSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("toAfters"))));
+    d->groupProperties.insert(QStringLiteral("QUmlOccurrenceSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("toBefores"))));
+}
+
+void QUmlOccurrenceSpecificationObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOccurrenceSpecification, covered, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOccurrenceSpecification, covered, PropertyClassRole, QStringLiteral("QUmlOccurrenceSpecification"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOccurrenceSpecification, covered, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOccurrenceSpecification, covered, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOccurrenceSpecification, covered, DocumentationRole, QStringLiteral("References the Lifeline on which the OccurrenceSpecification appears."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOccurrenceSpecification, covered, RedefinedPropertiesRole, QStringLiteral("InteractionFragment-covered"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOccurrenceSpecification, covered, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOccurrenceSpecification, covered, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOccurrenceSpecification, toAfters, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOccurrenceSpecification, toAfters, PropertyClassRole, QStringLiteral("QUmlOccurrenceSpecification"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOccurrenceSpecification, toAfters, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOccurrenceSpecification, toAfters, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOccurrenceSpecification, toAfters, DocumentationRole, QStringLiteral("References the GeneralOrderings that specify EventOcurrences that must occur after this OccurrenceSpecification"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOccurrenceSpecification, toAfters, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOccurrenceSpecification, toAfters, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOccurrenceSpecification, toAfters, OppositeEndRole, QStringLiteral("GeneralOrdering-before"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOccurrenceSpecification, toBefores, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOccurrenceSpecification, toBefores, PropertyClassRole, QStringLiteral("QUmlOccurrenceSpecification"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOccurrenceSpecification, toBefores, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOccurrenceSpecification, toBefores, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOccurrenceSpecification, toBefores, DocumentationRole, QStringLiteral("References the GeneralOrderings that specify EventOcurrences that must occur before this OccurrenceSpecification"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOccurrenceSpecification, toBefores, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOccurrenceSpecification, toBefores, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOccurrenceSpecification, toBefores, OppositeEndRole, QStringLiteral("GeneralOrdering-after"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumloccurrencespecificationobject_p.h b/src/uml/qobjects/qumloccurrencespecificationobject_p.h
index 6e1ead67..82a71db7 100644
--- a/src/uml/qobjects/qumloccurrencespecificationobject_p.h
+++ b/src/uml/qobjects/qumloccurrencespecificationobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlOccurrenceSpecification;
-class Q_UML_EXPORT QUmlOccurrenceSpecificationObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlOccurrenceSpecificationObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlOccurrenceSpecificationObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -82,7 +85,7 @@ class Q_UML_EXPORT QUmlOccurrenceSpecificationObject : public QObject
     Q_PROPERTY(QSet<QObject *> toBefores READ toBefores)
 
 public:
-    Q_INVOKABLE explicit QUmlOccurrenceSpecificationObject(QUmlOccurrenceSpecification *qModelingObject);
+    Q_INVOKABLE explicit QUmlOccurrenceSpecificationObject(QUmlOccurrenceSpecification *qModelingElement);
     virtual ~QUmlOccurrenceSpecificationObject();
 
     // Owned attributes [Element]
@@ -148,6 +151,10 @@ public Q_SLOTS:
     void removeToAfter(QObject *toAfter);
     void addToBefore(QObject *toBefore);
     void removeToBefore(QObject *toBefore);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlopaqueactionobject.cpp b/src/uml/qobjects/qumlopaqueactionobject.cpp
index 7685cc6e..3114533e 100644
--- a/src/uml/qobjects/qumlopaqueactionobject.cpp
+++ b/src/uml/qobjects/qumlopaqueactionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlopaqueactionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlOpaqueAction>
 #include <QtUml/QUmlActivity>
@@ -64,16 +65,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlOpaqueActionObject::QUmlOpaqueActionObject(QUmlOpaqueAction *qModelingObject)
+QUmlOpaqueActionObject::QUmlOpaqueActionObject(QUmlOpaqueAction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlOpaqueActionObject::~QUmlOpaqueActionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -82,25 +85,25 @@ QUmlOpaqueActionObject::~QUmlOpaqueActionObject()
 const QSet<QObject *> QUmlOpaqueActionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOpaqueActionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlOpaqueActionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -108,62 +111,62 @@ QObject *QUmlOpaqueActionObject::owner() const
 const QSet<QObject *> QUmlOpaqueActionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlOpaqueActionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->name();
 }
 
 QObject *QUmlOpaqueActionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlOpaqueActionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlOpaqueActionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlOpaqueActionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlOpaqueActionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlOpaqueActionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOpaqueActionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -171,65 +174,65 @@ const QSet<QObject *> QUmlOpaqueActionObject::redefinitionContexts() const
 
 QObject *QUmlOpaqueActionObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlOpaqueActionObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOpaqueActionObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOpaqueActionObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlOpaqueActionObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlOpaqueActionObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOpaqueActionObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOpaqueActionObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -238,8 +241,8 @@ const QSet<QObject *> QUmlOpaqueActionObject::redefinedNodes() const
 const QSet<QObject *> QUmlOpaqueActionObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -247,46 +250,46 @@ const QSet<QObject *> QUmlOpaqueActionObject::handlers() const
 
 QObject *QUmlOpaqueActionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlOpaqueActionObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlOpaqueActionObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlOpaqueActionObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOpaqueActionObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlOpaqueActionObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -294,27 +297,27 @@ const QList<QObject *> QUmlOpaqueActionObject::outputs() const
 
 const QList<QString> QUmlOpaqueActionObject::bodies() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->bodies();
+    return qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->bodies();
 }
 
 const QSet<QObject *> QUmlOpaqueActionObject::inputValues() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->inputValues())
-        set.insert(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->inputValues())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QString> QUmlOpaqueActionObject::languages() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->languages();
+    return qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->languages();
 }
 
 const QSet<QObject *> QUmlOpaqueActionObject::outputValues() const
 {
     QSet<QObject *> set;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->outputValues())
-        set.insert(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->outputValues())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -323,14 +326,14 @@ const QSet<QObject *> QUmlOpaqueActionObject::outputValues() const
 QSet<QObject *> QUmlOpaqueActionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlOpaqueActionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -338,318 +341,415 @@ bool QUmlOpaqueActionObject::mustBeOwned() const
 QList<QObject *> QUmlOpaqueActionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlOpaqueActionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlOpaqueActionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlOpaqueActionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlOpaqueActionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlOpaqueActionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlOpaqueActionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlOpaqueActionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlOpaqueActionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlOpaqueActionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlOpaqueActionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlOpaqueActionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlOpaqueActionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlOpaqueActionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->setName(name);
 }
 
 void QUmlOpaqueActionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlOpaqueActionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlOpaqueActionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlOpaqueActionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlOpaqueActionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlOpaqueActionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlOpaqueActionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlOpaqueActionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlOpaqueActionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlOpaqueActionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlOpaqueActionObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlOpaqueActionObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlOpaqueActionObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlOpaqueActionObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlOpaqueActionObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlOpaqueActionObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlOpaqueActionObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlOpaqueActionObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlOpaqueActionObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlOpaqueActionObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlOpaqueActionObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlOpaqueActionObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlOpaqueActionObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlOpaqueActionObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlOpaqueActionObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlOpaqueActionObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlOpaqueActionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlOpaqueActionObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlOpaqueActionObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlOpaqueActionObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlOpaqueActionObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlOpaqueActionObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlOpaqueActionObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlOpaqueActionObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlOpaqueActionObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlOpaqueActionObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlOpaqueActionObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [OpaqueAction]
 
 void QUmlOpaqueActionObject::addBody(QString  body)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->addBody(body);
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->addBody(body);
 }
 
 void QUmlOpaqueActionObject::removeBody(QString  body)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->removeBody(body);
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->removeBody(body);
 }
 
 void QUmlOpaqueActionObject::addInputValue(QObject *inputValue)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->addInputValue(qmodelingobjectproperty_cast<QUmlInputPin *>(inputValue));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->addInputValue(qmodelingelementproperty_cast<QUmlInputPin *>(inputValue));
 }
 
 void QUmlOpaqueActionObject::removeInputValue(QObject *inputValue)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->removeInputValue(qmodelingobjectproperty_cast<QUmlInputPin *>(inputValue));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->removeInputValue(qmodelingelementproperty_cast<QUmlInputPin *>(inputValue));
 }
 
 void QUmlOpaqueActionObject::addLanguage(QString  language)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->addLanguage(language);
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->addLanguage(language);
 }
 
 void QUmlOpaqueActionObject::removeLanguage(QString  language)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->removeLanguage(language);
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->removeLanguage(language);
 }
 
 void QUmlOpaqueActionObject::addOutputValue(QObject *outputValue)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->addOutputValue(qmodelingobjectproperty_cast<QUmlOutputPin *>(outputValue));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->addOutputValue(qmodelingelementproperty_cast<QUmlOutputPin *>(outputValue));
 }
 
 void QUmlOpaqueActionObject::removeOutputValue(QObject *outputValue)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueAction *>(this)->removeOutputValue(qmodelingobjectproperty_cast<QUmlOutputPin *>(outputValue));
+    qmodelingelementproperty_cast<QUmlOpaqueAction *>(this)->removeOutputValue(qmodelingelementproperty_cast<QUmlOutputPin *>(outputValue));
+}
+
+
+void QUmlOpaqueActionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlOpaqueAction");
+    d->groupProperties.insert(QStringLiteral("QUmlOpaqueAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("bodies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlOpaqueAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputValues"))));
+    d->groupProperties.insert(QStringLiteral("QUmlOpaqueAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("languages"))));
+    d->groupProperties.insert(QStringLiteral("QUmlOpaqueAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputValues"))));
+}
+
+void QUmlOpaqueActionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueAction, bodies, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueAction, bodies, PropertyClassRole, QStringLiteral("QUmlOpaqueAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueAction, bodies, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueAction, bodies, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueAction, bodies, DocumentationRole, QStringLiteral("Specifies the action in one or more languages."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueAction, bodies, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueAction, bodies, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueAction, bodies, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueAction, inputValues, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueAction, inputValues, PropertyClassRole, QStringLiteral("QUmlOpaqueAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueAction, inputValues, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueAction, inputValues, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueAction, inputValues, DocumentationRole, QStringLiteral("Provides input to the action."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueAction, inputValues, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueAction, inputValues, SubsettedPropertiesRole, QStringLiteral("Action-input"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueAction, inputValues, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueAction, languages, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueAction, languages, PropertyClassRole, QStringLiteral("QUmlOpaqueAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueAction, languages, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueAction, languages, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueAction, languages, DocumentationRole, QStringLiteral("Languages the body strings use, in the same order as the body strings"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueAction, languages, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueAction, languages, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueAction, languages, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueAction, outputValues, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueAction, outputValues, PropertyClassRole, QStringLiteral("QUmlOpaqueAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueAction, outputValues, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueAction, outputValues, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueAction, outputValues, DocumentationRole, QStringLiteral("Takes output from the action."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueAction, outputValues, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueAction, outputValues, SubsettedPropertiesRole, QStringLiteral("Action-output"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueAction, outputValues, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlopaqueactionobject_p.h b/src/uml/qobjects/qumlopaqueactionobject_p.h
index c600dde5..a1053464 100644
--- a/src/uml/qobjects/qumlopaqueactionobject_p.h
+++ b/src/uml/qobjects/qumlopaqueactionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlOpaqueAction;
-class Q_UML_EXPORT QUmlOpaqueActionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlOpaqueActionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlOpaqueActionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -104,7 +107,7 @@ class Q_UML_EXPORT QUmlOpaqueActionObject : public QObject
     Q_PROPERTY(QSet<QObject *> outputValues READ outputValues)
 
 public:
-    Q_INVOKABLE explicit QUmlOpaqueActionObject(QUmlOpaqueAction *qModelingObject);
+    Q_INVOKABLE explicit QUmlOpaqueActionObject(QUmlOpaqueAction *qModelingElement);
     virtual ~QUmlOpaqueActionObject();
 
     // Owned attributes [Element]
@@ -234,6 +237,10 @@ public Q_SLOTS:
     void removeLanguage(QString language);
     void addOutputValue(QObject *outputValue);
     void removeOutputValue(QObject *outputValue);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlopaquebehaviorobject.cpp b/src/uml/qobjects/qumlopaquebehaviorobject.cpp
index 544f58bf..976aade1 100644
--- a/src/uml/qobjects/qumlopaquebehaviorobject.cpp
+++ b/src/uml/qobjects/qumlopaquebehaviorobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlopaquebehaviorobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlOpaqueBehavior>
 #include <QtUml/QUmlBehavior>
@@ -84,16 +85,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlOpaqueBehaviorObject::QUmlOpaqueBehaviorObject(QUmlOpaqueBehavior *qModelingObject)
+QUmlOpaqueBehaviorObject::QUmlOpaqueBehaviorObject(QUmlOpaqueBehavior *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlOpaqueBehaviorObject::~QUmlOpaqueBehaviorObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -102,25 +105,25 @@ QUmlOpaqueBehaviorObject::~QUmlOpaqueBehaviorObject()
 const QSet<QObject *> QUmlOpaqueBehaviorObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOpaqueBehaviorObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlOpaqueBehaviorObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -128,35 +131,35 @@ QObject *QUmlOpaqueBehaviorObject::owner() const
 const QSet<QObject *> QUmlOpaqueBehaviorObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlOpaqueBehaviorObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->name();
 }
 
 QObject *QUmlOpaqueBehaviorObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlOpaqueBehaviorObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlOpaqueBehaviorObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [Namespace]
@@ -164,48 +167,48 @@ QString QUmlOpaqueBehaviorObject::qualifiedName() const
 const QSet<QObject *> QUmlOpaqueBehaviorObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOpaqueBehaviorObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOpaqueBehaviorObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOpaqueBehaviorObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOpaqueBehaviorObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOpaqueBehaviorObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -213,49 +216,49 @@ const QSet<QObject *> QUmlOpaqueBehaviorObject::packageImports() const
 
 QObject *QUmlOpaqueBehaviorObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlOpaqueBehaviorObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Type]
 
 QObject *QUmlOpaqueBehaviorObject::package() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->package())
+    if (!qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->package())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->package()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->package()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlOpaqueBehaviorObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlOpaqueBehaviorObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOpaqueBehaviorObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -264,8 +267,8 @@ const QSet<QObject *> QUmlOpaqueBehaviorObject::redefinitionContexts() const
 const QSet<QObject *> QUmlOpaqueBehaviorObject::templateBindings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTemplateBinding *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->templateBindings())
-        set.insert(element->asQObject());
+    foreach (QUmlTemplateBinding *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->templateBindings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -274,109 +277,109 @@ const QSet<QObject *> QUmlOpaqueBehaviorObject::templateBindings() const
 const QSet<QObject *> QUmlOpaqueBehaviorObject::attributes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->attributes())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->attributes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOpaqueBehaviorObject::collaborationUses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlCollaborationUse *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->collaborationUses())
-        set.insert(element->asQObject());
+    foreach (QUmlCollaborationUse *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->collaborationUses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOpaqueBehaviorObject::features() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->features())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->features())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOpaqueBehaviorObject::generalizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralization *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->generalizations())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralization *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->generalizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOpaqueBehaviorObject::inheritedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->inheritedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->inheritedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlOpaqueBehaviorObject::isFinalSpecialization() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->isFinalSpecialization();
+    return qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->isFinalSpecialization();
 }
 
 QObject *QUmlOpaqueBehaviorObject::ownedTemplateSignature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->ownedTemplateSignature())
+    if (!qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->ownedTemplateSignature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->ownedTemplateSignature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->ownedTemplateSignature()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlOpaqueBehaviorObject::ownedUseCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->ownedUseCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->ownedUseCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOpaqueBehaviorObject::powertypeExtents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralizationSet *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->powertypeExtents())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralizationSet *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->powertypeExtents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOpaqueBehaviorObject::redefinedClassifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->redefinedClassifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->redefinedClassifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlOpaqueBehaviorObject::representation() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->representation())
+    if (!qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->representation())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->representation()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->representation()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlOpaqueBehaviorObject::substitutions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlSubstitution *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->substitutions())
-        set.insert(element->asQObject());
+    foreach (QUmlSubstitution *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->substitutions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlOpaqueBehaviorObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->templateParameter()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlOpaqueBehaviorObject::useCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->useCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->useCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -385,24 +388,24 @@ const QSet<QObject *> QUmlOpaqueBehaviorObject::useCases() const
 const QSet<QObject *> QUmlOpaqueBehaviorObject::ownedConnectors() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConnector *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->ownedConnectors())
-        set.insert(element->asQObject());
+    foreach (QUmlConnector *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->ownedConnectors())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOpaqueBehaviorObject::parts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->parts())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->parts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOpaqueBehaviorObject::roles() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConnectableElement *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->roles())
-        set.insert(element->asQObject());
+    foreach (QUmlConnectableElement *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->roles())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -411,8 +414,8 @@ const QSet<QObject *> QUmlOpaqueBehaviorObject::roles() const
 const QSet<QObject *> QUmlOpaqueBehaviorObject::ownedPorts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPort *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->ownedPorts())
-        set.insert(element->asQObject());
+    foreach (QUmlPort *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->ownedPorts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -420,25 +423,25 @@ const QSet<QObject *> QUmlOpaqueBehaviorObject::ownedPorts() const
 
 QObject *QUmlOpaqueBehaviorObject::classifierBehavior() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->classifierBehavior())
+    if (!qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->classifierBehavior())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->classifierBehavior()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->classifierBehavior()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlOpaqueBehaviorObject::interfaceRealizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterfaceRealization *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->interfaceRealizations())
-        set.insert(element->asQObject());
+    foreach (QUmlInterfaceRealization *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->interfaceRealizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOpaqueBehaviorObject::ownedBehaviors() const
 {
     QSet<QObject *> set;
-    foreach (QUmlBehavior *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->ownedBehaviors())
-        set.insert(element->asQObject());
+    foreach (QUmlBehavior *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->ownedBehaviors())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -447,58 +450,58 @@ const QSet<QObject *> QUmlOpaqueBehaviorObject::ownedBehaviors() const
 const QSet<QObject *> QUmlOpaqueBehaviorObject::extensions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExtension *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->extensions())
-        set.insert(element->asQObject());
+    foreach (QUmlExtension *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->extensions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlOpaqueBehaviorObject::isAbstract() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->isAbstract();
+    return qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->isAbstract();
 }
 
 bool QUmlOpaqueBehaviorObject::isActive() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->isActive();
+    return qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->isActive();
 }
 
 const QList<QObject *> QUmlOpaqueBehaviorObject::nestedClassifiers() const
 {
     QList<QObject *> list;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->nestedClassifiers())
-        list.append(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->nestedClassifiers())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QList<QObject *> QUmlOpaqueBehaviorObject::ownedAttributes() const
 {
     QList<QObject *> list;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->ownedAttributes())
-        list.append(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->ownedAttributes())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QList<QObject *> QUmlOpaqueBehaviorObject::ownedOperations() const
 {
     QList<QObject *> list;
-    foreach (QUmlOperation *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->ownedOperations())
-        list.append(element->asQObject());
+    foreach (QUmlOperation *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->ownedOperations())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QSet<QObject *> QUmlOpaqueBehaviorObject::ownedReceptions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlReception *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->ownedReceptions())
-        set.insert(element->asQObject());
+    foreach (QUmlReception *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->ownedReceptions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOpaqueBehaviorObject::superClasses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClass *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->superClasses())
-        set.insert(element->asQObject());
+    foreach (QUmlClass *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->superClasses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -506,75 +509,75 @@ const QSet<QObject *> QUmlOpaqueBehaviorObject::superClasses() const
 
 QObject *QUmlOpaqueBehaviorObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->context()->asQModelingObject();
 }
 
 bool QUmlOpaqueBehaviorObject::isReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->isReentrant();
+    return qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->isReentrant();
 }
 
 const QList<QObject *> QUmlOpaqueBehaviorObject::ownedParameters() const
 {
     QList<QObject *> list;
-    foreach (QUmlParameter *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->ownedParameters())
-        list.append(element->asQObject());
+    foreach (QUmlParameter *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->ownedParameters())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QSet<QObject *> QUmlOpaqueBehaviorObject::ownedParameterSets() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterSet *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->ownedParameterSets())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterSet *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->ownedParameterSets())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOpaqueBehaviorObject::postconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->postconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->postconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOpaqueBehaviorObject::preconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->preconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->preconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOpaqueBehaviorObject::redefinedBehaviors() const
 {
     QSet<QObject *> set;
-    foreach (QUmlBehavior *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->redefinedBehaviors())
-        set.insert(element->asQObject());
+    foreach (QUmlBehavior *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->redefinedBehaviors())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlOpaqueBehaviorObject::specification() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->specification())
+    if (!qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->specification())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->specification()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->specification()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [OpaqueBehavior]
 
 const QList<QString> QUmlOpaqueBehaviorObject::bodies() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->bodies();
+    return qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->bodies();
 }
 
 const QList<QString> QUmlOpaqueBehaviorObject::languages() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->languages();
+    return qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->languages();
 }
 
 // OPERATIONS [Element]
@@ -582,14 +585,14 @@ const QList<QString> QUmlOpaqueBehaviorObject::languages() const
 QSet<QObject *> QUmlOpaqueBehaviorObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlOpaqueBehaviorObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -597,27 +600,27 @@ bool QUmlOpaqueBehaviorObject::mustBeOwned() const
 QList<QObject *> QUmlOpaqueBehaviorObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlOpaqueBehaviorObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlOpaqueBehaviorObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlOpaqueBehaviorObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->separator();
 }
 
 // OPERATIONS [Namespace]
@@ -626,44 +629,44 @@ QSet<QObject *> QUmlOpaqueBehaviorObject::excludeCollisions(QSet<QObject *> imps
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlOpaqueBehaviorObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlOpaqueBehaviorObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlOpaqueBehaviorObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->membersAreDistinguishable();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlOpaqueBehaviorObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlOpaqueBehaviorObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [Type]
@@ -671,12 +674,12 @@ bool QUmlOpaqueBehaviorObject::isTemplateParameter() const
 
 bool QUmlOpaqueBehaviorObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlOpaqueBehaviorObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [TemplateableElement]
@@ -684,8 +687,8 @@ bool QUmlOpaqueBehaviorObject::isRedefinitionContextValid(QObject *redefined) co
 QSet<QObject *> QUmlOpaqueBehaviorObject::parameterableElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterableElement *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->parameterableElements())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterableElement *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->parameterableElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -694,52 +697,52 @@ QSet<QObject *> QUmlOpaqueBehaviorObject::parameterableElements() const
 QSet<QObject *> QUmlOpaqueBehaviorObject::allFeatures() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->allFeatures())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->allFeatures())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlOpaqueBehaviorObject::allParents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->allParents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->allParents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlOpaqueBehaviorObject::conformsTo(QObject *other) const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->conformsTo(qmodelingobjectproperty_cast<QUmlClassifier *>(other));
+    return qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->conformsTo(qmodelingelementproperty_cast<QUmlClassifier *>(other));
 }
 
 bool QUmlOpaqueBehaviorObject::hasVisibilityOf(QObject *n) const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->hasVisibilityOf(qmodelingobjectproperty_cast<QUmlNamedElement *>(n));
+    return qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->hasVisibilityOf(qmodelingelementproperty_cast<QUmlNamedElement *>(n));
 }
 
 QSet<QObject *> QUmlOpaqueBehaviorObject::inheritableMembers(QObject *c) const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->inheritableMembers(qmodelingobjectproperty_cast<QUmlClassifier *>(c)))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->inheritableMembers(qmodelingelementproperty_cast<QUmlClassifier *>(c)))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlOpaqueBehaviorObject::isTemplate() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->isTemplate();
+    return qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->isTemplate();
 }
 
 bool QUmlOpaqueBehaviorObject::maySpecializeType(QObject *c) const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->maySpecializeType(qmodelingobjectproperty_cast<QUmlClassifier *>(c));
+    return qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->maySpecializeType(qmodelingelementproperty_cast<QUmlClassifier *>(c));
 }
 
 QSet<QObject *> QUmlOpaqueBehaviorObject::parents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->parents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->parents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -749,10 +752,10 @@ QSet<QObject *> QUmlOpaqueBehaviorObject::inherit(QSet<QObject *> inhs) const
 {
     QSet<QUmlNamedElement *> inhsConverted;
     foreach (QObject *object, inhs)
-        inhsConverted.insert(qmodelingobjectproperty_cast<QUmlNamedElement *>(object));
+        inhsConverted.insert(qmodelingelementproperty_cast<QUmlNamedElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->inherit(inhsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->inherit(inhsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -760,563 +763,691 @@ QSet<QObject *> QUmlOpaqueBehaviorObject::inherit(QSet<QObject *> inhs) const
 
 void QUmlOpaqueBehaviorObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlOpaqueBehaviorObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlOpaqueBehaviorObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlOpaqueBehaviorObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlOpaqueBehaviorObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlOpaqueBehaviorObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlOpaqueBehaviorObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlOpaqueBehaviorObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->setName(name);
 }
 
 void QUmlOpaqueBehaviorObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlOpaqueBehaviorObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlOpaqueBehaviorObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlOpaqueBehaviorObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlOpaqueBehaviorObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlOpaqueBehaviorObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlOpaqueBehaviorObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlOpaqueBehaviorObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlOpaqueBehaviorObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlOpaqueBehaviorObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlOpaqueBehaviorObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlOpaqueBehaviorObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlOpaqueBehaviorObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlOpaqueBehaviorObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlOpaqueBehaviorObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlOpaqueBehaviorObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlOpaqueBehaviorObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->setVisibility(visibility);
 }
 
 void QUmlOpaqueBehaviorObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Type]
 
 void QUmlOpaqueBehaviorObject::setPackage(QObject *package)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->setPackage(qmodelingobjectproperty_cast<QUmlPackage *>(package));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->setPackage(qmodelingelementproperty_cast<QUmlPackage *>(package));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlOpaqueBehaviorObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlOpaqueBehaviorObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlOpaqueBehaviorObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlOpaqueBehaviorObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlOpaqueBehaviorObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlOpaqueBehaviorObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateableElement]
 
 void QUmlOpaqueBehaviorObject::addTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 void QUmlOpaqueBehaviorObject::removeTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removeTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removeTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Classifier]
 
 void QUmlOpaqueBehaviorObject::addAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlOpaqueBehaviorObject::removeAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removeAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removeAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlOpaqueBehaviorObject::addCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlOpaqueBehaviorObject::removeCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removeCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removeCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlOpaqueBehaviorObject::addFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlOpaqueBehaviorObject::removeFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removeFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removeFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlOpaqueBehaviorObject::addGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlOpaqueBehaviorObject::removeGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removeGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removeGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlOpaqueBehaviorObject::addInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlOpaqueBehaviorObject::removeInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removeInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removeInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlOpaqueBehaviorObject::setFinalSpecialization(bool isFinalSpecialization)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->setFinalSpecialization(isFinalSpecialization);
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->setFinalSpecialization(isFinalSpecialization);
 }
 
 void QUmlOpaqueBehaviorObject::unsetFinalSpecialization()
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("finalSpecialization"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
 void QUmlOpaqueBehaviorObject::setOwnedTemplateSignature(QObject *ownedTemplateSignature)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->setOwnedTemplateSignature(qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->setOwnedTemplateSignature(qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
 }
 
 void QUmlOpaqueBehaviorObject::addOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlOpaqueBehaviorObject::removeOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removeOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removeOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlOpaqueBehaviorObject::addPowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addPowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addPowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlOpaqueBehaviorObject::removePowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removePowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removePowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlOpaqueBehaviorObject::addRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlOpaqueBehaviorObject::removeRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removeRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removeRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlOpaqueBehaviorObject::setRepresentation(QObject *representation)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->setRepresentation(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(representation));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->setRepresentation(qmodelingelementproperty_cast<QUmlCollaborationUse *>(representation));
 }
 
 void QUmlOpaqueBehaviorObject::addSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlOpaqueBehaviorObject::removeSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removeSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removeSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlOpaqueBehaviorObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
 }
 
 void QUmlOpaqueBehaviorObject::addUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 void QUmlOpaqueBehaviorObject::removeUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removeUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removeUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [StructuredClassifier]
 
 void QUmlOpaqueBehaviorObject::addOwnedConnector(QObject *ownedConnector)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addOwnedConnector(qmodelingobjectproperty_cast<QUmlConnector *>(ownedConnector));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addOwnedConnector(qmodelingelementproperty_cast<QUmlConnector *>(ownedConnector));
 }
 
 void QUmlOpaqueBehaviorObject::removeOwnedConnector(QObject *ownedConnector)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removeOwnedConnector(qmodelingobjectproperty_cast<QUmlConnector *>(ownedConnector));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removeOwnedConnector(qmodelingelementproperty_cast<QUmlConnector *>(ownedConnector));
 }
 
 void QUmlOpaqueBehaviorObject::addPart(QObject *part)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addPart(qmodelingobjectproperty_cast<QUmlProperty *>(part));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addPart(qmodelingelementproperty_cast<QUmlProperty *>(part));
 }
 
 void QUmlOpaqueBehaviorObject::removePart(QObject *part)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removePart(qmodelingobjectproperty_cast<QUmlProperty *>(part));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removePart(qmodelingelementproperty_cast<QUmlProperty *>(part));
 }
 
 void QUmlOpaqueBehaviorObject::addRole(QObject *role)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addRole(qmodelingobjectproperty_cast<QUmlConnectableElement *>(role));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addRole(qmodelingelementproperty_cast<QUmlConnectableElement *>(role));
 }
 
 void QUmlOpaqueBehaviorObject::removeRole(QObject *role)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removeRole(qmodelingobjectproperty_cast<QUmlConnectableElement *>(role));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removeRole(qmodelingelementproperty_cast<QUmlConnectableElement *>(role));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [EncapsulatedClassifier]
 
 void QUmlOpaqueBehaviorObject::addOwnedPort(QObject *ownedPort)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addOwnedPort(qmodelingobjectproperty_cast<QUmlPort *>(ownedPort));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addOwnedPort(qmodelingelementproperty_cast<QUmlPort *>(ownedPort));
 }
 
 void QUmlOpaqueBehaviorObject::removeOwnedPort(QObject *ownedPort)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removeOwnedPort(qmodelingobjectproperty_cast<QUmlPort *>(ownedPort));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removeOwnedPort(qmodelingelementproperty_cast<QUmlPort *>(ownedPort));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [BehavioredClassifier]
 
 void QUmlOpaqueBehaviorObject::setClassifierBehavior(QObject *classifierBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->setClassifierBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(classifierBehavior));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->setClassifierBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(classifierBehavior));
 }
 
 void QUmlOpaqueBehaviorObject::addInterfaceRealization(QObject *interfaceRealization)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addInterfaceRealization(qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addInterfaceRealization(qmodelingelementproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
 }
 
 void QUmlOpaqueBehaviorObject::removeInterfaceRealization(QObject *interfaceRealization)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removeInterfaceRealization(qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removeInterfaceRealization(qmodelingelementproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
 }
 
 void QUmlOpaqueBehaviorObject::addOwnedBehavior(QObject *ownedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addOwnedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(ownedBehavior));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addOwnedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(ownedBehavior));
 }
 
 void QUmlOpaqueBehaviorObject::removeOwnedBehavior(QObject *ownedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removeOwnedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(ownedBehavior));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removeOwnedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(ownedBehavior));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Class]
 
 void QUmlOpaqueBehaviorObject::addExtension(QObject *extension)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addExtension(qmodelingobjectproperty_cast<QUmlExtension *>(extension));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addExtension(qmodelingelementproperty_cast<QUmlExtension *>(extension));
 }
 
 void QUmlOpaqueBehaviorObject::removeExtension(QObject *extension)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removeExtension(qmodelingobjectproperty_cast<QUmlExtension *>(extension));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removeExtension(qmodelingelementproperty_cast<QUmlExtension *>(extension));
 }
 
 void QUmlOpaqueBehaviorObject::setAbstract(bool isAbstract)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->setAbstract(isAbstract);
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->setAbstract(isAbstract);
 }
 
 void QUmlOpaqueBehaviorObject::unsetAbstract()
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("abstract"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
 void QUmlOpaqueBehaviorObject::setActive(bool isActive)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->setActive(isActive);
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->setActive(isActive);
 }
 
 void QUmlOpaqueBehaviorObject::unsetActive()
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("active"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("active"));
 }
 
 void QUmlOpaqueBehaviorObject::addNestedClassifier(QObject *nestedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addNestedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(nestedClassifier));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addNestedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(nestedClassifier));
 }
 
 void QUmlOpaqueBehaviorObject::removeNestedClassifier(QObject *nestedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removeNestedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(nestedClassifier));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removeNestedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(nestedClassifier));
 }
 
 void QUmlOpaqueBehaviorObject::addOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlOpaqueBehaviorObject::removeOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removeOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removeOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlOpaqueBehaviorObject::addOwnedOperation(QObject *ownedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addOwnedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(ownedOperation));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addOwnedOperation(qmodelingelementproperty_cast<QUmlOperation *>(ownedOperation));
 }
 
 void QUmlOpaqueBehaviorObject::removeOwnedOperation(QObject *ownedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removeOwnedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(ownedOperation));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removeOwnedOperation(qmodelingelementproperty_cast<QUmlOperation *>(ownedOperation));
 }
 
 void QUmlOpaqueBehaviorObject::addOwnedReception(QObject *ownedReception)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addOwnedReception(qmodelingobjectproperty_cast<QUmlReception *>(ownedReception));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addOwnedReception(qmodelingelementproperty_cast<QUmlReception *>(ownedReception));
 }
 
 void QUmlOpaqueBehaviorObject::removeOwnedReception(QObject *ownedReception)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removeOwnedReception(qmodelingobjectproperty_cast<QUmlReception *>(ownedReception));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removeOwnedReception(qmodelingelementproperty_cast<QUmlReception *>(ownedReception));
 }
 
 void QUmlOpaqueBehaviorObject::addSuperClass(QObject *superClass)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addSuperClass(qmodelingobjectproperty_cast<QUmlClass *>(superClass));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addSuperClass(qmodelingelementproperty_cast<QUmlClass *>(superClass));
 }
 
 void QUmlOpaqueBehaviorObject::removeSuperClass(QObject *superClass)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removeSuperClass(qmodelingobjectproperty_cast<QUmlClass *>(superClass));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removeSuperClass(qmodelingelementproperty_cast<QUmlClass *>(superClass));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Behavior]
 
 void QUmlOpaqueBehaviorObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->setContext(qmodelingobjectproperty_cast<QUmlBehavioredClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->setContext(qmodelingelementproperty_cast<QUmlBehavioredClassifier *>(context));
 }
 
 void QUmlOpaqueBehaviorObject::setReentrant(bool isReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->setReentrant(isReentrant);
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->setReentrant(isReentrant);
 }
 
 void QUmlOpaqueBehaviorObject::unsetReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("reentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("reentrant"));
 }
 
 void QUmlOpaqueBehaviorObject::addOwnedParameter(QObject *ownedParameter)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addOwnedParameter(qmodelingobjectproperty_cast<QUmlParameter *>(ownedParameter));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addOwnedParameter(qmodelingelementproperty_cast<QUmlParameter *>(ownedParameter));
 }
 
 void QUmlOpaqueBehaviorObject::removeOwnedParameter(QObject *ownedParameter)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removeOwnedParameter(qmodelingobjectproperty_cast<QUmlParameter *>(ownedParameter));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removeOwnedParameter(qmodelingelementproperty_cast<QUmlParameter *>(ownedParameter));
 }
 
 void QUmlOpaqueBehaviorObject::addOwnedParameterSet(QObject *ownedParameterSet)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addOwnedParameterSet(qmodelingobjectproperty_cast<QUmlParameterSet *>(ownedParameterSet));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addOwnedParameterSet(qmodelingelementproperty_cast<QUmlParameterSet *>(ownedParameterSet));
 }
 
 void QUmlOpaqueBehaviorObject::removeOwnedParameterSet(QObject *ownedParameterSet)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removeOwnedParameterSet(qmodelingobjectproperty_cast<QUmlParameterSet *>(ownedParameterSet));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removeOwnedParameterSet(qmodelingelementproperty_cast<QUmlParameterSet *>(ownedParameterSet));
 }
 
 void QUmlOpaqueBehaviorObject::addPostcondition(QObject *postcondition)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(postcondition));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(postcondition));
 }
 
 void QUmlOpaqueBehaviorObject::removePostcondition(QObject *postcondition)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removePostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(postcondition));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removePostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(postcondition));
 }
 
 void QUmlOpaqueBehaviorObject::addPrecondition(QObject *precondition)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(precondition));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(precondition));
 }
 
 void QUmlOpaqueBehaviorObject::removePrecondition(QObject *precondition)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removePrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(precondition));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removePrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(precondition));
 }
 
 void QUmlOpaqueBehaviorObject::addRedefinedBehavior(QObject *redefinedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addRedefinedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(redefinedBehavior));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addRedefinedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(redefinedBehavior));
 }
 
 void QUmlOpaqueBehaviorObject::removeRedefinedBehavior(QObject *redefinedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removeRedefinedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(redefinedBehavior));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removeRedefinedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(redefinedBehavior));
 }
 
 void QUmlOpaqueBehaviorObject::setSpecification(QObject *specification)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->setSpecification(qmodelingobjectproperty_cast<QUmlBehavioralFeature *>(specification));
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->setSpecification(qmodelingelementproperty_cast<QUmlBehavioralFeature *>(specification));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [OpaqueBehavior]
 
 void QUmlOpaqueBehaviorObject::addBody(QString  body)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addBody(body);
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addBody(body);
 }
 
 void QUmlOpaqueBehaviorObject::removeBody(QString  body)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removeBody(body);
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removeBody(body);
 }
 
 void QUmlOpaqueBehaviorObject::addLanguage(QString  language)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->addLanguage(language);
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->addLanguage(language);
 }
 
 void QUmlOpaqueBehaviorObject::removeLanguage(QString  language)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueBehavior *>(this)->removeLanguage(language);
+    qmodelingelementproperty_cast<QUmlOpaqueBehavior *>(this)->removeLanguage(language);
+}
+
+
+void QUmlOpaqueBehaviorObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlType");
+    d->groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
+
+    d->propertyGroups << QStringLiteral("QUmlStructuredClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedConnectors"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parts"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("roles"))));
+
+    d->propertyGroups << QStringLiteral("QUmlEncapsulatedClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlEncapsulatedClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedPorts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlBehavioredClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifierBehavior"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interfaceRealizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedBehaviors"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClass");
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extensions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isActive"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedReceptions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superClasses"))));
+
+    d->propertyGroups << QStringLiteral("QUmlBehavior");
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameters"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameterSets"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("postconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("preconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedBehaviors"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("specification"))));
+
+    d->propertyGroups << QStringLiteral("QUmlOpaqueBehavior");
+    d->groupProperties.insert(QStringLiteral("QUmlOpaqueBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("bodies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlOpaqueBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("languages"))));
+}
+
+void QUmlOpaqueBehaviorObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueBehavior, bodies, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueBehavior, bodies, PropertyClassRole, QStringLiteral("QUmlOpaqueBehavior"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueBehavior, bodies, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueBehavior, bodies, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueBehavior, bodies, DocumentationRole, QStringLiteral("Specifies the behavior in one or more languages."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueBehavior, bodies, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueBehavior, bodies, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueBehavior, bodies, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueBehavior, languages, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueBehavior, languages, PropertyClassRole, QStringLiteral("QUmlOpaqueBehavior"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueBehavior, languages, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueBehavior, languages, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueBehavior, languages, DocumentationRole, QStringLiteral("Languages the body strings use in the same order as the body strings."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueBehavior, languages, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueBehavior, languages, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueBehavior, languages, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlopaquebehaviorobject_p.h b/src/uml/qobjects/qumlopaquebehaviorobject_p.h
index 5a5f91ed..e5bfb7c4 100644
--- a/src/uml/qobjects/qumlopaquebehaviorobject_p.h
+++ b/src/uml/qobjects/qumlopaquebehaviorobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlOpaqueBehavior;
-class Q_UML_EXPORT QUmlOpaqueBehaviorObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlOpaqueBehaviorObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlOpaqueBehaviorObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -149,7 +152,7 @@ class Q_UML_EXPORT QUmlOpaqueBehaviorObject : public QObject
     Q_PROPERTY(QList<QString> languages READ languages)
 
 public:
-    Q_INVOKABLE explicit QUmlOpaqueBehaviorObject(QUmlOpaqueBehavior *qModelingObject);
+    Q_INVOKABLE explicit QUmlOpaqueBehaviorObject(QUmlOpaqueBehavior *qModelingElement);
     virtual ~QUmlOpaqueBehaviorObject();
 
     // Owned attributes [Element]
@@ -422,6 +425,10 @@ public Q_SLOTS:
     void removeBody(QString body);
     void addLanguage(QString language);
     void removeLanguage(QString language);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlopaqueexpressionobject.cpp b/src/uml/qobjects/qumlopaqueexpressionobject.cpp
index c3a2fed2..735ec34c 100644
--- a/src/uml/qobjects/qumlopaqueexpressionobject.cpp
+++ b/src/uml/qobjects/qumlopaqueexpressionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlopaqueexpressionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlOpaqueExpression>
 #include <QtUml/QUmlBehavior>
@@ -56,16 +57,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlOpaqueExpressionObject::QUmlOpaqueExpressionObject(QUmlOpaqueExpression *qModelingObject)
+QUmlOpaqueExpressionObject::QUmlOpaqueExpressionObject(QUmlOpaqueExpression *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlOpaqueExpressionObject::~QUmlOpaqueExpressionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -74,25 +77,25 @@ QUmlOpaqueExpressionObject::~QUmlOpaqueExpressionObject()
 const QSet<QObject *> QUmlOpaqueExpressionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOpaqueExpressionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlOpaqueExpressionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -100,98 +103,98 @@ QObject *QUmlOpaqueExpressionObject::owner() const
 const QSet<QObject *> QUmlOpaqueExpressionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlOpaqueExpressionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->name();
 }
 
 QObject *QUmlOpaqueExpressionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlOpaqueExpressionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlOpaqueExpressionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [TypedElement]
 
 QObject *QUmlOpaqueExpressionObject::type() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->type())
+    if (!qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->type())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->type()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->type()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlOpaqueExpressionObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlOpaqueExpressionObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlOpaqueExpressionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [OpaqueExpression]
 
 QObject *QUmlOpaqueExpressionObject::behavior() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->behavior())
+    if (!qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->behavior())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->behavior()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->behavior()->asQModelingObject();
 }
 
 const QList<QString> QUmlOpaqueExpressionObject::bodies() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->bodies();
+    return qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->bodies();
 }
 
 const QList<QString> QUmlOpaqueExpressionObject::languages() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->languages();
+    return qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->languages();
 }
 
 QObject *QUmlOpaqueExpressionObject::result() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->result())
+    if (!qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->result())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->result()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->result()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -199,14 +202,14 @@ QObject *QUmlOpaqueExpressionObject::result() const
 QSet<QObject *> QUmlOpaqueExpressionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlOpaqueExpressionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -214,219 +217,300 @@ bool QUmlOpaqueExpressionObject::mustBeOwned() const
 QList<QObject *> QUmlOpaqueExpressionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlOpaqueExpressionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlOpaqueExpressionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlOpaqueExpressionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->separator();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlOpaqueExpressionObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [ValueSpecification]
 
 bool QUmlOpaqueExpressionObject::booleanValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->booleanValue();
+    return qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->booleanValue();
 }
 
 int QUmlOpaqueExpressionObject::integerValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->integerValue();
+    return qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->integerValue();
 }
 
 bool QUmlOpaqueExpressionObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlOpaqueExpressionObject::isComputable() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->isComputable();
+    return qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->isComputable();
 }
 
 bool QUmlOpaqueExpressionObject::isNull() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->isNull();
+    return qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->isNull();
 }
 
 double QUmlOpaqueExpressionObject::realValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->realValue();
+    return qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->realValue();
 }
 
 QString QUmlOpaqueExpressionObject::stringValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->stringValue();
+    return qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->stringValue();
 }
 
 int QUmlOpaqueExpressionObject::unlimitedValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->unlimitedValue();
+    return qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->unlimitedValue();
 }
 
 // OPERATIONS [OpaqueExpression]
 
 bool QUmlOpaqueExpressionObject::isIntegral() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->isIntegral();
+    return qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->isIntegral();
 }
 
 bool QUmlOpaqueExpressionObject::isNonNegative() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->isNonNegative();
+    return qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->isNonNegative();
 }
 
 bool QUmlOpaqueExpressionObject::isPositive() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->isPositive();
+    return qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->isPositive();
 }
 
 int QUmlOpaqueExpressionObject::value() const
 {
-    return qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->value();
+    return qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->value();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlOpaqueExpressionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlOpaqueExpressionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlOpaqueExpressionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlOpaqueExpressionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlOpaqueExpressionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlOpaqueExpressionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlOpaqueExpressionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlOpaqueExpressionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->setName(name);
 }
 
 void QUmlOpaqueExpressionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlOpaqueExpressionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlOpaqueExpressionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [TypedElement]
 
 void QUmlOpaqueExpressionObject::setType(QObject *type)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->setType(qmodelingobjectproperty_cast<QUmlType *>(type));
+    qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->setType(qmodelingelementproperty_cast<QUmlType *>(type));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlOpaqueExpressionObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlOpaqueExpressionObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlOpaqueExpressionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->setVisibility(visibility);
 }
 
 void QUmlOpaqueExpressionObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [OpaqueExpression]
 
 void QUmlOpaqueExpressionObject::setBehavior(QObject *behavior)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->setBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(behavior));
+    qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->setBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(behavior));
 }
 
 void QUmlOpaqueExpressionObject::addBody(QString  body)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->addBody(body);
+    qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->addBody(body);
 }
 
 void QUmlOpaqueExpressionObject::removeBody(QString  body)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->removeBody(body);
+    qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->removeBody(body);
 }
 
 void QUmlOpaqueExpressionObject::addLanguage(QString  language)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->addLanguage(language);
+    qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->addLanguage(language);
 }
 
 void QUmlOpaqueExpressionObject::removeLanguage(QString  language)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->removeLanguage(language);
+    qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->removeLanguage(language);
 }
 
 void QUmlOpaqueExpressionObject::setResult(QObject *result)
 {
-    qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(this)->setResult(qmodelingobjectproperty_cast<QUmlParameter *>(result));
+    qmodelingelementproperty_cast<QUmlOpaqueExpression *>(this)->setResult(qmodelingelementproperty_cast<QUmlParameter *>(result));
+}
+
+
+void QUmlOpaqueExpressionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTypedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlValueSpecification");
+
+    d->propertyGroups << QStringLiteral("QUmlOpaqueExpression");
+    d->groupProperties.insert(QStringLiteral("QUmlOpaqueExpression"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("behavior"))));
+    d->groupProperties.insert(QStringLiteral("QUmlOpaqueExpression"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("bodies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlOpaqueExpression"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("languages"))));
+    d->groupProperties.insert(QStringLiteral("QUmlOpaqueExpression"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("result"))));
+}
+
+void QUmlOpaqueExpressionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueExpression, behavior, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueExpression, behavior, PropertyClassRole, QStringLiteral("QUmlOpaqueExpression"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueExpression, behavior, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueExpression, behavior, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueExpression, behavior, DocumentationRole, QStringLiteral("Specifies the behavior of the opaque expression."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueExpression, behavior, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueExpression, behavior, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueExpression, behavior, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueExpression, bodies, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueExpression, bodies, PropertyClassRole, QStringLiteral("QUmlOpaqueExpression"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueExpression, bodies, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueExpression, bodies, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueExpression, bodies, DocumentationRole, QStringLiteral("The text of the expression, possibly in multiple languages."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueExpression, bodies, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueExpression, bodies, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueExpression, bodies, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueExpression, languages, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueExpression, languages, PropertyClassRole, QStringLiteral("QUmlOpaqueExpression"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueExpression, languages, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueExpression, languages, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueExpression, languages, DocumentationRole, QStringLiteral("Specifies the languages in which the expression is stated. The interpretation of the expression body depends on the languages. If the languages are unspecified, they might be implicit from the expression body or the context. Languages are matched to body strings by order."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueExpression, languages, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueExpression, languages, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueExpression, languages, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueExpression, result, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueExpression, result, PropertyClassRole, QStringLiteral("QUmlOpaqueExpression"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueExpression, result, IsDerivedRole, true);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueExpression, result, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueExpression, result, DocumentationRole, QStringLiteral("Restricts an opaque expression to return exactly one return result. When the invocation of the opaque expression completes, a single set of values is returned to its owner. This association is derived from the single return result parameter of the associated behavior."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueExpression, result, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueExpression, result, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOpaqueExpression, result, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlopaqueexpressionobject_p.h b/src/uml/qobjects/qumlopaqueexpressionobject_p.h
index 2114f753..c9c91332 100644
--- a/src/uml/qobjects/qumlopaqueexpressionobject_p.h
+++ b/src/uml/qobjects/qumlopaqueexpressionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlOpaqueExpression;
-class Q_UML_EXPORT QUmlOpaqueExpressionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlOpaqueExpressionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlOpaqueExpressionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -87,7 +90,7 @@ class Q_UML_EXPORT QUmlOpaqueExpressionObject : public QObject
     Q_PROPERTY(QObject * result READ result STORED false)
 
 public:
-    Q_INVOKABLE explicit QUmlOpaqueExpressionObject(QUmlOpaqueExpression *qModelingObject);
+    Q_INVOKABLE explicit QUmlOpaqueExpressionObject(QUmlOpaqueExpression *qModelingElement);
     virtual ~QUmlOpaqueExpressionObject();
 
     // Owned attributes [Element]
@@ -182,6 +185,10 @@ public Q_SLOTS:
     void addLanguage(QString language);
     void removeLanguage(QString language);
     void Q_DECL_HIDDEN setResult(QObject *result = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumloperationobject.cpp b/src/uml/qobjects/qumloperationobject.cpp
index cbcbf596..86950f5a 100644
--- a/src/uml/qobjects/qumloperationobject.cpp
+++ b/src/uml/qobjects/qumloperationobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumloperationobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlOperation>
 #include <QtUml/QUmlBehavior>
@@ -69,16 +70,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlOperationObject::QUmlOperationObject(QUmlOperation *qModelingObject)
+QUmlOperationObject::QUmlOperationObject(QUmlOperation *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlOperationObject::~QUmlOperationObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlOperation *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlOperation *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -87,42 +90,42 @@ QUmlOperationObject::~QUmlOperationObject()
 const QSet<QObject *> QUmlOperationObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlOperation *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlOperation *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOperationObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlOperation *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlOperation *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlOperationObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOperation *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlOperation *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOperation *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOperation *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [TemplateableElement]
 
 QObject *QUmlOperationObject::ownedTemplateSignature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOperation *>(this)->ownedTemplateSignature())
+    if (!qmodelingelementproperty_cast<QUmlOperation *>(this)->ownedTemplateSignature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOperation *>(this)->ownedTemplateSignature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOperation *>(this)->ownedTemplateSignature()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlOperationObject::templateBindings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTemplateBinding *element, qmodelingobjectproperty_cast<QUmlOperation *>(this)->templateBindings())
-        set.insert(element->asQObject());
+    foreach (QUmlTemplateBinding *element, qmodelingelementproperty_cast<QUmlOperation *>(this)->templateBindings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -131,40 +134,40 @@ const QSet<QObject *> QUmlOperationObject::templateBindings() const
 const QSet<QObject *> QUmlOperationObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlOperation *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlOperation *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlOperationObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlOperation *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlOperation *>(this)->name();
 }
 
 QObject *QUmlOperationObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOperation *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlOperation *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOperation *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOperation *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlOperationObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOperation *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlOperation *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOperation *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOperation *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlOperationObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlOperation *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlOperation *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlOperationObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlOperation *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlOperation *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Namespace]
@@ -172,48 +175,48 @@ QtUml::VisibilityKind QUmlOperationObject::visibility() const
 const QSet<QObject *> QUmlOperationObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlOperation *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlOperation *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOperationObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlOperation *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlOperation *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOperationObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlOperation *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlOperation *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOperationObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlOperation *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlOperation *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOperationObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlOperation *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlOperation *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOperationObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlOperation *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlOperation *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -221,22 +224,22 @@ const QSet<QObject *> QUmlOperationObject::packageImports() const
 
 bool QUmlOperationObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlOperation *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlOperation *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlOperationObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlOperation *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlOperation *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOperationObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlOperation *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlOperation *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -245,41 +248,41 @@ const QSet<QObject *> QUmlOperationObject::redefinitionContexts() const
 const QSet<QObject *> QUmlOperationObject::featuringClassifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlOperation *>(this)->featuringClassifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlOperation *>(this)->featuringClassifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlOperationObject::isStatic() const
 {
-    return qmodelingobjectproperty_cast<QUmlOperation *>(this)->isStatic();
+    return qmodelingelementproperty_cast<QUmlOperation *>(this)->isStatic();
 }
 
 // OWNED ATTRIBUTES [BehavioralFeature]
 
 QtUml::CallConcurrencyKind QUmlOperationObject::concurrency() const
 {
-    return qmodelingobjectproperty_cast<QUmlOperation *>(this)->concurrency();
+    return qmodelingelementproperty_cast<QUmlOperation *>(this)->concurrency();
 }
 
 bool QUmlOperationObject::isAbstract() const
 {
-    return qmodelingobjectproperty_cast<QUmlOperation *>(this)->isAbstract();
+    return qmodelingelementproperty_cast<QUmlOperation *>(this)->isAbstract();
 }
 
 const QSet<QObject *> QUmlOperationObject::methods() const
 {
     QSet<QObject *> set;
-    foreach (QUmlBehavior *element, qmodelingobjectproperty_cast<QUmlOperation *>(this)->methods())
-        set.insert(element->asQObject());
+    foreach (QUmlBehavior *element, qmodelingelementproperty_cast<QUmlOperation *>(this)->methods())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOperationObject::ownedParameterSets() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterSet *element, qmodelingobjectproperty_cast<QUmlOperation *>(this)->ownedParameterSets())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterSet *element, qmodelingelementproperty_cast<QUmlOperation *>(this)->ownedParameterSets())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -287,125 +290,125 @@ const QSet<QObject *> QUmlOperationObject::ownedParameterSets() const
 
 QObject *QUmlOperationObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOperation *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlOperation *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOperation *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOperation *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [Operation]
 
 QObject *QUmlOperationObject::bodyCondition() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOperation *>(this)->bodyCondition())
+    if (!qmodelingelementproperty_cast<QUmlOperation *>(this)->bodyCondition())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOperation *>(this)->bodyCondition()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOperation *>(this)->bodyCondition()->asQModelingObject();
 }
 
 QObject *QUmlOperationObject::class_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOperation *>(this)->class_())
+    if (!qmodelingelementproperty_cast<QUmlOperation *>(this)->class_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOperation *>(this)->class_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOperation *>(this)->class_()->asQModelingObject();
 }
 
 QObject *QUmlOperationObject::datatype() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOperation *>(this)->datatype())
+    if (!qmodelingelementproperty_cast<QUmlOperation *>(this)->datatype())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOperation *>(this)->datatype()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOperation *>(this)->datatype()->asQModelingObject();
 }
 
 QObject *QUmlOperationObject::interface_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOperation *>(this)->interface_())
+    if (!qmodelingelementproperty_cast<QUmlOperation *>(this)->interface_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOperation *>(this)->interface_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOperation *>(this)->interface_()->asQModelingObject();
 }
 
 bool QUmlOperationObject::isOrdered() const
 {
-    return qmodelingobjectproperty_cast<QUmlOperation *>(this)->isOrdered();
+    return qmodelingelementproperty_cast<QUmlOperation *>(this)->isOrdered();
 }
 
 bool QUmlOperationObject::isQuery() const
 {
-    return qmodelingobjectproperty_cast<QUmlOperation *>(this)->isQuery();
+    return qmodelingelementproperty_cast<QUmlOperation *>(this)->isQuery();
 }
 
 bool QUmlOperationObject::isUnique() const
 {
-    return qmodelingobjectproperty_cast<QUmlOperation *>(this)->isUnique();
+    return qmodelingelementproperty_cast<QUmlOperation *>(this)->isUnique();
 }
 
 int QUmlOperationObject::lower() const
 {
-    return qmodelingobjectproperty_cast<QUmlOperation *>(this)->lower();
+    return qmodelingelementproperty_cast<QUmlOperation *>(this)->lower();
 }
 
 const QList<QObject *> QUmlOperationObject::ownedParameters() const
 {
     QList<QObject *> list;
-    foreach (QUmlParameter *element, qmodelingobjectproperty_cast<QUmlOperation *>(this)->ownedParameters())
-        list.append(element->asQObject());
+    foreach (QUmlParameter *element, qmodelingelementproperty_cast<QUmlOperation *>(this)->ownedParameters())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QSet<QObject *> QUmlOperationObject::postconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlOperation *>(this)->postconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlOperation *>(this)->postconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOperationObject::preconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlOperation *>(this)->preconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlOperation *>(this)->preconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOperationObject::raisedExceptions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlType *element, qmodelingobjectproperty_cast<QUmlOperation *>(this)->raisedExceptions())
-        set.insert(element->asQObject());
+    foreach (QUmlType *element, qmodelingelementproperty_cast<QUmlOperation *>(this)->raisedExceptions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOperationObject::redefinedOperations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlOperation *element, qmodelingobjectproperty_cast<QUmlOperation *>(this)->redefinedOperations())
-        set.insert(element->asQObject());
+    foreach (QUmlOperation *element, qmodelingelementproperty_cast<QUmlOperation *>(this)->redefinedOperations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlOperationObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOperation *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlOperation *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOperation *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOperation *>(this)->templateParameter()->asQModelingObject();
 }
 
 QObject *QUmlOperationObject::type() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOperation *>(this)->type())
+    if (!qmodelingelementproperty_cast<QUmlOperation *>(this)->type())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOperation *>(this)->type()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOperation *>(this)->type()->asQModelingObject();
 }
 
 int QUmlOperationObject::upper() const
 {
-    return qmodelingobjectproperty_cast<QUmlOperation *>(this)->upper();
+    return qmodelingelementproperty_cast<QUmlOperation *>(this)->upper();
 }
 
 // OPERATIONS [Element]
@@ -413,28 +416,28 @@ int QUmlOperationObject::upper() const
 QSet<QObject *> QUmlOperationObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlOperation *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlOperation *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlOperationObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlOperation *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlOperation *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [TemplateableElement]
 
 bool QUmlOperationObject::isTemplate() const
 {
-    return qmodelingobjectproperty_cast<QUmlOperation *>(this)->isTemplate();
+    return qmodelingelementproperty_cast<QUmlOperation *>(this)->isTemplate();
 }
 
 QSet<QObject *> QUmlOperationObject::parameterableElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterableElement *element, qmodelingobjectproperty_cast<QUmlOperation *>(this)->parameterableElements())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterableElement *element, qmodelingelementproperty_cast<QUmlOperation *>(this)->parameterableElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -443,22 +446,22 @@ QSet<QObject *> QUmlOperationObject::parameterableElements() const
 QList<QObject *> QUmlOperationObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlOperation *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlOperation *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlOperationObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlOperation *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlOperation *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlOperationObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlOperation *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlOperation *>(this)->separator();
 }
 
 // OPERATIONS [Namespace]
@@ -467,72 +470,72 @@ QSet<QObject *> QUmlOperationObject::excludeCollisions(QSet<QObject *> imps) con
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlOperation *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlOperation *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlOperationObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlOperation *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlOperation *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlOperationObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlOperation *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlOperation *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlOperationObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlOperation *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlOperation *>(this)->membersAreDistinguishable();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlOperationObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlOperation *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlOperation *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [BehavioralFeature]
 
 bool QUmlOperationObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlOperation *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlOperation *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlOperationObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlOperation *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlOperation *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlOperationObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlOperation *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlOperation *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [Operation]
 
 bool QUmlOperationObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlOperation *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlOperation *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 QSet<QObject *> QUmlOperationObject::returnResult() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameter *element, qmodelingobjectproperty_cast<QUmlOperation *>(this)->returnResult())
-        set.insert(element->asQObject());
+    foreach (QUmlParameter *element, qmodelingelementproperty_cast<QUmlOperation *>(this)->returnResult())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -540,376 +543,604 @@ QSet<QObject *> QUmlOperationObject::returnResult() const
 
 void QUmlOperationObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlOperationObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlOperationObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlOperationObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlOperationObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateableElement]
 
 void QUmlOperationObject::setOwnedTemplateSignature(QObject *ownedTemplateSignature)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->setOwnedTemplateSignature(qmodelingobjectproperty_cast<QUmlTemplateSignature *>(ownedTemplateSignature));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->setOwnedTemplateSignature(qmodelingelementproperty_cast<QUmlTemplateSignature *>(ownedTemplateSignature));
 }
 
 void QUmlOperationObject::addTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->addTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->addTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 void QUmlOperationObject::removeTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->removeTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->removeTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlOperationObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlOperationObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlOperationObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->setName(name);
 }
 
 void QUmlOperationObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlOperationObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlOperationObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlOperationObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlOperationObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlOperationObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlOperationObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlOperationObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlOperationObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlOperationObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlOperationObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlOperationObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlOperationObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlOperationObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlOperationObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlOperationObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlOperationObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlOperationObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlOperationObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlOperationObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlOperationObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlOperationObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Feature]
 
 void QUmlOperationObject::addFeaturingClassifier(QObject *featuringClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->addFeaturingClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(featuringClassifier));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->addFeaturingClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(featuringClassifier));
 }
 
 void QUmlOperationObject::removeFeaturingClassifier(QObject *featuringClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->removeFeaturingClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(featuringClassifier));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->removeFeaturingClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(featuringClassifier));
 }
 
 void QUmlOperationObject::setStatic(bool isStatic)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->setStatic(isStatic);
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->setStatic(isStatic);
 }
 
 void QUmlOperationObject::unsetStatic()
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("static"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("static"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [BehavioralFeature]
 
 void QUmlOperationObject::setConcurrency(QtUml::CallConcurrencyKind concurrency)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->setConcurrency(concurrency);
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->setConcurrency(concurrency);
 }
 
 void QUmlOperationObject::unsetConcurrency()
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("concurrency"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("concurrency"));
 }
 
 void QUmlOperationObject::setAbstract(bool isAbstract)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->setAbstract(isAbstract);
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->setAbstract(isAbstract);
 }
 
 void QUmlOperationObject::unsetAbstract()
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("abstract"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
 void QUmlOperationObject::addMethod(QObject *method)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->addMethod(qmodelingobjectproperty_cast<QUmlBehavior *>(method));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->addMethod(qmodelingelementproperty_cast<QUmlBehavior *>(method));
 }
 
 void QUmlOperationObject::removeMethod(QObject *method)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->removeMethod(qmodelingobjectproperty_cast<QUmlBehavior *>(method));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->removeMethod(qmodelingelementproperty_cast<QUmlBehavior *>(method));
 }
 
 void QUmlOperationObject::addOwnedParameterSet(QObject *ownedParameterSet)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->addOwnedParameterSet(qmodelingobjectproperty_cast<QUmlParameterSet *>(ownedParameterSet));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->addOwnedParameterSet(qmodelingelementproperty_cast<QUmlParameterSet *>(ownedParameterSet));
 }
 
 void QUmlOperationObject::removeOwnedParameterSet(QObject *ownedParameterSet)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->removeOwnedParameterSet(qmodelingobjectproperty_cast<QUmlParameterSet *>(ownedParameterSet));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->removeOwnedParameterSet(qmodelingelementproperty_cast<QUmlParameterSet *>(ownedParameterSet));
 }
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlOperationObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 // SLOTS FOR OWNED ATTRIBUTES [Operation]
 
 void QUmlOperationObject::setBodyCondition(QObject *bodyCondition)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->setBodyCondition(qmodelingobjectproperty_cast<QUmlConstraint *>(bodyCondition));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->setBodyCondition(qmodelingelementproperty_cast<QUmlConstraint *>(bodyCondition));
 }
 
 void QUmlOperationObject::setClass(QObject *class_)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->setClass(qmodelingobjectproperty_cast<QUmlClass *>(class_));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->setClass(qmodelingelementproperty_cast<QUmlClass *>(class_));
 }
 
 void QUmlOperationObject::setDatatype(QObject *datatype)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->setDatatype(qmodelingobjectproperty_cast<QUmlDataType *>(datatype));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->setDatatype(qmodelingelementproperty_cast<QUmlDataType *>(datatype));
 }
 
 void QUmlOperationObject::setInterface(QObject *interface_)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->setInterface(qmodelingobjectproperty_cast<QUmlInterface *>(interface_));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->setInterface(qmodelingelementproperty_cast<QUmlInterface *>(interface_));
 }
 
 void QUmlOperationObject::setOrdered(bool isOrdered)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->setOrdered(isOrdered);
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->setOrdered(isOrdered);
 }
 
 void QUmlOperationObject::unsetOrdered()
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("ordered"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("ordered"));
 }
 
 void QUmlOperationObject::setQuery(bool isQuery)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->setQuery(isQuery);
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->setQuery(isQuery);
 }
 
 void QUmlOperationObject::unsetQuery()
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("query"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("query"));
 }
 
 void QUmlOperationObject::setUnique(bool isUnique)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->setUnique(isUnique);
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->setUnique(isUnique);
 }
 
 void QUmlOperationObject::unsetUnique()
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("unique"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("unique"));
 }
 
 void QUmlOperationObject::setLower(int lower)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->setLower(lower);
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->setLower(lower);
 }
 
 void QUmlOperationObject::unsetLower()
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("lower"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("lower"));
 }
 
 void QUmlOperationObject::addOwnedParameter(QObject *ownedParameter)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->addOwnedParameter(qmodelingobjectproperty_cast<QUmlParameter *>(ownedParameter));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->addOwnedParameter(qmodelingelementproperty_cast<QUmlParameter *>(ownedParameter));
 }
 
 void QUmlOperationObject::removeOwnedParameter(QObject *ownedParameter)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->removeOwnedParameter(qmodelingobjectproperty_cast<QUmlParameter *>(ownedParameter));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->removeOwnedParameter(qmodelingelementproperty_cast<QUmlParameter *>(ownedParameter));
 }
 
 void QUmlOperationObject::addPostcondition(QObject *postcondition)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->addPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(postcondition));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->addPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(postcondition));
 }
 
 void QUmlOperationObject::removePostcondition(QObject *postcondition)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->removePostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(postcondition));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->removePostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(postcondition));
 }
 
 void QUmlOperationObject::addPrecondition(QObject *precondition)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->addPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(precondition));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->addPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(precondition));
 }
 
 void QUmlOperationObject::removePrecondition(QObject *precondition)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->removePrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(precondition));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->removePrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(precondition));
 }
 
 void QUmlOperationObject::addRaisedException(QObject *raisedException)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->addRaisedException(qmodelingobjectproperty_cast<QUmlType *>(raisedException));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->addRaisedException(qmodelingelementproperty_cast<QUmlType *>(raisedException));
 }
 
 void QUmlOperationObject::removeRaisedException(QObject *raisedException)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->removeRaisedException(qmodelingobjectproperty_cast<QUmlType *>(raisedException));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->removeRaisedException(qmodelingelementproperty_cast<QUmlType *>(raisedException));
 }
 
 void QUmlOperationObject::addRedefinedOperation(QObject *redefinedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->addRedefinedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(redefinedOperation));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->addRedefinedOperation(qmodelingelementproperty_cast<QUmlOperation *>(redefinedOperation));
 }
 
 void QUmlOperationObject::removeRedefinedOperation(QObject *redefinedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->removeRedefinedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(redefinedOperation));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->removeRedefinedOperation(qmodelingelementproperty_cast<QUmlOperation *>(redefinedOperation));
 }
 
 void QUmlOperationObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlOperationTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlOperationTemplateParameter *>(templateParameter));
 }
 
 void QUmlOperationObject::setType(QObject *type)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->setType(qmodelingobjectproperty_cast<QUmlType *>(type));
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->setType(qmodelingelementproperty_cast<QUmlType *>(type));
 }
 
 void QUmlOperationObject::setUpper(int upper)
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->setUpper(upper);
+    qmodelingelementproperty_cast<QUmlOperation *>(this)->setUpper(upper);
 }
 
 void QUmlOperationObject::unsetUpper()
 {
-    qmodelingobjectproperty_cast<QUmlOperation *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("upper"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("upper"));
+}
+
+
+void QUmlOperationObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlFeature");
+    d->groupProperties.insert(QStringLiteral("QUmlFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("featuringClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isStatic"))));
+
+    d->propertyGroups << QStringLiteral("QUmlBehavioralFeature");
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioralFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("concurrency"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioralFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioralFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("methods"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioralFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameterSets"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlOperation");
+    d->groupProperties.insert(QStringLiteral("QUmlOperation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("bodyCondition"))));
+    d->groupProperties.insert(QStringLiteral("QUmlOperation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("class_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlOperation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("datatype"))));
+    d->groupProperties.insert(QStringLiteral("QUmlOperation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interface_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlOperation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isOrdered"))));
+    d->groupProperties.insert(QStringLiteral("QUmlOperation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isQuery"))));
+    d->groupProperties.insert(QStringLiteral("QUmlOperation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isUnique"))));
+    d->groupProperties.insert(QStringLiteral("QUmlOperation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lower"))));
+    d->groupProperties.insert(QStringLiteral("QUmlOperation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameters"))));
+    d->groupProperties.insert(QStringLiteral("QUmlOperation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("postconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlOperation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("preconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlOperation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("raisedExceptions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlOperation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedOperations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlOperation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlOperation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
+    d->groupProperties.insert(QStringLiteral("QUmlOperation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upper"))));
+}
+
+void QUmlOperationObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, bodyCondition, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, bodyCondition, PropertyClassRole, QStringLiteral("QUmlOperation"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, bodyCondition, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, bodyCondition, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, bodyCondition, DocumentationRole, QStringLiteral("An optional Constraint on the result values of an invocation of this Operation."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, bodyCondition, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, bodyCondition, SubsettedPropertiesRole, QStringLiteral("Namespace-ownedRule"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, bodyCondition, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, class_, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, class_, PropertyClassRole, QStringLiteral("QUmlOperation"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, class_, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, class_, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, class_, DocumentationRole, QStringLiteral("The class that owns the operation."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, class_, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, class_, SubsettedPropertiesRole, QStringLiteral("Feature-featuringClassifier RedefinableElement-redefinitionContext NamedElement-namespace"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, class_, OppositeEndRole, QStringLiteral("Class-ownedOperation"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, datatype, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, datatype, PropertyClassRole, QStringLiteral("QUmlOperation"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, datatype, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, datatype, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, datatype, DocumentationRole, QStringLiteral("The DataType that owns this Operation."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, datatype, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, datatype, SubsettedPropertiesRole, QStringLiteral("Feature-featuringClassifier RedefinableElement-redefinitionContext NamedElement-namespace"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, datatype, OppositeEndRole, QStringLiteral("DataType-ownedOperation"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, interface_, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, interface_, PropertyClassRole, QStringLiteral("QUmlOperation"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, interface_, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, interface_, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, interface_, DocumentationRole, QStringLiteral("The Interface that owns this Operation."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, interface_, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, interface_, SubsettedPropertiesRole, QStringLiteral("Feature-featuringClassifier RedefinableElement-redefinitionContext NamedElement-namespace"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, interface_, OppositeEndRole, QStringLiteral("Interface-ownedOperation"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, isOrdered, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, isOrdered, PropertyClassRole, QStringLiteral("QUmlOperation"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, isOrdered, IsDerivedRole, true);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, isOrdered, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, isOrdered, DocumentationRole, QStringLiteral("This information is derived from the return result for this Operation.Specifies whether the return parameter is ordered or not, if present."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, isOrdered, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, isOrdered, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, isOrdered, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, isQuery, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, isQuery, PropertyClassRole, QStringLiteral("QUmlOperation"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, isQuery, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, isQuery, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, isQuery, DocumentationRole, QStringLiteral("Specifies whether an execution of the BehavioralFeature leaves the state of the system unchanged (isQuery=true) or whether side effects may occur (isQuery=false)."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, isQuery, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, isQuery, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, isQuery, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, isUnique, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, isUnique, PropertyClassRole, QStringLiteral("QUmlOperation"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, isUnique, IsDerivedRole, true);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, isUnique, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, isUnique, DocumentationRole, QStringLiteral("Specifies whether the return parameter is unique or not, if present.This information is derived from the return result for this Operation."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, isUnique, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, isUnique, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, isUnique, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, lower, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, lower, PropertyClassRole, QStringLiteral("QUmlOperation"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, lower, IsDerivedRole, true);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, lower, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, lower, DocumentationRole, QStringLiteral("This information is derived from the return result for this Operation.Specifies the lower multiplicity of the return parameter, if present."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, lower, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, lower, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, lower, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, ownedParameters, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, ownedParameters, PropertyClassRole, QStringLiteral("QUmlOperation"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, ownedParameters, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, ownedParameters, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, ownedParameters, DocumentationRole, QStringLiteral("Specifies the ordered set of formal parameters of this BehavioralFeature.Specifies the parameters owned by this Operation."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, ownedParameters, RedefinedPropertiesRole, QStringLiteral("BehavioralFeature-ownedParameter"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, ownedParameters, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, ownedParameters, OppositeEndRole, QStringLiteral("Parameter-operation"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, postconditions, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, postconditions, PropertyClassRole, QStringLiteral("QUmlOperation"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, postconditions, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, postconditions, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, postconditions, DocumentationRole, QStringLiteral("An optional set of Constraints specifying the state of the system when the Operation is completed."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, postconditions, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, postconditions, SubsettedPropertiesRole, QStringLiteral("Namespace-ownedRule"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, postconditions, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, preconditions, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, preconditions, PropertyClassRole, QStringLiteral("QUmlOperation"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, preconditions, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, preconditions, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, preconditions, DocumentationRole, QStringLiteral("An optional set of Constraints on the state of the system when the Operation is invoked."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, preconditions, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, preconditions, SubsettedPropertiesRole, QStringLiteral("Namespace-ownedRule"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, preconditions, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, raisedExceptions, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, raisedExceptions, PropertyClassRole, QStringLiteral("QUmlOperation"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, raisedExceptions, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, raisedExceptions, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, raisedExceptions, DocumentationRole, QStringLiteral("References the Types representing exceptions that may be raised during an invocation of this operation."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, raisedExceptions, RedefinedPropertiesRole, QStringLiteral("BehavioralFeature-raisedException"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, raisedExceptions, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, raisedExceptions, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, redefinedOperations, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, redefinedOperations, PropertyClassRole, QStringLiteral("QUmlOperation"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, redefinedOperations, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, redefinedOperations, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, redefinedOperations, DocumentationRole, QStringLiteral("References the Operations that are redefined by this Operation."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, redefinedOperations, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, redefinedOperations, SubsettedPropertiesRole, QStringLiteral("RedefinableElement-redefinedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, redefinedOperations, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, templateParameter, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, templateParameter, PropertyClassRole, QStringLiteral("QUmlOperation"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, templateParameter, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, templateParameter, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, templateParameter, DocumentationRole, QStringLiteral("The template parameter that exposes this element as a formal parameter."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, templateParameter, RedefinedPropertiesRole, QStringLiteral("ParameterableElement-templateParameter"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, templateParameter, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, templateParameter, OppositeEndRole, QStringLiteral("OperationTemplateParameter-parameteredElement"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, type, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, type, PropertyClassRole, QStringLiteral("QUmlOperation"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, type, IsDerivedRole, true);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, type, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, type, DocumentationRole, QStringLiteral("This information is derived from the return result for this Operation.Specifies the return result of the operation, if present."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, type, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, type, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, type, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, upper, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, upper, PropertyClassRole, QStringLiteral("QUmlOperation"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, upper, IsDerivedRole, true);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, upper, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, upper, DocumentationRole, QStringLiteral("This information is derived from the return result for this Operation.Specifies the upper multiplicity of the return parameter, if present."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, upper, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, upper, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperation, upper, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumloperationobject_p.h b/src/uml/qobjects/qumloperationobject_p.h
index 355fc435..2b68e6da 100644
--- a/src/uml/qobjects/qumloperationobject_p.h
+++ b/src/uml/qobjects/qumloperationobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlOperation;
-class Q_UML_EXPORT QUmlOperationObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlOperationObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlOperationObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -120,7 +123,7 @@ class Q_UML_EXPORT QUmlOperationObject : public QObject
     Q_PROPERTY(int upper READ upper RESET unsetUpper STORED false)
 
 public:
-    Q_INVOKABLE explicit QUmlOperationObject(QUmlOperation *qModelingObject);
+    Q_INVOKABLE explicit QUmlOperationObject(QUmlOperation *qModelingElement);
     virtual ~QUmlOperationObject();
 
     // Owned attributes [Element]
@@ -308,6 +311,10 @@ public Q_SLOTS:
     void Q_DECL_HIDDEN setType(QObject *type = 0);
     void Q_DECL_HIDDEN setUpper(int upper);
     void unsetUpper();
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumloperationtemplateparameterobject.cpp b/src/uml/qobjects/qumloperationtemplateparameterobject.cpp
index 72d4c924..9930f879 100644
--- a/src/uml/qobjects/qumloperationtemplateparameterobject.cpp
+++ b/src/uml/qobjects/qumloperationtemplateparameterobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumloperationtemplateparameterobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlOperationTemplateParameter>
 #include <QtUml/QUmlComment>
@@ -49,16 +50,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlOperationTemplateParameterObject::QUmlOperationTemplateParameterObject(QUmlOperationTemplateParameter *qModelingObject)
+QUmlOperationTemplateParameterObject::QUmlOperationTemplateParameterObject(QUmlOperationTemplateParameter *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlOperationTemplateParameterObject::~QUmlOperationTemplateParameterObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlOperationTemplateParameter *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlOperationTemplateParameter *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -67,69 +70,69 @@ QUmlOperationTemplateParameterObject::~QUmlOperationTemplateParameterObject()
 const QSet<QObject *> QUmlOperationTemplateParameterObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlOperationTemplateParameter *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlOperationTemplateParameter *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOperationTemplateParameterObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlOperationTemplateParameter *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlOperationTemplateParameter *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlOperationTemplateParameterObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOperationTemplateParameter *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlOperationTemplateParameter *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOperationTemplateParameter *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOperationTemplateParameter *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [TemplateParameter]
 
 QObject *QUmlOperationTemplateParameterObject::default_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOperationTemplateParameter *>(this)->default_())
+    if (!qmodelingelementproperty_cast<QUmlOperationTemplateParameter *>(this)->default_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOperationTemplateParameter *>(this)->default_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOperationTemplateParameter *>(this)->default_()->asQModelingObject();
 }
 
 QObject *QUmlOperationTemplateParameterObject::ownedDefault() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOperationTemplateParameter *>(this)->ownedDefault())
+    if (!qmodelingelementproperty_cast<QUmlOperationTemplateParameter *>(this)->ownedDefault())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOperationTemplateParameter *>(this)->ownedDefault()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOperationTemplateParameter *>(this)->ownedDefault()->asQModelingObject();
 }
 
 QObject *QUmlOperationTemplateParameterObject::ownedParameteredElement() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOperationTemplateParameter *>(this)->ownedParameteredElement())
+    if (!qmodelingelementproperty_cast<QUmlOperationTemplateParameter *>(this)->ownedParameteredElement())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOperationTemplateParameter *>(this)->ownedParameteredElement()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOperationTemplateParameter *>(this)->ownedParameteredElement()->asQModelingObject();
 }
 
 QObject *QUmlOperationTemplateParameterObject::signature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOperationTemplateParameter *>(this)->signature())
+    if (!qmodelingelementproperty_cast<QUmlOperationTemplateParameter *>(this)->signature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOperationTemplateParameter *>(this)->signature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOperationTemplateParameter *>(this)->signature()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [OperationTemplateParameter]
 
 QObject *QUmlOperationTemplateParameterObject::parameteredElement() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOperationTemplateParameter *>(this)->parameteredElement())
+    if (!qmodelingelementproperty_cast<QUmlOperationTemplateParameter *>(this)->parameteredElement())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOperationTemplateParameter *>(this)->parameteredElement()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOperationTemplateParameter *>(this)->parameteredElement()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -137,70 +140,107 @@ QObject *QUmlOperationTemplateParameterObject::parameteredElement() const
 QSet<QObject *> QUmlOperationTemplateParameterObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlOperationTemplateParameter *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlOperationTemplateParameter *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlOperationTemplateParameterObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlOperationTemplateParameter *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlOperationTemplateParameter *>(this)->mustBeOwned();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlOperationTemplateParameterObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlOperationTemplateParameter *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlOperationTemplateParameter *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlOperationTemplateParameterObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlOperationTemplateParameter *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlOperationTemplateParameter *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlOperationTemplateParameterObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlOperationTemplateParameter *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlOperationTemplateParameter *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlOperationTemplateParameterObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlOperationTemplateParameter *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlOperationTemplateParameter *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlOperationTemplateParameterObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlOperationTemplateParameter *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlOperationTemplateParameter *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateParameter]
 
 void QUmlOperationTemplateParameterObject::setDefault(QObject *default_)
 {
-    qmodelingobjectproperty_cast<QUmlOperationTemplateParameter *>(this)->setDefault(qmodelingobjectproperty_cast<QUmlParameterableElement *>(default_));
+    qmodelingelementproperty_cast<QUmlOperationTemplateParameter *>(this)->setDefault(qmodelingelementproperty_cast<QUmlParameterableElement *>(default_));
 }
 
 void QUmlOperationTemplateParameterObject::setOwnedDefault(QObject *ownedDefault)
 {
-    qmodelingobjectproperty_cast<QUmlOperationTemplateParameter *>(this)->setOwnedDefault(qmodelingobjectproperty_cast<QUmlParameterableElement *>(ownedDefault));
+    qmodelingelementproperty_cast<QUmlOperationTemplateParameter *>(this)->setOwnedDefault(qmodelingelementproperty_cast<QUmlParameterableElement *>(ownedDefault));
 }
 
 void QUmlOperationTemplateParameterObject::setOwnedParameteredElement(QObject *ownedParameteredElement)
 {
-    qmodelingobjectproperty_cast<QUmlOperationTemplateParameter *>(this)->setOwnedParameteredElement(qmodelingobjectproperty_cast<QUmlParameterableElement *>(ownedParameteredElement));
+    qmodelingelementproperty_cast<QUmlOperationTemplateParameter *>(this)->setOwnedParameteredElement(qmodelingelementproperty_cast<QUmlParameterableElement *>(ownedParameteredElement));
 }
 
 void QUmlOperationTemplateParameterObject::setSignature(QObject *signature)
 {
-    qmodelingobjectproperty_cast<QUmlOperationTemplateParameter *>(this)->setSignature(qmodelingobjectproperty_cast<QUmlTemplateSignature *>(signature));
+    qmodelingelementproperty_cast<QUmlOperationTemplateParameter *>(this)->setSignature(qmodelingelementproperty_cast<QUmlTemplateSignature *>(signature));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [OperationTemplateParameter]
 
 void QUmlOperationTemplateParameterObject::setParameteredElement(QObject *parameteredElement)
 {
-    qmodelingobjectproperty_cast<QUmlOperationTemplateParameter *>(this)->setParameteredElement(qmodelingobjectproperty_cast<QUmlOperation *>(parameteredElement));
+    qmodelingelementproperty_cast<QUmlOperationTemplateParameter *>(this)->setParameteredElement(qmodelingelementproperty_cast<QUmlOperation *>(parameteredElement));
+}
+
+
+void QUmlOperationTemplateParameterObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateParameter");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("default_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedDefault"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameteredElement"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("signature"))));
+
+    d->propertyGroups << QStringLiteral("QUmlOperationTemplateParameter");
+    d->groupProperties.insert(QStringLiteral("QUmlOperationTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parameteredElement"))));
+}
+
+void QUmlOperationTemplateParameterObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperationTemplateParameter, parameteredElement, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperationTemplateParameter, parameteredElement, PropertyClassRole, QStringLiteral("QUmlOperationTemplateParameter"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperationTemplateParameter, parameteredElement, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperationTemplateParameter, parameteredElement, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperationTemplateParameter, parameteredElement, DocumentationRole, QStringLiteral("The operation for this template parameter."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperationTemplateParameter, parameteredElement, RedefinedPropertiesRole, QStringLiteral("TemplateParameter-parameteredElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperationTemplateParameter, parameteredElement, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlOperationTemplateParameter, parameteredElement, OppositeEndRole, QStringLiteral("Operation-templateParameter"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumloperationtemplateparameterobject_p.h b/src/uml/qobjects/qumloperationtemplateparameterobject_p.h
index 77f18100..e62116c4 100644
--- a/src/uml/qobjects/qumloperationtemplateparameterobject_p.h
+++ b/src/uml/qobjects/qumloperationtemplateparameterobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 QT_BEGIN_HEADER
 
@@ -52,9 +52,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlOperationTemplateParameter;
-class Q_UML_EXPORT QUmlOperationTemplateParameterObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlOperationTemplateParameterObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlOperationTemplateParameterObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -71,7 +74,7 @@ class Q_UML_EXPORT QUmlOperationTemplateParameterObject : public QObject
     Q_PROPERTY(QObject * parameteredElement READ parameteredElement WRITE setParameteredElement)
 
 public:
-    Q_INVOKABLE explicit QUmlOperationTemplateParameterObject(QUmlOperationTemplateParameter *qModelingObject);
+    Q_INVOKABLE explicit QUmlOperationTemplateParameterObject(QUmlOperationTemplateParameter *qModelingElement);
     virtual ~QUmlOperationTemplateParameterObject();
 
     // Owned attributes [Element]
@@ -109,6 +112,10 @@ public Q_SLOTS:
 
     // Slots for owned attributes [OperationTemplateParameter]
     void setParameteredElement(QObject *parameteredElement = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumloutputpinobject.cpp b/src/uml/qobjects/qumloutputpinobject.cpp
index bf8e51c5..03668fc9 100644
--- a/src/uml/qobjects/qumloutputpinobject.cpp
+++ b/src/uml/qobjects/qumloutputpinobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumloutputpinobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlOutputPin>
 #include <QtUml/QUmlActivity>
@@ -65,16 +66,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlOutputPinObject::QUmlOutputPinObject(QUmlOutputPin *qModelingObject)
+QUmlOutputPinObject::QUmlOutputPinObject(QUmlOutputPin *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlOutputPinObject::~QUmlOutputPinObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlOutputPin *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -83,63 +86,63 @@ QUmlOutputPinObject::~QUmlOutputPinObject()
 const QSet<QObject *> QUmlOutputPinObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlOutputPin *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOutputPinObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlOutputPin *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlOutputPinObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlOutputPin *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOutputPin *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [MultiplicityElement]
 
 bool QUmlOutputPinObject::isOrdered() const
 {
-    return qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->isOrdered();
+    return qmodelingelementproperty_cast<QUmlOutputPin *>(this)->isOrdered();
 }
 
 bool QUmlOutputPinObject::isUnique() const
 {
-    return qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->isUnique();
+    return qmodelingelementproperty_cast<QUmlOutputPin *>(this)->isUnique();
 }
 
 int QUmlOutputPinObject::lower() const
 {
-    return qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->lower();
+    return qmodelingelementproperty_cast<QUmlOutputPin *>(this)->lower();
 }
 
 QObject *QUmlOutputPinObject::lowerValue() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->lowerValue())
+    if (!qmodelingelementproperty_cast<QUmlOutputPin *>(this)->lowerValue())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->lowerValue()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOutputPin *>(this)->lowerValue()->asQModelingObject();
 }
 
 int QUmlOutputPinObject::upper() const
 {
-    return qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->upper();
+    return qmodelingelementproperty_cast<QUmlOutputPin *>(this)->upper();
 }
 
 QObject *QUmlOutputPinObject::upperValue() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->upperValue())
+    if (!qmodelingelementproperty_cast<QUmlOutputPin *>(this)->upperValue())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->upperValue()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOutputPin *>(this)->upperValue()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -147,62 +150,62 @@ QObject *QUmlOutputPinObject::upperValue() const
 const QSet<QObject *> QUmlOutputPinObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlOutputPin *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlOutputPinObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlOutputPin *>(this)->name();
 }
 
 QObject *QUmlOutputPinObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlOutputPin *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOutputPin *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlOutputPinObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlOutputPin *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOutputPin *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlOutputPinObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlOutputPin *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlOutputPinObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlOutputPin *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlOutputPinObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlOutputPin *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlOutputPinObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlOutputPin *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOutputPinObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlOutputPin *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -210,65 +213,65 @@ const QSet<QObject *> QUmlOutputPinObject::redefinitionContexts() const
 
 QObject *QUmlOutputPinObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlOutputPin *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOutputPin *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlOutputPinObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlOutputPin *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOutputPinObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlOutputPin *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOutputPinObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlOutputPin *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlOutputPinObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlOutputPin *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOutputPin *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlOutputPinObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlOutputPin *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOutputPinObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlOutputPin *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlOutputPinObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlOutputPin *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -276,10 +279,10 @@ const QSet<QObject *> QUmlOutputPinObject::redefinedNodes() const
 
 QObject *QUmlOutputPinObject::type() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->type())
+    if (!qmodelingelementproperty_cast<QUmlOutputPin *>(this)->type())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->type()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOutputPin *>(this)->type()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ObjectNode]
@@ -287,42 +290,42 @@ QObject *QUmlOutputPinObject::type() const
 const QSet<QObject *> QUmlOutputPinObject::inStates() const
 {
     QSet<QObject *> set;
-    foreach (QUmlState *element, qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->inStates())
-        set.insert(element->asQObject());
+    foreach (QUmlState *element, qmodelingelementproperty_cast<QUmlOutputPin *>(this)->inStates())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlOutputPinObject::isControlType() const
 {
-    return qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->isControlType();
+    return qmodelingelementproperty_cast<QUmlOutputPin *>(this)->isControlType();
 }
 
 QtUml::ObjectNodeOrderingKind QUmlOutputPinObject::ordering() const
 {
-    return qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->ordering();
+    return qmodelingelementproperty_cast<QUmlOutputPin *>(this)->ordering();
 }
 
 QObject *QUmlOutputPinObject::selection() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->selection())
+    if (!qmodelingelementproperty_cast<QUmlOutputPin *>(this)->selection())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->selection()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOutputPin *>(this)->selection()->asQModelingObject();
 }
 
 QObject *QUmlOutputPinObject::upperBound() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->upperBound())
+    if (!qmodelingelementproperty_cast<QUmlOutputPin *>(this)->upperBound())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->upperBound()->asQObject();
+        return qmodelingelementproperty_cast<QUmlOutputPin *>(this)->upperBound()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [Pin]
 
 bool QUmlOutputPinObject::isControl() const
 {
-    return qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->isControl();
+    return qmodelingelementproperty_cast<QUmlOutputPin *>(this)->isControl();
 }
 
 // OPERATIONS [Element]
@@ -330,51 +333,51 @@ bool QUmlOutputPinObject::isControl() const
 QSet<QObject *> QUmlOutputPinObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlOutputPin *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlOutputPinObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlOutputPin *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [MultiplicityElement]
 
 bool QUmlOutputPinObject::compatibleWith(QObject *other) const
 {
-    return qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->compatibleWith(qmodelingobjectproperty_cast<QUmlMultiplicityElement *>(other));
+    return qmodelingelementproperty_cast<QUmlOutputPin *>(this)->compatibleWith(qmodelingelementproperty_cast<QUmlMultiplicityElement *>(other));
 }
 
 bool QUmlOutputPinObject::includesCardinality(int C) const
 {
-    return qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->includesCardinality(C);
+    return qmodelingelementproperty_cast<QUmlOutputPin *>(this)->includesCardinality(C);
 }
 
 bool QUmlOutputPinObject::includesMultiplicity(QObject *M) const
 {
-    return qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->includesMultiplicity(qmodelingobjectproperty_cast<QUmlMultiplicityElement *>(M));
+    return qmodelingelementproperty_cast<QUmlOutputPin *>(this)->includesMultiplicity(qmodelingelementproperty_cast<QUmlMultiplicityElement *>(M));
 }
 
 bool QUmlOutputPinObject::is(int lowerbound, int upperbound) const
 {
-    return qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->is(lowerbound, upperbound);
+    return qmodelingelementproperty_cast<QUmlOutputPin *>(this)->is(lowerbound, upperbound);
 }
 
 bool QUmlOutputPinObject::isMultivalued() const
 {
-    return qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->isMultivalued();
+    return qmodelingelementproperty_cast<QUmlOutputPin *>(this)->isMultivalued();
 }
 
 int QUmlOutputPinObject::lowerBound() const
 {
-    return qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->lowerBound();
+    return qmodelingelementproperty_cast<QUmlOutputPin *>(this)->lowerBound();
 }
 
 //int QUmlOutputPinObject::upperBound() const
 //{
-//    return qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->upperBound();
+//    return qmodelingelementproperty_cast<QUmlOutputPin *>(this)->upperBound();
 //}
 
 // OPERATIONS [NamedElement]
@@ -382,320 +385,393 @@ int QUmlOutputPinObject::lowerBound() const
 QList<QObject *> QUmlOutputPinObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlOutputPin *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlOutputPinObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlOutputPin *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlOutputPinObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlOutputPin *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlOutputPinObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlOutputPin *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlOutputPinObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlOutputPin *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlOutputPinObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlOutputPin *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlOutputPinObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlOutputPinObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlOutputPinObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlOutputPinObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlOutputPinObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [MultiplicityElement]
 
 void QUmlOutputPinObject::setOrdered(bool isOrdered)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->setOrdered(isOrdered);
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->setOrdered(isOrdered);
 }
 
 void QUmlOutputPinObject::unsetOrdered()
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("ordered"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("ordered"));
 }
 
 void QUmlOutputPinObject::setUnique(bool isUnique)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->setUnique(isUnique);
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->setUnique(isUnique);
 }
 
 void QUmlOutputPinObject::unsetUnique()
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("unique"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("unique"));
 }
 
 void QUmlOutputPinObject::setLower(int lower)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->setLower(lower);
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->setLower(lower);
 }
 
 void QUmlOutputPinObject::unsetLower()
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("lower"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("lower"));
 }
 
 void QUmlOutputPinObject::setLowerValue(QObject *lowerValue)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->setLowerValue(qmodelingobjectproperty_cast<QUmlValueSpecification *>(lowerValue));
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->setLowerValue(qmodelingelementproperty_cast<QUmlValueSpecification *>(lowerValue));
 }
 
 void QUmlOutputPinObject::setUpper(int upper)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->setUpper(upper);
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->setUpper(upper);
 }
 
 void QUmlOutputPinObject::unsetUpper()
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("upper"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("upper"));
 }
 
 void QUmlOutputPinObject::setUpperValue(QObject *upperValue)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->setUpperValue(qmodelingobjectproperty_cast<QUmlValueSpecification *>(upperValue));
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->setUpperValue(qmodelingelementproperty_cast<QUmlValueSpecification *>(upperValue));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlOutputPinObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlOutputPinObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlOutputPinObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->setName(name);
 }
 
 void QUmlOutputPinObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlOutputPinObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlOutputPinObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlOutputPinObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlOutputPinObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlOutputPinObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlOutputPinObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlOutputPinObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlOutputPinObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlOutputPinObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlOutputPinObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlOutputPinObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlOutputPinObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlOutputPinObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlOutputPinObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlOutputPinObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlOutputPinObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlOutputPinObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlOutputPinObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlOutputPinObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlOutputPinObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlOutputPinObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlOutputPinObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlOutputPinObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TypedElement]
 
 void QUmlOutputPinObject::setType(QObject *type)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->setType(qmodelingobjectproperty_cast<QUmlType *>(type));
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->setType(qmodelingelementproperty_cast<QUmlType *>(type));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ObjectNode]
 
 void QUmlOutputPinObject::addInState(QObject *inState)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->addInState(qmodelingobjectproperty_cast<QUmlState *>(inState));
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->addInState(qmodelingelementproperty_cast<QUmlState *>(inState));
 }
 
 void QUmlOutputPinObject::removeInState(QObject *inState)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->removeInState(qmodelingobjectproperty_cast<QUmlState *>(inState));
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->removeInState(qmodelingelementproperty_cast<QUmlState *>(inState));
 }
 
 void QUmlOutputPinObject::setControlType(bool isControlType)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->setControlType(isControlType);
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->setControlType(isControlType);
 }
 
 void QUmlOutputPinObject::unsetControlType()
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("controlType"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("controlType"));
 }
 
 void QUmlOutputPinObject::setOrdering(QtUml::ObjectNodeOrderingKind ordering)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->setOrdering(ordering);
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->setOrdering(ordering);
 }
 
 void QUmlOutputPinObject::unsetOrdering()
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("ordering"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("ordering"));
 }
 
 void QUmlOutputPinObject::setSelection(QObject *selection)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->setSelection(qmodelingobjectproperty_cast<QUmlBehavior *>(selection));
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->setSelection(qmodelingelementproperty_cast<QUmlBehavior *>(selection));
 }
 
 void QUmlOutputPinObject::setUpperBound(QObject *upperBound)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->setUpperBound(qmodelingobjectproperty_cast<QUmlValueSpecification *>(upperBound));
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->setUpperBound(qmodelingelementproperty_cast<QUmlValueSpecification *>(upperBound));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Pin]
 
 void QUmlOutputPinObject::setControl(bool isControl)
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->setControl(isControl);
+    qmodelingelementproperty_cast<QUmlOutputPin *>(this)->setControl(isControl);
 }
 
 void QUmlOutputPinObject::unsetControl()
 {
-    qmodelingobjectproperty_cast<QUmlOutputPin *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("control"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("control"));
+}
+
+
+void QUmlOutputPinObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlMultiplicityElement");
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isOrdered"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isUnique"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lower"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lowerValue"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upper"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperValue"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTypedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
+
+    d->propertyGroups << QStringLiteral("QUmlObjectNode");
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStates"))));
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isControlType"))));
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ordering"))));
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("selection"))));
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperBound"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPin");
+    d->groupProperties.insert(QStringLiteral("QUmlPin"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isControl"))));
+
+    d->propertyGroups << QStringLiteral("QUmlOutputPin");
+}
+
+void QUmlOutputPinObject::setPropertyData()
+{
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumloutputpinobject_p.h b/src/uml/qobjects/qumloutputpinobject_p.h
index 888a1aba..4b9968af 100644
--- a/src/uml/qobjects/qumloutputpinobject_p.h
+++ b/src/uml/qobjects/qumloutputpinobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlOutputPin;
-class Q_UML_EXPORT QUmlOutputPinObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlOutputPinObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlOutputPinObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -108,7 +111,7 @@ class Q_UML_EXPORT QUmlOutputPinObject : public QObject
     Q_PROPERTY(bool isControl READ isControl WRITE setControl RESET unsetControl)
 
 public:
-    Q_INVOKABLE explicit QUmlOutputPinObject(QUmlOutputPin *qModelingObject);
+    Q_INVOKABLE explicit QUmlOutputPinObject(QUmlOutputPin *qModelingElement);
     virtual ~QUmlOutputPinObject();
 
     // Owned attributes [Element]
@@ -253,6 +256,10 @@ public Q_SLOTS:
     // Slots for owned attributes [Pin]
     void setControl(bool isControl);
     void unsetControl();
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlpackageimportobject.cpp b/src/uml/qobjects/qumlpackageimportobject.cpp
index 6d7c84ec..e72225c3 100644
--- a/src/uml/qobjects/qumlpackageimportobject.cpp
+++ b/src/uml/qobjects/qumlpackageimportobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlpackageimportobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlPackageImport>
 #include <QtUml/QUmlComment>
@@ -48,16 +49,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlPackageImportObject::QUmlPackageImportObject(QUmlPackageImport *qModelingObject)
+QUmlPackageImportObject::QUmlPackageImportObject(QUmlPackageImport *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlPackageImportObject::~QUmlPackageImportObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlPackageImport *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlPackageImport *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -66,25 +69,25 @@ QUmlPackageImportObject::~QUmlPackageImportObject()
 const QSet<QObject *> QUmlPackageImportObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlPackageImport *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlPackageImport *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPackageImportObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlPackageImport *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlPackageImport *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlPackageImportObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPackageImport *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlPackageImport *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPackageImport *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPackageImport *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [Relationship]
@@ -92,8 +95,8 @@ QObject *QUmlPackageImportObject::owner() const
 const QSet<QObject *> QUmlPackageImportObject::relatedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlPackageImport *>(this)->relatedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlPackageImport *>(this)->relatedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -102,16 +105,16 @@ const QSet<QObject *> QUmlPackageImportObject::relatedElements() const
 const QSet<QObject *> QUmlPackageImportObject::sources() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlPackageImport *>(this)->sources())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlPackageImport *>(this)->sources())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPackageImportObject::targets() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlPackageImport *>(this)->targets())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlPackageImport *>(this)->targets())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -119,23 +122,23 @@ const QSet<QObject *> QUmlPackageImportObject::targets() const
 
 QObject *QUmlPackageImportObject::importedPackage() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPackageImport *>(this)->importedPackage())
+    if (!qmodelingelementproperty_cast<QUmlPackageImport *>(this)->importedPackage())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPackageImport *>(this)->importedPackage()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPackageImport *>(this)->importedPackage()->asQModelingObject();
 }
 
 QObject *QUmlPackageImportObject::importingNamespace() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPackageImport *>(this)->importingNamespace())
+    if (!qmodelingelementproperty_cast<QUmlPackageImport *>(this)->importingNamespace())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPackageImport *>(this)->importingNamespace()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPackageImport *>(this)->importingNamespace()->asQModelingObject();
 }
 
 QtUml::VisibilityKind QUmlPackageImportObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlPackageImport *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlPackageImport *>(this)->visibility();
 }
 
 // OPERATIONS [Element]
@@ -143,97 +146,156 @@ QtUml::VisibilityKind QUmlPackageImportObject::visibility() const
 QSet<QObject *> QUmlPackageImportObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlPackageImport *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlPackageImport *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlPackageImportObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlPackageImport *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlPackageImport *>(this)->mustBeOwned();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlPackageImportObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlPackageImport *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlPackageImport *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlPackageImportObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlPackageImport *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlPackageImport *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlPackageImportObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlPackageImport *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlPackageImport *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlPackageImportObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlPackageImport *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlPackageImport *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlPackageImportObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlPackageImport *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlPackageImport *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Relationship]
 
 void QUmlPackageImportObject::addRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlPackageImport *>(this)->addRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlPackageImport *>(this)->addRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 void QUmlPackageImportObject::removeRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlPackageImport *>(this)->removeRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlPackageImport *>(this)->removeRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [DirectedRelationship]
 
 void QUmlPackageImportObject::addSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlPackageImport *>(this)->addSource(qmodelingobjectproperty_cast<QUmlElement *>(source));
+    qmodelingelementproperty_cast<QUmlPackageImport *>(this)->addSource(qmodelingelementproperty_cast<QUmlElement *>(source));
 }
 
 void QUmlPackageImportObject::removeSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlPackageImport *>(this)->removeSource(qmodelingobjectproperty_cast<QUmlElement *>(source));
+    qmodelingelementproperty_cast<QUmlPackageImport *>(this)->removeSource(qmodelingelementproperty_cast<QUmlElement *>(source));
 }
 
 void QUmlPackageImportObject::addTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlPackageImport *>(this)->addTarget(qmodelingobjectproperty_cast<QUmlElement *>(target));
+    qmodelingelementproperty_cast<QUmlPackageImport *>(this)->addTarget(qmodelingelementproperty_cast<QUmlElement *>(target));
 }
 
 void QUmlPackageImportObject::removeTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlPackageImport *>(this)->removeTarget(qmodelingobjectproperty_cast<QUmlElement *>(target));
+    qmodelingelementproperty_cast<QUmlPackageImport *>(this)->removeTarget(qmodelingelementproperty_cast<QUmlElement *>(target));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [PackageImport]
 
 void QUmlPackageImportObject::setImportedPackage(QObject *importedPackage)
 {
-    qmodelingobjectproperty_cast<QUmlPackageImport *>(this)->setImportedPackage(qmodelingobjectproperty_cast<QUmlPackage *>(importedPackage));
+    qmodelingelementproperty_cast<QUmlPackageImport *>(this)->setImportedPackage(qmodelingelementproperty_cast<QUmlPackage *>(importedPackage));
 }
 
 void QUmlPackageImportObject::setImportingNamespace(QObject *importingNamespace)
 {
-    qmodelingobjectproperty_cast<QUmlPackageImport *>(this)->setImportingNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(importingNamespace));
+    qmodelingelementproperty_cast<QUmlPackageImport *>(this)->setImportingNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(importingNamespace));
 }
 
 void QUmlPackageImportObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlPackageImport *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlPackageImport *>(this)->setVisibility(visibility);
 }
 
 void QUmlPackageImportObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlPackageImport *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
+}
+
+
+void QUmlPackageImportObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDirectedRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageImport");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageImport"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedPackage"))));
+    d->groupProperties.insert(QStringLiteral("QUmlPackageImport"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importingNamespace"))));
+    d->groupProperties.insert(QStringLiteral("QUmlPackageImport"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+}
+
+void QUmlPackageImportObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageImport, importedPackage, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageImport, importedPackage, PropertyClassRole, QStringLiteral("QUmlPackageImport"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageImport, importedPackage, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageImport, importedPackage, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageImport, importedPackage, DocumentationRole, QStringLiteral("Specifies the Package whose members are imported into a Namespace."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageImport, importedPackage, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageImport, importedPackage, SubsettedPropertiesRole, QStringLiteral("DirectedRelationship-target"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageImport, importedPackage, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageImport, importingNamespace, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageImport, importingNamespace, PropertyClassRole, QStringLiteral("QUmlPackageImport"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageImport, importingNamespace, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageImport, importingNamespace, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageImport, importingNamespace, DocumentationRole, QStringLiteral("Specifies the Namespace that imports the members from a Package."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageImport, importingNamespace, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageImport, importingNamespace, SubsettedPropertiesRole, QStringLiteral("Element-owner DirectedRelationship-source"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageImport, importingNamespace, OppositeEndRole, QStringLiteral("Namespace-packageImport"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageImport, visibility, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageImport, visibility, PropertyClassRole, QStringLiteral("QUmlPackageImport"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageImport, visibility, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageImport, visibility, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageImport, visibility, DocumentationRole, QStringLiteral("Specifies the visibility of the imported PackageableElements within the importing Namespace, i.e., whether imported elements will in turn be visible to other packages that use that importingPackage as an importedPackage. If the PackageImport is public, the imported elements will be visible outside the package, while if it is private they will not."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageImport, visibility, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageImport, visibility, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageImport, visibility, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlpackageimportobject_p.h b/src/uml/qobjects/qumlpackageimportobject_p.h
index afc99bb2..6682de9c 100644
--- a/src/uml/qobjects/qumlpackageimportobject_p.h
+++ b/src/uml/qobjects/qumlpackageimportobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlPackageImport;
-class Q_UML_EXPORT QUmlPackageImportObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlPackageImportObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlPackageImportObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -76,7 +79,7 @@ class Q_UML_EXPORT QUmlPackageImportObject : public QObject
     Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
 public:
-    Q_INVOKABLE explicit QUmlPackageImportObject(QUmlPackageImport *qModelingObject);
+    Q_INVOKABLE explicit QUmlPackageImportObject(QUmlPackageImport *qModelingElement);
     virtual ~QUmlPackageImportObject();
 
     // Owned attributes [Element]
@@ -124,6 +127,10 @@ public Q_SLOTS:
     void setImportingNamespace(QObject *importingNamespace = 0);
     void setVisibility(QtUml::VisibilityKind visibility);
     void unsetVisibility();
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlpackagemergeobject.cpp b/src/uml/qobjects/qumlpackagemergeobject.cpp
index ac2e72e2..11443b5d 100644
--- a/src/uml/qobjects/qumlpackagemergeobject.cpp
+++ b/src/uml/qobjects/qumlpackagemergeobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlpackagemergeobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlPackageMerge>
 #include <QtUml/QUmlComment>
@@ -47,16 +48,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlPackageMergeObject::QUmlPackageMergeObject(QUmlPackageMerge *qModelingObject)
+QUmlPackageMergeObject::QUmlPackageMergeObject(QUmlPackageMerge *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlPackageMergeObject::~QUmlPackageMergeObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlPackageMerge *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlPackageMerge *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -65,25 +68,25 @@ QUmlPackageMergeObject::~QUmlPackageMergeObject()
 const QSet<QObject *> QUmlPackageMergeObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlPackageMerge *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlPackageMerge *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPackageMergeObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlPackageMerge *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlPackageMerge *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlPackageMergeObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPackageMerge *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlPackageMerge *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPackageMerge *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPackageMerge *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [Relationship]
@@ -91,8 +94,8 @@ QObject *QUmlPackageMergeObject::owner() const
 const QSet<QObject *> QUmlPackageMergeObject::relatedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlPackageMerge *>(this)->relatedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlPackageMerge *>(this)->relatedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -101,16 +104,16 @@ const QSet<QObject *> QUmlPackageMergeObject::relatedElements() const
 const QSet<QObject *> QUmlPackageMergeObject::sources() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlPackageMerge *>(this)->sources())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlPackageMerge *>(this)->sources())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPackageMergeObject::targets() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlPackageMerge *>(this)->targets())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlPackageMerge *>(this)->targets())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -118,18 +121,18 @@ const QSet<QObject *> QUmlPackageMergeObject::targets() const
 
 QObject *QUmlPackageMergeObject::mergedPackage() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPackageMerge *>(this)->mergedPackage())
+    if (!qmodelingelementproperty_cast<QUmlPackageMerge *>(this)->mergedPackage())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPackageMerge *>(this)->mergedPackage()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPackageMerge *>(this)->mergedPackage()->asQModelingObject();
 }
 
 QObject *QUmlPackageMergeObject::receivingPackage() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPackageMerge *>(this)->receivingPackage())
+    if (!qmodelingelementproperty_cast<QUmlPackageMerge *>(this)->receivingPackage())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPackageMerge *>(this)->receivingPackage()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPackageMerge *>(this)->receivingPackage()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -137,87 +140,135 @@ QObject *QUmlPackageMergeObject::receivingPackage() const
 QSet<QObject *> QUmlPackageMergeObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlPackageMerge *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlPackageMerge *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlPackageMergeObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlPackageMerge *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlPackageMerge *>(this)->mustBeOwned();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlPackageMergeObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlPackageMerge *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlPackageMerge *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlPackageMergeObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlPackageMerge *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlPackageMerge *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlPackageMergeObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlPackageMerge *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlPackageMerge *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlPackageMergeObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlPackageMerge *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlPackageMerge *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlPackageMergeObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlPackageMerge *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlPackageMerge *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Relationship]
 
 void QUmlPackageMergeObject::addRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlPackageMerge *>(this)->addRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlPackageMerge *>(this)->addRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 void QUmlPackageMergeObject::removeRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlPackageMerge *>(this)->removeRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlPackageMerge *>(this)->removeRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [DirectedRelationship]
 
 void QUmlPackageMergeObject::addSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlPackageMerge *>(this)->addSource(qmodelingobjectproperty_cast<QUmlElement *>(source));
+    qmodelingelementproperty_cast<QUmlPackageMerge *>(this)->addSource(qmodelingelementproperty_cast<QUmlElement *>(source));
 }
 
 void QUmlPackageMergeObject::removeSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlPackageMerge *>(this)->removeSource(qmodelingobjectproperty_cast<QUmlElement *>(source));
+    qmodelingelementproperty_cast<QUmlPackageMerge *>(this)->removeSource(qmodelingelementproperty_cast<QUmlElement *>(source));
 }
 
 void QUmlPackageMergeObject::addTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlPackageMerge *>(this)->addTarget(qmodelingobjectproperty_cast<QUmlElement *>(target));
+    qmodelingelementproperty_cast<QUmlPackageMerge *>(this)->addTarget(qmodelingelementproperty_cast<QUmlElement *>(target));
 }
 
 void QUmlPackageMergeObject::removeTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlPackageMerge *>(this)->removeTarget(qmodelingobjectproperty_cast<QUmlElement *>(target));
+    qmodelingelementproperty_cast<QUmlPackageMerge *>(this)->removeTarget(qmodelingelementproperty_cast<QUmlElement *>(target));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [PackageMerge]
 
 void QUmlPackageMergeObject::setMergedPackage(QObject *mergedPackage)
 {
-    qmodelingobjectproperty_cast<QUmlPackageMerge *>(this)->setMergedPackage(qmodelingobjectproperty_cast<QUmlPackage *>(mergedPackage));
+    qmodelingelementproperty_cast<QUmlPackageMerge *>(this)->setMergedPackage(qmodelingelementproperty_cast<QUmlPackage *>(mergedPackage));
 }
 
 void QUmlPackageMergeObject::setReceivingPackage(QObject *receivingPackage)
 {
-    qmodelingobjectproperty_cast<QUmlPackageMerge *>(this)->setReceivingPackage(qmodelingobjectproperty_cast<QUmlPackage *>(receivingPackage));
+    qmodelingelementproperty_cast<QUmlPackageMerge *>(this)->setReceivingPackage(qmodelingelementproperty_cast<QUmlPackage *>(receivingPackage));
+}
+
+
+void QUmlPackageMergeObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDirectedRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageMerge");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageMerge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("mergedPackage"))));
+    d->groupProperties.insert(QStringLiteral("QUmlPackageMerge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("receivingPackage"))));
+}
+
+void QUmlPackageMergeObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageMerge, mergedPackage, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageMerge, mergedPackage, PropertyClassRole, QStringLiteral("QUmlPackageMerge"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageMerge, mergedPackage, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageMerge, mergedPackage, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageMerge, mergedPackage, DocumentationRole, QStringLiteral("References the Package that is to be merged with the receiving package of the PackageMerge."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageMerge, mergedPackage, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageMerge, mergedPackage, SubsettedPropertiesRole, QStringLiteral("DirectedRelationship-target"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageMerge, mergedPackage, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageMerge, receivingPackage, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageMerge, receivingPackage, PropertyClassRole, QStringLiteral("QUmlPackageMerge"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageMerge, receivingPackage, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageMerge, receivingPackage, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageMerge, receivingPackage, DocumentationRole, QStringLiteral("References the Package that is being extended with the contents of the merged package of the PackageMerge."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageMerge, receivingPackage, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageMerge, receivingPackage, SubsettedPropertiesRole, QStringLiteral("Element-owner DirectedRelationship-source"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackageMerge, receivingPackage, OppositeEndRole, QStringLiteral("Package-packageMerge"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlpackagemergeobject_p.h b/src/uml/qobjects/qumlpackagemergeobject_p.h
index 0c2489f1..3cb53c96 100644
--- a/src/uml/qobjects/qumlpackagemergeobject_p.h
+++ b/src/uml/qobjects/qumlpackagemergeobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 QT_BEGIN_HEADER
 
@@ -52,9 +52,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlPackageMerge;
-class Q_UML_EXPORT QUmlPackageMergeObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlPackageMergeObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlPackageMergeObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -73,7 +76,7 @@ class Q_UML_EXPORT QUmlPackageMergeObject : public QObject
     Q_PROPERTY(QObject * receivingPackage READ receivingPackage WRITE setReceivingPackage)
 
 public:
-    Q_INVOKABLE explicit QUmlPackageMergeObject(QUmlPackageMerge *qModelingObject);
+    Q_INVOKABLE explicit QUmlPackageMergeObject(QUmlPackageMerge *qModelingElement);
     virtual ~QUmlPackageMergeObject();
 
     // Owned attributes [Element]
@@ -118,6 +121,10 @@ public Q_SLOTS:
     // Slots for owned attributes [PackageMerge]
     void setMergedPackage(QObject *mergedPackage = 0);
     void setReceivingPackage(QObject *receivingPackage = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlpackageobject.cpp b/src/uml/qobjects/qumlpackageobject.cpp
index c1fe05ed..c126a473 100644
--- a/src/uml/qobjects/qumlpackageobject.cpp
+++ b/src/uml/qobjects/qumlpackageobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlpackageobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlPackage>
 #include <QtUml/QUmlComment>
@@ -63,16 +64,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlPackageObject::QUmlPackageObject(QUmlPackage *qModelingObject)
+QUmlPackageObject::QUmlPackageObject(QUmlPackage *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlPackageObject::~QUmlPackageObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlPackage *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlPackage *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -81,25 +84,25 @@ QUmlPackageObject::~QUmlPackageObject()
 const QSet<QObject *> QUmlPackageObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlPackage *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlPackage *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPackageObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlPackage *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlPackage *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlPackageObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPackage *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlPackage *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPackage *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPackage *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -107,35 +110,35 @@ QObject *QUmlPackageObject::owner() const
 const QSet<QObject *> QUmlPackageObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlPackage *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlPackage *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlPackageObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlPackage *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlPackage *>(this)->name();
 }
 
 QObject *QUmlPackageObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPackage *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlPackage *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPackage *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPackage *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlPackageObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPackage *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlPackage *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPackage *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPackage *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlPackageObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlPackage *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlPackage *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [Namespace]
@@ -143,48 +146,48 @@ QString QUmlPackageObject::qualifiedName() const
 const QSet<QObject *> QUmlPackageObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlPackage *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlPackage *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPackageObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlPackage *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlPackage *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPackageObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlPackage *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlPackage *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPackageObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlPackage *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlPackage *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPackageObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlPackage *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlPackage *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPackageObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlPackage *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlPackage *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -192,42 +195,42 @@ const QSet<QObject *> QUmlPackageObject::packageImports() const
 
 QObject *QUmlPackageObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPackage *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlPackage *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPackage *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPackage *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlPackageObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPackage *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlPackage *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPackage *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPackage *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlPackageObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlPackage *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlPackage *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [TemplateableElement]
 
 QObject *QUmlPackageObject::ownedTemplateSignature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPackage *>(this)->ownedTemplateSignature())
+    if (!qmodelingelementproperty_cast<QUmlPackage *>(this)->ownedTemplateSignature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPackage *>(this)->ownedTemplateSignature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPackage *>(this)->ownedTemplateSignature()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlPackageObject::templateBindings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTemplateBinding *element, qmodelingobjectproperty_cast<QUmlPackage *>(this)->templateBindings())
-        set.insert(element->asQObject());
+    foreach (QUmlTemplateBinding *element, qmodelingelementproperty_cast<QUmlPackage *>(this)->templateBindings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -235,62 +238,62 @@ const QSet<QObject *> QUmlPackageObject::templateBindings() const
 
 QString QUmlPackageObject::URI() const
 {
-    return qmodelingobjectproperty_cast<QUmlPackage *>(this)->URI();
+    return qmodelingelementproperty_cast<QUmlPackage *>(this)->URI();
 }
 
 const QSet<QObject *> QUmlPackageObject::nestedPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlPackage *>(this)->nestedPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlPackage *>(this)->nestedPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlPackageObject::nestingPackage() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPackage *>(this)->nestingPackage())
+    if (!qmodelingelementproperty_cast<QUmlPackage *>(this)->nestingPackage())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPackage *>(this)->nestingPackage()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPackage *>(this)->nestingPackage()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlPackageObject::ownedStereotypes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlStereotype *element, qmodelingobjectproperty_cast<QUmlPackage *>(this)->ownedStereotypes())
-        set.insert(element->asQObject());
+    foreach (QUmlStereotype *element, qmodelingelementproperty_cast<QUmlPackage *>(this)->ownedStereotypes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPackageObject::ownedTypes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlType *element, qmodelingobjectproperty_cast<QUmlPackage *>(this)->ownedTypes())
-        set.insert(element->asQObject());
+    foreach (QUmlType *element, qmodelingelementproperty_cast<QUmlPackage *>(this)->ownedTypes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPackageObject::packageMerges() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageMerge *element, qmodelingobjectproperty_cast<QUmlPackage *>(this)->packageMerges())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageMerge *element, qmodelingelementproperty_cast<QUmlPackage *>(this)->packageMerges())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPackageObject::packagedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlPackage *>(this)->packagedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlPackage *>(this)->packagedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPackageObject::profileApplications() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProfileApplication *element, qmodelingobjectproperty_cast<QUmlPackage *>(this)->profileApplications())
-        set.insert(element->asQObject());
+    foreach (QUmlProfileApplication *element, qmodelingelementproperty_cast<QUmlPackage *>(this)->profileApplications())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -299,8 +302,8 @@ const QSet<QObject *> QUmlPackageObject::profileApplications() const
 QSet<QObject *> QUmlPackageObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlPackage *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlPackage *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 // OPERATIONS [NamedElement]
@@ -308,27 +311,27 @@ QSet<QObject *> QUmlPackageObject::allOwnedElements() const
 QList<QObject *> QUmlPackageObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlPackage *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlPackage *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlPackageObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlPackage *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlPackage *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlPackageObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlPackage *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlPackage *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlPackageObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlPackage *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlPackage *>(this)->separator();
 }
 
 // OPERATIONS [Namespace]
@@ -337,58 +340,58 @@ QSet<QObject *> QUmlPackageObject::excludeCollisions(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlPackage *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlPackage *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlPackageObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlPackage *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlPackage *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlPackageObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlPackage *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlPackage *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlPackageObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlPackage *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlPackage *>(this)->membersAreDistinguishable();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlPackageObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlPackage *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlPackage *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlPackageObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlPackage *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlPackage *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [TemplateableElement]
 
 bool QUmlPackageObject::isTemplate() const
 {
-    return qmodelingobjectproperty_cast<QUmlPackage *>(this)->isTemplate();
+    return qmodelingelementproperty_cast<QUmlPackage *>(this)->isTemplate();
 }
 
 QSet<QObject *> QUmlPackageObject::parameterableElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterableElement *element, qmodelingobjectproperty_cast<QUmlPackage *>(this)->parameterableElements())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterableElement *element, qmodelingelementproperty_cast<QUmlPackage *>(this)->parameterableElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -397,34 +400,34 @@ QSet<QObject *> QUmlPackageObject::parameterableElements() const
 QSet<QObject *> QUmlPackageObject::allApplicableStereotypes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlStereotype *element, qmodelingobjectproperty_cast<QUmlPackage *>(this)->allApplicableStereotypes())
-        set.insert(element->asQObject());
+    foreach (QUmlStereotype *element, qmodelingelementproperty_cast<QUmlPackage *>(this)->allApplicableStereotypes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlPackageObject::containingProfile() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPackage *>(this)->containingProfile())
+    if (!qmodelingelementproperty_cast<QUmlPackage *>(this)->containingProfile())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPackage *>(this)->containingProfile()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPackage *>(this)->containingProfile()->asQModelingObject();
 }
 
 bool QUmlPackageObject::makesVisible(QObject *el) const
 {
-    return qmodelingobjectproperty_cast<QUmlPackage *>(this)->makesVisible(qmodelingobjectproperty_cast<QUmlNamedElement *>(el));
+    return qmodelingelementproperty_cast<QUmlPackage *>(this)->makesVisible(qmodelingelementproperty_cast<QUmlNamedElement *>(el));
 }
 
 bool QUmlPackageObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlPackage *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlPackage *>(this)->mustBeOwned();
 }
 
 QSet<QObject *> QUmlPackageObject::visibleMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlPackage *>(this)->visibleMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlPackage *>(this)->visibleMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -432,233 +435,361 @@ QSet<QObject *> QUmlPackageObject::visibleMembers() const
 
 void QUmlPackageObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlPackageObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlPackageObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlPackageObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlPackageObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlPackageObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlPackageObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlPackageObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->setName(name);
 }
 
 void QUmlPackageObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlPackageObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlPackageObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlPackageObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlPackageObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlPackageObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlPackageObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlPackageObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlPackageObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlPackageObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlPackageObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlPackageObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlPackageObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlPackageObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlPackageObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlPackageObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlPackageObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlPackageObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->setVisibility(visibility);
 }
 
 void QUmlPackageObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateableElement]
 
 void QUmlPackageObject::setOwnedTemplateSignature(QObject *ownedTemplateSignature)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->setOwnedTemplateSignature(qmodelingobjectproperty_cast<QUmlTemplateSignature *>(ownedTemplateSignature));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->setOwnedTemplateSignature(qmodelingelementproperty_cast<QUmlTemplateSignature *>(ownedTemplateSignature));
 }
 
 void QUmlPackageObject::addTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->addTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->addTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 void QUmlPackageObject::removeTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->removeTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->removeTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Package]
 
 void QUmlPackageObject::setURI(QString URI)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->setURI(URI);
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->setURI(URI);
 }
 
 void QUmlPackageObject::addNestedPackage(QObject *nestedPackage)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->addNestedPackage(qmodelingobjectproperty_cast<QUmlPackage *>(nestedPackage));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->addNestedPackage(qmodelingelementproperty_cast<QUmlPackage *>(nestedPackage));
 }
 
 void QUmlPackageObject::removeNestedPackage(QObject *nestedPackage)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->removeNestedPackage(qmodelingobjectproperty_cast<QUmlPackage *>(nestedPackage));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->removeNestedPackage(qmodelingelementproperty_cast<QUmlPackage *>(nestedPackage));
 }
 
 void QUmlPackageObject::setNestingPackage(QObject *nestingPackage)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->setNestingPackage(qmodelingobjectproperty_cast<QUmlPackage *>(nestingPackage));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->setNestingPackage(qmodelingelementproperty_cast<QUmlPackage *>(nestingPackage));
 }
 
 void QUmlPackageObject::addOwnedStereotype(QObject *ownedStereotype)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->addOwnedStereotype(qmodelingobjectproperty_cast<QUmlStereotype *>(ownedStereotype));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->addOwnedStereotype(qmodelingelementproperty_cast<QUmlStereotype *>(ownedStereotype));
 }
 
 void QUmlPackageObject::removeOwnedStereotype(QObject *ownedStereotype)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->removeOwnedStereotype(qmodelingobjectproperty_cast<QUmlStereotype *>(ownedStereotype));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->removeOwnedStereotype(qmodelingelementproperty_cast<QUmlStereotype *>(ownedStereotype));
 }
 
 void QUmlPackageObject::addOwnedType(QObject *ownedType)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->addOwnedType(qmodelingobjectproperty_cast<QUmlType *>(ownedType));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->addOwnedType(qmodelingelementproperty_cast<QUmlType *>(ownedType));
 }
 
 void QUmlPackageObject::removeOwnedType(QObject *ownedType)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->removeOwnedType(qmodelingobjectproperty_cast<QUmlType *>(ownedType));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->removeOwnedType(qmodelingelementproperty_cast<QUmlType *>(ownedType));
 }
 
 void QUmlPackageObject::addPackageMerge(QObject *packageMerge)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->addPackageMerge(qmodelingobjectproperty_cast<QUmlPackageMerge *>(packageMerge));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->addPackageMerge(qmodelingelementproperty_cast<QUmlPackageMerge *>(packageMerge));
 }
 
 void QUmlPackageObject::removePackageMerge(QObject *packageMerge)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->removePackageMerge(qmodelingobjectproperty_cast<QUmlPackageMerge *>(packageMerge));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->removePackageMerge(qmodelingelementproperty_cast<QUmlPackageMerge *>(packageMerge));
 }
 
 void QUmlPackageObject::addPackagedElement(QObject *packagedElement)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->addPackagedElement(qmodelingobjectproperty_cast<QUmlPackageableElement *>(packagedElement));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->addPackagedElement(qmodelingelementproperty_cast<QUmlPackageableElement *>(packagedElement));
 }
 
 void QUmlPackageObject::removePackagedElement(QObject *packagedElement)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->removePackagedElement(qmodelingobjectproperty_cast<QUmlPackageableElement *>(packagedElement));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->removePackagedElement(qmodelingelementproperty_cast<QUmlPackageableElement *>(packagedElement));
 }
 
 void QUmlPackageObject::addProfileApplication(QObject *profileApplication)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->addProfileApplication(qmodelingobjectproperty_cast<QUmlProfileApplication *>(profileApplication));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->addProfileApplication(qmodelingelementproperty_cast<QUmlProfileApplication *>(profileApplication));
 }
 
 void QUmlPackageObject::removeProfileApplication(QObject *profileApplication)
 {
-    qmodelingobjectproperty_cast<QUmlPackage *>(this)->removeProfileApplication(qmodelingobjectproperty_cast<QUmlProfileApplication *>(profileApplication));
+    qmodelingelementproperty_cast<QUmlPackage *>(this)->removeProfileApplication(qmodelingelementproperty_cast<QUmlProfileApplication *>(profileApplication));
+}
+
+
+void QUmlPackageObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackage");
+    d->groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("URI"))));
+    d->groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedPackages"))));
+    d->groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestingPackage"))));
+    d->groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedStereotypes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTypes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageMerges"))));
+    d->groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packagedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("profileApplications"))));
+}
+
+void QUmlPackageObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, URI, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, URI, PropertyClassRole, QStringLiteral("QUmlPackage"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, URI, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, URI, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, URI, DocumentationRole, QStringLiteral("Provides an identifier for the package that can be used for many purposes. A URI is the universally unique identification of the package following the IETF URI specification, RFC 2396 http://www.ietf.org/rfc/rfc2396.txt and it must comply with those syntax rules."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, URI, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, URI, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, URI, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, nestedPackages, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, nestedPackages, PropertyClassRole, QStringLiteral("QUmlPackage"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, nestedPackages, IsDerivedRole, true);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, nestedPackages, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, nestedPackages, DocumentationRole, QStringLiteral("References the packaged elements that are Packages."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, nestedPackages, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, nestedPackages, SubsettedPropertiesRole, QStringLiteral("Package-packagedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, nestedPackages, OppositeEndRole, QStringLiteral("Package-nestingPackage"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, nestingPackage, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, nestingPackage, PropertyClassRole, QStringLiteral("QUmlPackage"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, nestingPackage, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, nestingPackage, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, nestingPackage, DocumentationRole, QStringLiteral("References the Package that owns this Package."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, nestingPackage, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, nestingPackage, SubsettedPropertiesRole, QStringLiteral("A_packagedElement_owningPackage-owningPackage"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, nestingPackage, OppositeEndRole, QStringLiteral("Package-nestedPackage"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, ownedStereotypes, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, ownedStereotypes, PropertyClassRole, QStringLiteral("QUmlPackage"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, ownedStereotypes, IsDerivedRole, true);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, ownedStereotypes, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, ownedStereotypes, DocumentationRole, QStringLiteral("References the Stereotypes that are owned by the Package"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, ownedStereotypes, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, ownedStereotypes, SubsettedPropertiesRole, QStringLiteral("Package-packagedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, ownedStereotypes, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, ownedTypes, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, ownedTypes, PropertyClassRole, QStringLiteral("QUmlPackage"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, ownedTypes, IsDerivedRole, true);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, ownedTypes, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, ownedTypes, DocumentationRole, QStringLiteral("References the packaged elements that are Types."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, ownedTypes, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, ownedTypes, SubsettedPropertiesRole, QStringLiteral("Package-packagedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, ownedTypes, OppositeEndRole, QStringLiteral("Type-package"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, packageMerges, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, packageMerges, PropertyClassRole, QStringLiteral("QUmlPackage"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, packageMerges, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, packageMerges, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, packageMerges, DocumentationRole, QStringLiteral("References the PackageMerges that are owned by this Package."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, packageMerges, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, packageMerges, SubsettedPropertiesRole, QStringLiteral("A_source_directedRelationship-directedRelationship Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, packageMerges, OppositeEndRole, QStringLiteral("PackageMerge-receivingPackage"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, packagedElements, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, packagedElements, PropertyClassRole, QStringLiteral("QUmlPackage"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, packagedElements, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, packagedElements, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, packagedElements, DocumentationRole, QStringLiteral("Specifies the packageable elements that are owned by this Package."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, packagedElements, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, packagedElements, SubsettedPropertiesRole, QStringLiteral("Namespace-ownedMember"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, packagedElements, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, profileApplications, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, profileApplications, PropertyClassRole, QStringLiteral("QUmlPackage"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, profileApplications, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, profileApplications, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, profileApplications, DocumentationRole, QStringLiteral("References the ProfileApplications that indicate which profiles have been applied to the Package."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, profileApplications, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, profileApplications, SubsettedPropertiesRole, QStringLiteral("A_source_directedRelationship-directedRelationship Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPackage, profileApplications, OppositeEndRole, QStringLiteral("ProfileApplication-applyingPackage"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlpackageobject_p.h b/src/uml/qobjects/qumlpackageobject_p.h
index 2fbd09bc..3230d1a8 100644
--- a/src/uml/qobjects/qumlpackageobject_p.h
+++ b/src/uml/qobjects/qumlpackageobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlPackage;
-class Q_UML_EXPORT QUmlPackageObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlPackageObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlPackageObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -100,7 +103,7 @@ class Q_UML_EXPORT QUmlPackageObject : public QObject
     Q_PROPERTY(QSet<QObject *> profileApplications READ profileApplications)
 
 public:
-    Q_INVOKABLE explicit QUmlPackageObject(QUmlPackage *qModelingObject);
+    Q_INVOKABLE explicit QUmlPackageObject(QUmlPackage *qModelingElement);
     virtual ~QUmlPackageObject();
 
     // Owned attributes [Element]
@@ -233,6 +236,10 @@ public Q_SLOTS:
     void removePackagedElement(QObject *packagedElement);
     void addProfileApplication(QObject *profileApplication);
     void removeProfileApplication(QObject *profileApplication);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlparameterobject.cpp b/src/uml/qobjects/qumlparameterobject.cpp
index ff5773f2..919ba4c4 100644
--- a/src/uml/qobjects/qumlparameterobject.cpp
+++ b/src/uml/qobjects/qumlparameterobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlparameterobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlParameter>
 #include <QtUml/QUmlComment>
@@ -60,16 +61,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlParameterObject::QUmlParameterObject(QUmlParameter *qModelingObject)
+QUmlParameterObject::QUmlParameterObject(QUmlParameter *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlParameterObject::~QUmlParameterObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlParameter *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlParameter *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -78,63 +81,63 @@ QUmlParameterObject::~QUmlParameterObject()
 const QSet<QObject *> QUmlParameterObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlParameter *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlParameter *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlParameterObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlParameter *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlParameter *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlParameterObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlParameter *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlParameter *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlParameter *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlParameter *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [MultiplicityElement]
 
 bool QUmlParameterObject::isOrdered() const
 {
-    return qmodelingobjectproperty_cast<QUmlParameter *>(this)->isOrdered();
+    return qmodelingelementproperty_cast<QUmlParameter *>(this)->isOrdered();
 }
 
 bool QUmlParameterObject::isUnique() const
 {
-    return qmodelingobjectproperty_cast<QUmlParameter *>(this)->isUnique();
+    return qmodelingelementproperty_cast<QUmlParameter *>(this)->isUnique();
 }
 
 int QUmlParameterObject::lower() const
 {
-    return qmodelingobjectproperty_cast<QUmlParameter *>(this)->lower();
+    return qmodelingelementproperty_cast<QUmlParameter *>(this)->lower();
 }
 
 QObject *QUmlParameterObject::lowerValue() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlParameter *>(this)->lowerValue())
+    if (!qmodelingelementproperty_cast<QUmlParameter *>(this)->lowerValue())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlParameter *>(this)->lowerValue()->asQObject();
+        return qmodelingelementproperty_cast<QUmlParameter *>(this)->lowerValue()->asQModelingObject();
 }
 
 int QUmlParameterObject::upper() const
 {
-    return qmodelingobjectproperty_cast<QUmlParameter *>(this)->upper();
+    return qmodelingelementproperty_cast<QUmlParameter *>(this)->upper();
 }
 
 QObject *QUmlParameterObject::upperValue() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlParameter *>(this)->upperValue())
+    if (!qmodelingelementproperty_cast<QUmlParameter *>(this)->upperValue())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlParameter *>(this)->upperValue()->asQObject();
+        return qmodelingelementproperty_cast<QUmlParameter *>(this)->upperValue()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -142,60 +145,60 @@ QObject *QUmlParameterObject::upperValue() const
 const QSet<QObject *> QUmlParameterObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlParameter *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlParameter *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlParameterObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlParameter *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlParameter *>(this)->name();
 }
 
 QObject *QUmlParameterObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlParameter *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlParameter *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlParameter *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlParameter *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlParameterObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlParameter *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlParameter *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlParameter *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlParameter *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlParameterObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlParameter *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlParameter *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlParameterObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlParameter *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlParameter *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [TypedElement]
 
 QObject *QUmlParameterObject::type() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlParameter *>(this)->type())
+    if (!qmodelingelementproperty_cast<QUmlParameter *>(this)->type())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlParameter *>(this)->type()->asQObject();
+        return qmodelingelementproperty_cast<QUmlParameter *>(this)->type()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlParameterObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlParameter *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlParameter *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlParameter *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlParameter *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ConnectableElement]
@@ -203,67 +206,67 @@ QObject *QUmlParameterObject::owningTemplateParameter() const
 const QList<QObject *> QUmlParameterObject::ends() const
 {
     QList<QObject *> list;
-    foreach (QUmlConnectorEnd *element, qmodelingobjectproperty_cast<QUmlParameter *>(this)->ends())
-        list.append(element->asQObject());
+    foreach (QUmlConnectorEnd *element, qmodelingelementproperty_cast<QUmlParameter *>(this)->ends())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 QObject *QUmlParameterObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlParameter *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlParameter *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlParameter *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlParameter *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [Parameter]
 
 QString QUmlParameterObject::default_() const
 {
-    return qmodelingobjectproperty_cast<QUmlParameter *>(this)->default_();
+    return qmodelingelementproperty_cast<QUmlParameter *>(this)->default_();
 }
 
 QObject *QUmlParameterObject::defaultValue() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlParameter *>(this)->defaultValue())
+    if (!qmodelingelementproperty_cast<QUmlParameter *>(this)->defaultValue())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlParameter *>(this)->defaultValue()->asQObject();
+        return qmodelingelementproperty_cast<QUmlParameter *>(this)->defaultValue()->asQModelingObject();
 }
 
 QtUml::ParameterDirectionKind QUmlParameterObject::direction() const
 {
-    return qmodelingobjectproperty_cast<QUmlParameter *>(this)->direction();
+    return qmodelingelementproperty_cast<QUmlParameter *>(this)->direction();
 }
 
 QtUml::ParameterEffectKind QUmlParameterObject::effect() const
 {
-    return qmodelingobjectproperty_cast<QUmlParameter *>(this)->effect();
+    return qmodelingelementproperty_cast<QUmlParameter *>(this)->effect();
 }
 
 bool QUmlParameterObject::isException() const
 {
-    return qmodelingobjectproperty_cast<QUmlParameter *>(this)->isException();
+    return qmodelingelementproperty_cast<QUmlParameter *>(this)->isException();
 }
 
 bool QUmlParameterObject::isStream() const
 {
-    return qmodelingobjectproperty_cast<QUmlParameter *>(this)->isStream();
+    return qmodelingelementproperty_cast<QUmlParameter *>(this)->isStream();
 }
 
 QObject *QUmlParameterObject::operation() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlParameter *>(this)->operation())
+    if (!qmodelingelementproperty_cast<QUmlParameter *>(this)->operation())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlParameter *>(this)->operation()->asQObject();
+        return qmodelingelementproperty_cast<QUmlParameter *>(this)->operation()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlParameterObject::parameterSets() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterSet *element, qmodelingobjectproperty_cast<QUmlParameter *>(this)->parameterSets())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterSet *element, qmodelingelementproperty_cast<QUmlParameter *>(this)->parameterSets())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -272,51 +275,51 @@ const QSet<QObject *> QUmlParameterObject::parameterSets() const
 QSet<QObject *> QUmlParameterObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlParameter *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlParameter *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlParameterObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlParameter *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlParameter *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [MultiplicityElement]
 
 bool QUmlParameterObject::compatibleWith(QObject *other) const
 {
-    return qmodelingobjectproperty_cast<QUmlParameter *>(this)->compatibleWith(qmodelingobjectproperty_cast<QUmlMultiplicityElement *>(other));
+    return qmodelingelementproperty_cast<QUmlParameter *>(this)->compatibleWith(qmodelingelementproperty_cast<QUmlMultiplicityElement *>(other));
 }
 
 bool QUmlParameterObject::includesCardinality(int C) const
 {
-    return qmodelingobjectproperty_cast<QUmlParameter *>(this)->includesCardinality(C);
+    return qmodelingelementproperty_cast<QUmlParameter *>(this)->includesCardinality(C);
 }
 
 bool QUmlParameterObject::includesMultiplicity(QObject *M) const
 {
-    return qmodelingobjectproperty_cast<QUmlParameter *>(this)->includesMultiplicity(qmodelingobjectproperty_cast<QUmlMultiplicityElement *>(M));
+    return qmodelingelementproperty_cast<QUmlParameter *>(this)->includesMultiplicity(qmodelingelementproperty_cast<QUmlMultiplicityElement *>(M));
 }
 
 bool QUmlParameterObject::is(int lowerbound, int upperbound) const
 {
-    return qmodelingobjectproperty_cast<QUmlParameter *>(this)->is(lowerbound, upperbound);
+    return qmodelingelementproperty_cast<QUmlParameter *>(this)->is(lowerbound, upperbound);
 }
 
 bool QUmlParameterObject::isMultivalued() const
 {
-    return qmodelingobjectproperty_cast<QUmlParameter *>(this)->isMultivalued();
+    return qmodelingelementproperty_cast<QUmlParameter *>(this)->isMultivalued();
 }
 
 int QUmlParameterObject::lowerBound() const
 {
-    return qmodelingobjectproperty_cast<QUmlParameter *>(this)->lowerBound();
+    return qmodelingelementproperty_cast<QUmlParameter *>(this)->lowerBound();
 }
 
 //int QUmlParameterObject::upperBound() const
 //{
-//    return qmodelingobjectproperty_cast<QUmlParameter *>(this)->upperBound();
+//    return qmodelingelementproperty_cast<QUmlParameter *>(this)->upperBound();
 //}
 
 // OPERATIONS [NamedElement]
@@ -324,247 +327,381 @@ int QUmlParameterObject::lowerBound() const
 QList<QObject *> QUmlParameterObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlParameter *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlParameter *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlParameterObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlParameter *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlParameter *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlParameterObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlParameter *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlParameter *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlParameterObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlParameter *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlParameter *>(this)->separator();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlParameterObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlParameter *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlParameter *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlParameterObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlParameter *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlParameter *>(this)->isTemplateParameter();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlParameterObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlParameter *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlParameterObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlParameter *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlParameterObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlParameter *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlParameterObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlParameter *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlParameterObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlParameter *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [MultiplicityElement]
 
 void QUmlParameterObject::setOrdered(bool isOrdered)
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->setOrdered(isOrdered);
+    qmodelingelementproperty_cast<QUmlParameter *>(this)->setOrdered(isOrdered);
 }
 
 void QUmlParameterObject::unsetOrdered()
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("ordered"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("ordered"));
 }
 
 void QUmlParameterObject::setUnique(bool isUnique)
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->setUnique(isUnique);
+    qmodelingelementproperty_cast<QUmlParameter *>(this)->setUnique(isUnique);
 }
 
 void QUmlParameterObject::unsetUnique()
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("unique"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("unique"));
 }
 
 void QUmlParameterObject::setLower(int lower)
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->setLower(lower);
+    qmodelingelementproperty_cast<QUmlParameter *>(this)->setLower(lower);
 }
 
 void QUmlParameterObject::unsetLower()
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("lower"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("lower"));
 }
 
 void QUmlParameterObject::setLowerValue(QObject *lowerValue)
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->setLowerValue(qmodelingobjectproperty_cast<QUmlValueSpecification *>(lowerValue));
+    qmodelingelementproperty_cast<QUmlParameter *>(this)->setLowerValue(qmodelingelementproperty_cast<QUmlValueSpecification *>(lowerValue));
 }
 
 void QUmlParameterObject::setUpper(int upper)
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->setUpper(upper);
+    qmodelingelementproperty_cast<QUmlParameter *>(this)->setUpper(upper);
 }
 
 void QUmlParameterObject::unsetUpper()
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("upper"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("upper"));
 }
 
 void QUmlParameterObject::setUpperValue(QObject *upperValue)
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->setUpperValue(qmodelingobjectproperty_cast<QUmlValueSpecification *>(upperValue));
+    qmodelingelementproperty_cast<QUmlParameter *>(this)->setUpperValue(qmodelingelementproperty_cast<QUmlValueSpecification *>(upperValue));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlParameterObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlParameter *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlParameterObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlParameter *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlParameterObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlParameter *>(this)->setName(name);
 }
 
 void QUmlParameterObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlParameter *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlParameterObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlParameter *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlParameterObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlParameter *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlParameterObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlParameter *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TypedElement]
 
 void QUmlParameterObject::setType(QObject *type)
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->setType(qmodelingobjectproperty_cast<QUmlType *>(type));
+    qmodelingelementproperty_cast<QUmlParameter *>(this)->setType(qmodelingelementproperty_cast<QUmlType *>(type));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlParameterObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlParameter *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 // SLOTS FOR OWNED ATTRIBUTES [ConnectableElement]
 
 void QUmlParameterObject::addEnd(QObject *end)
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->addEnd(qmodelingobjectproperty_cast<QUmlConnectorEnd *>(end));
+    qmodelingelementproperty_cast<QUmlParameter *>(this)->addEnd(qmodelingelementproperty_cast<QUmlConnectorEnd *>(end));
 }
 
 void QUmlParameterObject::removeEnd(QObject *end)
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->removeEnd(qmodelingobjectproperty_cast<QUmlConnectorEnd *>(end));
+    qmodelingelementproperty_cast<QUmlParameter *>(this)->removeEnd(qmodelingelementproperty_cast<QUmlConnectorEnd *>(end));
 }
 
 void QUmlParameterObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlConnectableElementTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlParameter *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlConnectableElementTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Parameter]
 
 void QUmlParameterObject::setDefault(QString default_)
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->setDefault(default_);
+    qmodelingelementproperty_cast<QUmlParameter *>(this)->setDefault(default_);
 }
 
 void QUmlParameterObject::setDefaultValue(QObject *defaultValue)
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->setDefaultValue(qmodelingobjectproperty_cast<QUmlValueSpecification *>(defaultValue));
+    qmodelingelementproperty_cast<QUmlParameter *>(this)->setDefaultValue(qmodelingelementproperty_cast<QUmlValueSpecification *>(defaultValue));
 }
 
 void QUmlParameterObject::setDirection(QtUml::ParameterDirectionKind direction)
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->setDirection(direction);
+    qmodelingelementproperty_cast<QUmlParameter *>(this)->setDirection(direction);
 }
 
 void QUmlParameterObject::unsetDirection()
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("direction"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("direction"));
 }
 
 void QUmlParameterObject::setEffect(QtUml::ParameterEffectKind effect)
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->setEffect(effect);
+    qmodelingelementproperty_cast<QUmlParameter *>(this)->setEffect(effect);
 }
 
 void QUmlParameterObject::setException(bool isException)
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->setException(isException);
+    qmodelingelementproperty_cast<QUmlParameter *>(this)->setException(isException);
 }
 
 void QUmlParameterObject::unsetException()
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("exception"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("exception"));
 }
 
 void QUmlParameterObject::setStream(bool isStream)
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->setStream(isStream);
+    qmodelingelementproperty_cast<QUmlParameter *>(this)->setStream(isStream);
 }
 
 void QUmlParameterObject::unsetStream()
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("stream"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("stream"));
 }
 
 void QUmlParameterObject::setOperation(QObject *operation)
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->setOperation(qmodelingobjectproperty_cast<QUmlOperation *>(operation));
+    qmodelingelementproperty_cast<QUmlParameter *>(this)->setOperation(qmodelingelementproperty_cast<QUmlOperation *>(operation));
 }
 
 void QUmlParameterObject::addParameterSet(QObject *parameterSet)
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->addParameterSet(qmodelingobjectproperty_cast<QUmlParameterSet *>(parameterSet));
+    qmodelingelementproperty_cast<QUmlParameter *>(this)->addParameterSet(qmodelingelementproperty_cast<QUmlParameterSet *>(parameterSet));
 }
 
 void QUmlParameterObject::removeParameterSet(QObject *parameterSet)
 {
-    qmodelingobjectproperty_cast<QUmlParameter *>(this)->removeParameterSet(qmodelingobjectproperty_cast<QUmlParameterSet *>(parameterSet));
+    qmodelingelementproperty_cast<QUmlParameter *>(this)->removeParameterSet(qmodelingelementproperty_cast<QUmlParameterSet *>(parameterSet));
+}
+
+
+void QUmlParameterObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlMultiplicityElement");
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isOrdered"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isUnique"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lower"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lowerValue"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upper"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperValue"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTypedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlConnectableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlConnectableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ends"))));
+    d->groupProperties.insert(QStringLiteral("QUmlConnectableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameter");
+    d->groupProperties.insert(QStringLiteral("QUmlParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("default_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("defaultValue"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("direction"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("effect"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isException"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isStream"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("operation"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parameterSets"))));
+}
+
+void QUmlParameterObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, default_, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, default_, PropertyClassRole, QStringLiteral("QUmlParameter"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, default_, IsDerivedRole, true);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, default_, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, default_, DocumentationRole, QStringLiteral("Specifies a String that represents a value to be used when no argument is supplied for the Parameter."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, default_, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, default_, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, default_, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, defaultValue, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, defaultValue, PropertyClassRole, QStringLiteral("QUmlParameter"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, defaultValue, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, defaultValue, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, defaultValue, DocumentationRole, QStringLiteral("Specifies a ValueSpecification that represents a value to be used when no argument is supplied for the Parameter."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, defaultValue, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, defaultValue, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, defaultValue, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, direction, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, direction, PropertyClassRole, QStringLiteral("QUmlParameter"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, direction, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, direction, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, direction, DocumentationRole, QStringLiteral("Indicates whether a parameter is being sent into or out of a behavioral element."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, direction, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, direction, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, direction, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, effect, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, effect, PropertyClassRole, QStringLiteral("QUmlParameter"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, effect, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, effect, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, effect, DocumentationRole, QStringLiteral("Specifies the effect that the owner of the parameter has on values passed in or out of the parameter."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, effect, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, effect, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, effect, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, isException, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, isException, PropertyClassRole, QStringLiteral("QUmlParameter"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, isException, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, isException, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, isException, DocumentationRole, QStringLiteral("Tells whether an output parameter may emit a value to the exclusion of the other outputs."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, isException, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, isException, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, isException, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, isStream, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, isStream, PropertyClassRole, QStringLiteral("QUmlParameter"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, isStream, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, isStream, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, isStream, DocumentationRole, QStringLiteral("Tells whether an input parameter may accept values while its behavior is executing, or whether an output parameter post values while the behavior is executing."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, isStream, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, isStream, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, isStream, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, operation, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, operation, PropertyClassRole, QStringLiteral("QUmlParameter"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, operation, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, operation, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, operation, DocumentationRole, QStringLiteral("References the Operation owning this parameter."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, operation, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, operation, SubsettedPropertiesRole, QStringLiteral("A_ownedParameter_ownerFormalParam-ownerFormalParam"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, operation, OppositeEndRole, QStringLiteral("Operation-ownedParameter"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, parameterSets, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, parameterSets, PropertyClassRole, QStringLiteral("QUmlParameter"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, parameterSets, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, parameterSets, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, parameterSets, DocumentationRole, QStringLiteral("The parameter sets containing the parameter. See ParameterSet."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, parameterSets, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, parameterSets, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameter, parameterSets, OppositeEndRole, QStringLiteral("ParameterSet-parameter"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlparameterobject_p.h b/src/uml/qobjects/qumlparameterobject_p.h
index 25bcc1e5..8ffa7bf8 100644
--- a/src/uml/qobjects/qumlparameterobject_p.h
+++ b/src/uml/qobjects/qumlparameterobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlParameter;
-class Q_UML_EXPORT QUmlParameterObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlParameterObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlParameterObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -100,7 +103,7 @@ class Q_UML_EXPORT QUmlParameterObject : public QObject
     Q_PROPERTY(QSet<QObject *> parameterSets READ parameterSets)
 
 public:
-    Q_INVOKABLE explicit QUmlParameterObject(QUmlParameter *qModelingObject);
+    Q_INVOKABLE explicit QUmlParameterObject(QUmlParameter *qModelingElement);
     virtual ~QUmlParameterObject();
 
     // Owned attributes [Element]
@@ -221,6 +224,10 @@ public Q_SLOTS:
     void setOperation(QObject *operation = 0);
     void addParameterSet(QObject *parameterSet);
     void removeParameterSet(QObject *parameterSet);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlparametersetobject.cpp b/src/uml/qobjects/qumlparametersetobject.cpp
index 7e9903c1..8a7d913b 100644
--- a/src/uml/qobjects/qumlparametersetobject.cpp
+++ b/src/uml/qobjects/qumlparametersetobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlparametersetobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlParameterSet>
 #include <QtUml/QUmlComment>
@@ -53,16 +54,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlParameterSetObject::QUmlParameterSetObject(QUmlParameterSet *qModelingObject)
+QUmlParameterSetObject::QUmlParameterSetObject(QUmlParameterSet *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlParameterSetObject::~QUmlParameterSetObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlParameterSet *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlParameterSet *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -71,25 +74,25 @@ QUmlParameterSetObject::~QUmlParameterSetObject()
 const QSet<QObject *> QUmlParameterSetObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlParameterSet *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlParameterSet *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlParameterSetObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlParameterSet *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlParameterSet *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlParameterSetObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlParameterSet *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlParameterSet *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlParameterSet *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlParameterSet *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -97,40 +100,40 @@ QObject *QUmlParameterSetObject::owner() const
 const QSet<QObject *> QUmlParameterSetObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlParameterSet *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlParameterSet *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlParameterSetObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlParameterSet *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlParameterSet *>(this)->name();
 }
 
 QObject *QUmlParameterSetObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlParameterSet *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlParameterSet *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlParameterSet *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlParameterSet *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlParameterSetObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlParameterSet *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlParameterSet *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlParameterSet *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlParameterSet *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlParameterSetObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlParameterSet *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlParameterSet *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlParameterSetObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlParameterSet *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlParameterSet *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [ParameterSet]
@@ -138,16 +141,16 @@ QtUml::VisibilityKind QUmlParameterSetObject::visibility() const
 const QSet<QObject *> QUmlParameterSetObject::conditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlParameterSet *>(this)->conditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlParameterSet *>(this)->conditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlParameterSetObject::parameters() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameter *element, qmodelingobjectproperty_cast<QUmlParameterSet *>(this)->parameters())
-        set.insert(element->asQObject());
+    foreach (QUmlParameter *element, qmodelingelementproperty_cast<QUmlParameterSet *>(this)->parameters())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -156,14 +159,14 @@ const QSet<QObject *> QUmlParameterSetObject::parameters() const
 QSet<QObject *> QUmlParameterSetObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlParameterSet *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlParameterSet *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlParameterSetObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlParameterSet *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlParameterSet *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -171,113 +174,162 @@ bool QUmlParameterSetObject::mustBeOwned() const
 QList<QObject *> QUmlParameterSetObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlParameterSet *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlParameterSet *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlParameterSetObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlParameterSet *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlParameterSet *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlParameterSetObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlParameterSet *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlParameterSet *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlParameterSetObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlParameterSet *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlParameterSet *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlParameterSetObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlParameterSet *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlParameterSet *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlParameterSetObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlParameterSet *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlParameterSet *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlParameterSetObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlParameterSet *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlParameterSet *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlParameterSetObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlParameterSet *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlParameterSet *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlParameterSetObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlParameterSet *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlParameterSet *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlParameterSetObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlParameterSet *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlParameterSet *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlParameterSetObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlParameterSet *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlParameterSet *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlParameterSetObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlParameterSet *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlParameterSet *>(this)->setName(name);
 }
 
 void QUmlParameterSetObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlParameterSet *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlParameterSet *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlParameterSetObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlParameterSet *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlParameterSet *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlParameterSetObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlParameterSet *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlParameterSet *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlParameterSetObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlParameterSet *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlParameterSet *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterSet]
 
 void QUmlParameterSetObject::addCondition(QObject *condition)
 {
-    qmodelingobjectproperty_cast<QUmlParameterSet *>(this)->addCondition(qmodelingobjectproperty_cast<QUmlConstraint *>(condition));
+    qmodelingelementproperty_cast<QUmlParameterSet *>(this)->addCondition(qmodelingelementproperty_cast<QUmlConstraint *>(condition));
 }
 
 void QUmlParameterSetObject::removeCondition(QObject *condition)
 {
-    qmodelingobjectproperty_cast<QUmlParameterSet *>(this)->removeCondition(qmodelingobjectproperty_cast<QUmlConstraint *>(condition));
+    qmodelingelementproperty_cast<QUmlParameterSet *>(this)->removeCondition(qmodelingelementproperty_cast<QUmlConstraint *>(condition));
 }
 
 void QUmlParameterSetObject::addParameter(QObject *parameter)
 {
-    qmodelingobjectproperty_cast<QUmlParameterSet *>(this)->addParameter(qmodelingobjectproperty_cast<QUmlParameter *>(parameter));
+    qmodelingelementproperty_cast<QUmlParameterSet *>(this)->addParameter(qmodelingelementproperty_cast<QUmlParameter *>(parameter));
 }
 
 void QUmlParameterSetObject::removeParameter(QObject *parameter)
 {
-    qmodelingobjectproperty_cast<QUmlParameterSet *>(this)->removeParameter(qmodelingobjectproperty_cast<QUmlParameter *>(parameter));
+    qmodelingelementproperty_cast<QUmlParameterSet *>(this)->removeParameter(qmodelingelementproperty_cast<QUmlParameter *>(parameter));
+}
+
+
+void QUmlParameterSetObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterSet");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterSet"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("conditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterSet"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parameters"))));
+}
+
+void QUmlParameterSetObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameterSet, conditions, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameterSet, conditions, PropertyClassRole, QStringLiteral("QUmlParameterSet"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameterSet, conditions, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameterSet, conditions, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameterSet, conditions, DocumentationRole, QStringLiteral("Constraint that should be satisfied for the owner of the parameters in an input parameter set to start execution using the values provided for those parameters, or the owner of the parameters in an output parameter set to end execution providing the values for those parameters, if all preconditions and conditions on input parameter sets were satisfied."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameterSet, conditions, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameterSet, conditions, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameterSet, conditions, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameterSet, parameters, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameterSet, parameters, PropertyClassRole, QStringLiteral("QUmlParameterSet"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameterSet, parameters, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameterSet, parameters, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameterSet, parameters, DocumentationRole, QStringLiteral("Parameters in the parameter set."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameterSet, parameters, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameterSet, parameters, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlParameterSet, parameters, OppositeEndRole, QStringLiteral("Parameter-parameterSet"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlparametersetobject_p.h b/src/uml/qobjects/qumlparametersetobject_p.h
index 42a913ae..ba0df7bb 100644
--- a/src/uml/qobjects/qumlparametersetobject_p.h
+++ b/src/uml/qobjects/qumlparametersetobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlParameterSet;
-class Q_UML_EXPORT QUmlParameterSetObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlParameterSetObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlParameterSetObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -76,7 +79,7 @@ class Q_UML_EXPORT QUmlParameterSetObject : public QObject
     Q_PROPERTY(QSet<QObject *> parameters READ parameters)
 
 public:
-    Q_INVOKABLE explicit QUmlParameterSetObject(QUmlParameterSet *qModelingObject);
+    Q_INVOKABLE explicit QUmlParameterSetObject(QUmlParameterSet *qModelingElement);
     virtual ~QUmlParameterSetObject();
 
     // Owned attributes [Element]
@@ -129,6 +132,10 @@ public Q_SLOTS:
     void removeCondition(QObject *condition);
     void addParameter(QObject *parameter);
     void removeParameter(QObject *parameter);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlpartdecompositionobject.cpp b/src/uml/qobjects/qumlpartdecompositionobject.cpp
index 50aa1774..14c2c258 100644
--- a/src/uml/qobjects/qumlpartdecompositionobject.cpp
+++ b/src/uml/qobjects/qumlpartdecompositionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlpartdecompositionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlPartDecomposition>
 #include <QtUml/QUmlComment>
@@ -58,16 +59,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlPartDecompositionObject::QUmlPartDecompositionObject(QUmlPartDecomposition *qModelingObject)
+QUmlPartDecompositionObject::QUmlPartDecompositionObject(QUmlPartDecomposition *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlPartDecompositionObject::~QUmlPartDecompositionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -76,25 +79,25 @@ QUmlPartDecompositionObject::~QUmlPartDecompositionObject()
 const QSet<QObject *> QUmlPartDecompositionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPartDecompositionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlPartDecompositionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -102,40 +105,40 @@ QObject *QUmlPartDecompositionObject::owner() const
 const QSet<QObject *> QUmlPartDecompositionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlPartDecompositionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->name();
 }
 
 QObject *QUmlPartDecompositionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlPartDecompositionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlPartDecompositionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlPartDecompositionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [InteractionFragment]
@@ -143,32 +146,32 @@ QtUml::VisibilityKind QUmlPartDecompositionObject::visibility() const
 const QSet<QObject *> QUmlPartDecompositionObject::covered() const
 {
     QSet<QObject *> set;
-    foreach (QUmlLifeline *element, qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->covered())
-        set.insert(element->asQObject());
+    foreach (QUmlLifeline *element, qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->covered())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlPartDecompositionObject::enclosingInteraction() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->enclosingInteraction())
+    if (!qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->enclosingInteraction())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->enclosingInteraction()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->enclosingInteraction()->asQModelingObject();
 }
 
 QObject *QUmlPartDecompositionObject::enclosingOperand() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->enclosingOperand())
+    if (!qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->enclosingOperand())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->enclosingOperand()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->enclosingOperand()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlPartDecompositionObject::generalOrderings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralOrdering *element, qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->generalOrderings())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralOrdering *element, qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->generalOrderings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -177,41 +180,41 @@ const QSet<QObject *> QUmlPartDecompositionObject::generalOrderings() const
 const QSet<QObject *> QUmlPartDecompositionObject::actualGates() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGate *element, qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->actualGates())
-        set.insert(element->asQObject());
+    foreach (QUmlGate *element, qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->actualGates())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlPartDecompositionObject::arguments() const
 {
     QList<QObject *> list;
-    foreach (QUmlValueSpecification *element, qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->arguments())
-        list.append(element->asQObject());
+    foreach (QUmlValueSpecification *element, qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->arguments())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 QObject *QUmlPartDecompositionObject::refersTo() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->refersTo())
+    if (!qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->refersTo())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->refersTo()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->refersTo()->asQModelingObject();
 }
 
 QObject *QUmlPartDecompositionObject::returnValue() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->returnValue())
+    if (!qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->returnValue())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->returnValue()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->returnValue()->asQModelingObject();
 }
 
 QObject *QUmlPartDecompositionObject::returnValueRecipient() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->returnValueRecipient())
+    if (!qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->returnValueRecipient())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->returnValueRecipient()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->returnValueRecipient()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -219,14 +222,14 @@ QObject *QUmlPartDecompositionObject::returnValueRecipient() const
 QSet<QObject *> QUmlPartDecompositionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlPartDecompositionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -234,160 +237,202 @@ bool QUmlPartDecompositionObject::mustBeOwned() const
 QList<QObject *> QUmlPartDecompositionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlPartDecompositionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlPartDecompositionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlPartDecompositionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlPartDecompositionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlPartDecompositionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlPartDecompositionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlPartDecompositionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlPartDecompositionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlPartDecompositionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlPartDecompositionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlPartDecompositionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->setName(name);
 }
 
 void QUmlPartDecompositionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlPartDecompositionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlPartDecompositionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlPartDecompositionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [InteractionFragment]
 
 void QUmlPartDecompositionObject::addCovered(QObject *covered)
 {
-    qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->addCovered(qmodelingobjectproperty_cast<QUmlLifeline *>(covered));
+    qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->addCovered(qmodelingelementproperty_cast<QUmlLifeline *>(covered));
 }
 
 void QUmlPartDecompositionObject::removeCovered(QObject *covered)
 {
-    qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->removeCovered(qmodelingobjectproperty_cast<QUmlLifeline *>(covered));
+    qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->removeCovered(qmodelingelementproperty_cast<QUmlLifeline *>(covered));
 }
 
 void QUmlPartDecompositionObject::setEnclosingInteraction(QObject *enclosingInteraction)
 {
-    qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->setEnclosingInteraction(qmodelingobjectproperty_cast<QUmlInteraction *>(enclosingInteraction));
+    qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->setEnclosingInteraction(qmodelingelementproperty_cast<QUmlInteraction *>(enclosingInteraction));
 }
 
 void QUmlPartDecompositionObject::setEnclosingOperand(QObject *enclosingOperand)
 {
-    qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->setEnclosingOperand(qmodelingobjectproperty_cast<QUmlInteractionOperand *>(enclosingOperand));
+    qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->setEnclosingOperand(qmodelingelementproperty_cast<QUmlInteractionOperand *>(enclosingOperand));
 }
 
 void QUmlPartDecompositionObject::addGeneralOrdering(QObject *generalOrdering)
 {
-    qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->addGeneralOrdering(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
+    qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->addGeneralOrdering(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
 }
 
 void QUmlPartDecompositionObject::removeGeneralOrdering(QObject *generalOrdering)
 {
-    qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->removeGeneralOrdering(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
+    qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->removeGeneralOrdering(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [InteractionUse]
 
 void QUmlPartDecompositionObject::addActualGate(QObject *actualGate)
 {
-    qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->addActualGate(qmodelingobjectproperty_cast<QUmlGate *>(actualGate));
+    qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->addActualGate(qmodelingelementproperty_cast<QUmlGate *>(actualGate));
 }
 
 void QUmlPartDecompositionObject::removeActualGate(QObject *actualGate)
 {
-    qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->removeActualGate(qmodelingobjectproperty_cast<QUmlGate *>(actualGate));
+    qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->removeActualGate(qmodelingelementproperty_cast<QUmlGate *>(actualGate));
 }
 
 void QUmlPartDecompositionObject::addArgument(QObject *argument)
 {
-    qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->addArgument(qmodelingobjectproperty_cast<QUmlValueSpecification *>(argument));
+    qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->addArgument(qmodelingelementproperty_cast<QUmlValueSpecification *>(argument));
 }
 
 void QUmlPartDecompositionObject::removeArgument(QObject *argument)
 {
-    qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->removeArgument(qmodelingobjectproperty_cast<QUmlValueSpecification *>(argument));
+    qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->removeArgument(qmodelingelementproperty_cast<QUmlValueSpecification *>(argument));
 }
 
 void QUmlPartDecompositionObject::setRefersTo(QObject *refersTo)
 {
-    qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->setRefersTo(qmodelingobjectproperty_cast<QUmlInteraction *>(refersTo));
+    qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->setRefersTo(qmodelingelementproperty_cast<QUmlInteraction *>(refersTo));
 }
 
 void QUmlPartDecompositionObject::setReturnValue(QObject *returnValue)
 {
-    qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->setReturnValue(qmodelingobjectproperty_cast<QUmlValueSpecification *>(returnValue));
+    qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->setReturnValue(qmodelingelementproperty_cast<QUmlValueSpecification *>(returnValue));
 }
 
 void QUmlPartDecompositionObject::setReturnValueRecipient(QObject *returnValueRecipient)
 {
-    qmodelingobjectproperty_cast<QUmlPartDecomposition *>(this)->setReturnValueRecipient(qmodelingobjectproperty_cast<QUmlProperty *>(returnValueRecipient));
+    qmodelingelementproperty_cast<QUmlPartDecomposition *>(this)->setReturnValueRecipient(qmodelingelementproperty_cast<QUmlProperty *>(returnValueRecipient));
+}
+
+
+void QUmlPartDecompositionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlInteractionFragment");
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("covered"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingInteraction"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingOperand"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalOrderings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlInteractionUse");
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionUse"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("actualGates"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionUse"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("arguments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionUse"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("refersTo"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionUse"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("returnValue"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionUse"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("returnValueRecipient"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPartDecomposition");
+}
+
+void QUmlPartDecompositionObject::setPropertyData()
+{
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlpartdecompositionobject_p.h b/src/uml/qobjects/qumlpartdecompositionobject_p.h
index bb409d52..88aeef1d 100644
--- a/src/uml/qobjects/qumlpartdecompositionobject_p.h
+++ b/src/uml/qobjects/qumlpartdecompositionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlPartDecomposition;
-class Q_UML_EXPORT QUmlPartDecompositionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlPartDecompositionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlPartDecompositionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -85,7 +88,7 @@ class Q_UML_EXPORT QUmlPartDecompositionObject : public QObject
     Q_PROPERTY(QObject * returnValueRecipient READ returnValueRecipient WRITE setReturnValueRecipient)
 
 public:
-    Q_INVOKABLE explicit QUmlPartDecompositionObject(QUmlPartDecomposition *qModelingObject);
+    Q_INVOKABLE explicit QUmlPartDecompositionObject(QUmlPartDecomposition *qModelingElement);
     virtual ~QUmlPartDecompositionObject();
 
     // Owned attributes [Element]
@@ -158,6 +161,10 @@ public Q_SLOTS:
     void setRefersTo(QObject *refersTo = 0);
     void setReturnValue(QObject *returnValue = 0);
     void setReturnValueRecipient(QObject *returnValueRecipient = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlportobject.cpp b/src/uml/qobjects/qumlportobject.cpp
index 565936ff..48cde33d 100644
--- a/src/uml/qobjects/qumlportobject.cpp
+++ b/src/uml/qobjects/qumlportobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlportobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlPort>
 #include <QtUml/QUmlAssociation>
@@ -68,16 +69,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlPortObject::QUmlPortObject(QUmlPort *qModelingObject)
+QUmlPortObject::QUmlPortObject(QUmlPort *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlPortObject::~QUmlPortObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlPort *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlPort *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -86,25 +89,25 @@ QUmlPortObject::~QUmlPortObject()
 const QSet<QObject *> QUmlPortObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlPort *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlPort *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPortObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlPort *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlPort *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlPortObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPort *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlPort *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPort *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPort *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -112,110 +115,110 @@ QObject *QUmlPortObject::owner() const
 const QSet<QObject *> QUmlPortObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlPort *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlPort *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlPortObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlPort *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlPort *>(this)->name();
 }
 
 QObject *QUmlPortObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPort *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlPort *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPort *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPort *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlPortObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPort *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlPort *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPort *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPort *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlPortObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlPort *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlPort *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlPortObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlPort *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlPort *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [TypedElement]
 
 QObject *QUmlPortObject::type() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPort *>(this)->type())
+    if (!qmodelingelementproperty_cast<QUmlPort *>(this)->type())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPort *>(this)->type()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPort *>(this)->type()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [MultiplicityElement]
 
 bool QUmlPortObject::isOrdered() const
 {
-    return qmodelingobjectproperty_cast<QUmlPort *>(this)->isOrdered();
+    return qmodelingelementproperty_cast<QUmlPort *>(this)->isOrdered();
 }
 
 bool QUmlPortObject::isUnique() const
 {
-    return qmodelingobjectproperty_cast<QUmlPort *>(this)->isUnique();
+    return qmodelingelementproperty_cast<QUmlPort *>(this)->isUnique();
 }
 
 int QUmlPortObject::lower() const
 {
-    return qmodelingobjectproperty_cast<QUmlPort *>(this)->lower();
+    return qmodelingelementproperty_cast<QUmlPort *>(this)->lower();
 }
 
 QObject *QUmlPortObject::lowerValue() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPort *>(this)->lowerValue())
+    if (!qmodelingelementproperty_cast<QUmlPort *>(this)->lowerValue())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPort *>(this)->lowerValue()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPort *>(this)->lowerValue()->asQModelingObject();
 }
 
 int QUmlPortObject::upper() const
 {
-    return qmodelingobjectproperty_cast<QUmlPort *>(this)->upper();
+    return qmodelingelementproperty_cast<QUmlPort *>(this)->upper();
 }
 
 QObject *QUmlPortObject::upperValue() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPort *>(this)->upperValue())
+    if (!qmodelingelementproperty_cast<QUmlPort *>(this)->upperValue())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPort *>(this)->upperValue()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPort *>(this)->upperValue()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlPortObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlPort *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlPort *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlPortObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlPort *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlPort *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPortObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlPort *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlPort *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -224,24 +227,24 @@ const QSet<QObject *> QUmlPortObject::redefinitionContexts() const
 const QSet<QObject *> QUmlPortObject::featuringClassifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlPort *>(this)->featuringClassifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlPort *>(this)->featuringClassifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlPortObject::isStatic() const
 {
-    return qmodelingobjectproperty_cast<QUmlPort *>(this)->isStatic();
+    return qmodelingelementproperty_cast<QUmlPort *>(this)->isStatic();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlPortObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPort *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlPort *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPort *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPort *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ConnectableElement]
@@ -249,17 +252,17 @@ QObject *QUmlPortObject::owningTemplateParameter() const
 const QList<QObject *> QUmlPortObject::ends() const
 {
     QList<QObject *> list;
-    foreach (QUmlConnectorEnd *element, qmodelingobjectproperty_cast<QUmlPort *>(this)->ends())
-        list.append(element->asQObject());
+    foreach (QUmlConnectorEnd *element, qmodelingelementproperty_cast<QUmlPort *>(this)->ends())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 QObject *QUmlPortObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPort *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlPort *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPort *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPort *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [DeploymentTarget]
@@ -267,16 +270,16 @@ QObject *QUmlPortObject::templateParameter() const
 const QSet<QObject *> QUmlPortObject::deployedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlPort *>(this)->deployedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlPort *>(this)->deployedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPortObject::deployments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDeployment *element, qmodelingobjectproperty_cast<QUmlPort *>(this)->deployments())
-        set.insert(element->asQObject());
+    foreach (QUmlDeployment *element, qmodelingelementproperty_cast<QUmlPort *>(this)->deployments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -284,124 +287,124 @@ const QSet<QObject *> QUmlPortObject::deployments() const
 
 QtUml::AggregationKind QUmlPortObject::aggregation() const
 {
-    return qmodelingobjectproperty_cast<QUmlPort *>(this)->aggregation();
+    return qmodelingelementproperty_cast<QUmlPort *>(this)->aggregation();
 }
 
 QObject *QUmlPortObject::association() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPort *>(this)->association())
+    if (!qmodelingelementproperty_cast<QUmlPort *>(this)->association())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPort *>(this)->association()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPort *>(this)->association()->asQModelingObject();
 }
 
 QObject *QUmlPortObject::associationEnd() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPort *>(this)->associationEnd())
+    if (!qmodelingelementproperty_cast<QUmlPort *>(this)->associationEnd())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPort *>(this)->associationEnd()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPort *>(this)->associationEnd()->asQModelingObject();
 }
 
 QObject *QUmlPortObject::class_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPort *>(this)->class_())
+    if (!qmodelingelementproperty_cast<QUmlPort *>(this)->class_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPort *>(this)->class_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPort *>(this)->class_()->asQModelingObject();
 }
 
 QObject *QUmlPortObject::datatype() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPort *>(this)->datatype())
+    if (!qmodelingelementproperty_cast<QUmlPort *>(this)->datatype())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPort *>(this)->datatype()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPort *>(this)->datatype()->asQModelingObject();
 }
 
 QString QUmlPortObject::default_() const
 {
-    return qmodelingobjectproperty_cast<QUmlPort *>(this)->default_();
+    return qmodelingelementproperty_cast<QUmlPort *>(this)->default_();
 }
 
 QObject *QUmlPortObject::defaultValue() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPort *>(this)->defaultValue())
+    if (!qmodelingelementproperty_cast<QUmlPort *>(this)->defaultValue())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPort *>(this)->defaultValue()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPort *>(this)->defaultValue()->asQModelingObject();
 }
 
 QObject *QUmlPortObject::interface_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPort *>(this)->interface_())
+    if (!qmodelingelementproperty_cast<QUmlPort *>(this)->interface_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPort *>(this)->interface_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPort *>(this)->interface_()->asQModelingObject();
 }
 
 bool QUmlPortObject::isComposite() const
 {
-    return qmodelingobjectproperty_cast<QUmlPort *>(this)->isComposite();
+    return qmodelingelementproperty_cast<QUmlPort *>(this)->isComposite();
 }
 
 bool QUmlPortObject::isDerived() const
 {
-    return qmodelingobjectproperty_cast<QUmlPort *>(this)->isDerived();
+    return qmodelingelementproperty_cast<QUmlPort *>(this)->isDerived();
 }
 
 bool QUmlPortObject::isDerivedUnion() const
 {
-    return qmodelingobjectproperty_cast<QUmlPort *>(this)->isDerivedUnion();
+    return qmodelingelementproperty_cast<QUmlPort *>(this)->isDerivedUnion();
 }
 
 bool QUmlPortObject::isID() const
 {
-    return qmodelingobjectproperty_cast<QUmlPort *>(this)->isID();
+    return qmodelingelementproperty_cast<QUmlPort *>(this)->isID();
 }
 
 bool QUmlPortObject::isReadOnly() const
 {
-    return qmodelingobjectproperty_cast<QUmlPort *>(this)->isReadOnly();
+    return qmodelingelementproperty_cast<QUmlPort *>(this)->isReadOnly();
 }
 
 QObject *QUmlPortObject::opposite() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPort *>(this)->opposite())
+    if (!qmodelingelementproperty_cast<QUmlPort *>(this)->opposite())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPort *>(this)->opposite()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPort *>(this)->opposite()->asQModelingObject();
 }
 
 QObject *QUmlPortObject::owningAssociation() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPort *>(this)->owningAssociation())
+    if (!qmodelingelementproperty_cast<QUmlPort *>(this)->owningAssociation())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPort *>(this)->owningAssociation()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPort *>(this)->owningAssociation()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlPortObject::qualifiers() const
 {
     QList<QObject *> list;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlPort *>(this)->qualifiers())
-        list.append(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlPort *>(this)->qualifiers())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QSet<QObject *> QUmlPortObject::redefinedProperties() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlPort *>(this)->redefinedProperties())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlPort *>(this)->redefinedProperties())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPortObject::subsettedProperties() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlPort *>(this)->subsettedProperties())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlPort *>(this)->subsettedProperties())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -409,48 +412,48 @@ const QSet<QObject *> QUmlPortObject::subsettedProperties() const
 
 bool QUmlPortObject::isBehavior() const
 {
-    return qmodelingobjectproperty_cast<QUmlPort *>(this)->isBehavior();
+    return qmodelingelementproperty_cast<QUmlPort *>(this)->isBehavior();
 }
 
 bool QUmlPortObject::isConjugated() const
 {
-    return qmodelingobjectproperty_cast<QUmlPort *>(this)->isConjugated();
+    return qmodelingelementproperty_cast<QUmlPort *>(this)->isConjugated();
 }
 
 bool QUmlPortObject::isService() const
 {
-    return qmodelingobjectproperty_cast<QUmlPort *>(this)->isService();
+    return qmodelingelementproperty_cast<QUmlPort *>(this)->isService();
 }
 
 QObject *QUmlPortObject::protocol() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPort *>(this)->protocol())
+    if (!qmodelingelementproperty_cast<QUmlPort *>(this)->protocol())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPort *>(this)->protocol()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPort *>(this)->protocol()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlPortObject::provided() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterface *element, qmodelingobjectproperty_cast<QUmlPort *>(this)->provided())
-        set.insert(element->asQObject());
+    foreach (QUmlInterface *element, qmodelingelementproperty_cast<QUmlPort *>(this)->provided())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPortObject::redefinedPorts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPort *element, qmodelingobjectproperty_cast<QUmlPort *>(this)->redefinedPorts())
-        set.insert(element->asQObject());
+    foreach (QUmlPort *element, qmodelingelementproperty_cast<QUmlPort *>(this)->redefinedPorts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPortObject::required() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterface *element, qmodelingobjectproperty_cast<QUmlPort *>(this)->required())
-        set.insert(element->asQObject());
+    foreach (QUmlInterface *element, qmodelingelementproperty_cast<QUmlPort *>(this)->required())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -459,14 +462,14 @@ const QSet<QObject *> QUmlPortObject::required() const
 QSet<QObject *> QUmlPortObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlPort *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlPort *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlPortObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlPort *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlPort *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -474,107 +477,107 @@ bool QUmlPortObject::mustBeOwned() const
 QList<QObject *> QUmlPortObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlPort *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlPort *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlPortObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlPort *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlPort *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlPortObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlPort *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlPort *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlPortObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlPort *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlPort *>(this)->separator();
 }
 
 // OPERATIONS [MultiplicityElement]
 
 bool QUmlPortObject::compatibleWith(QObject *other) const
 {
-    return qmodelingobjectproperty_cast<QUmlPort *>(this)->compatibleWith(qmodelingobjectproperty_cast<QUmlMultiplicityElement *>(other));
+    return qmodelingelementproperty_cast<QUmlPort *>(this)->compatibleWith(qmodelingelementproperty_cast<QUmlMultiplicityElement *>(other));
 }
 
 bool QUmlPortObject::includesCardinality(int C) const
 {
-    return qmodelingobjectproperty_cast<QUmlPort *>(this)->includesCardinality(C);
+    return qmodelingelementproperty_cast<QUmlPort *>(this)->includesCardinality(C);
 }
 
 bool QUmlPortObject::includesMultiplicity(QObject *M) const
 {
-    return qmodelingobjectproperty_cast<QUmlPort *>(this)->includesMultiplicity(qmodelingobjectproperty_cast<QUmlMultiplicityElement *>(M));
+    return qmodelingelementproperty_cast<QUmlPort *>(this)->includesMultiplicity(qmodelingelementproperty_cast<QUmlMultiplicityElement *>(M));
 }
 
 bool QUmlPortObject::is(int lowerbound, int upperbound) const
 {
-    return qmodelingobjectproperty_cast<QUmlPort *>(this)->is(lowerbound, upperbound);
+    return qmodelingelementproperty_cast<QUmlPort *>(this)->is(lowerbound, upperbound);
 }
 
 bool QUmlPortObject::isMultivalued() const
 {
-    return qmodelingobjectproperty_cast<QUmlPort *>(this)->isMultivalued();
+    return qmodelingelementproperty_cast<QUmlPort *>(this)->isMultivalued();
 }
 
 int QUmlPortObject::lowerBound() const
 {
-    return qmodelingobjectproperty_cast<QUmlPort *>(this)->lowerBound();
+    return qmodelingelementproperty_cast<QUmlPort *>(this)->lowerBound();
 }
 
 //int QUmlPortObject::upperBound() const
 //{
-//    return qmodelingobjectproperty_cast<QUmlPort *>(this)->upperBound();
+//    return qmodelingelementproperty_cast<QUmlPort *>(this)->upperBound();
 //}
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlPortObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlPort *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlPort *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlPortObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlPort *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlPort *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [Property]
 
 bool QUmlPortObject::isAttribute(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlPort *>(this)->isAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(p));
+    return qmodelingelementproperty_cast<QUmlPort *>(this)->isAttribute(qmodelingelementproperty_cast<QUmlProperty *>(p));
 }
 
 bool QUmlPortObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlPort *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlPort *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlPortObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlPort *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlPort *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlPortObject::isNavigable() const
 {
-    return qmodelingobjectproperty_cast<QUmlPort *>(this)->isNavigable();
+    return qmodelingelementproperty_cast<QUmlPort *>(this)->isNavigable();
 }
 
 QSet<QObject *> QUmlPortObject::subsettingContext() const
 {
     QSet<QObject *> set;
-    foreach (QUmlType *element, qmodelingobjectproperty_cast<QUmlPort *>(this)->subsettingContext())
-        set.insert(element->asQObject());
+    foreach (QUmlType *element, qmodelingelementproperty_cast<QUmlPort *>(this)->subsettingContext())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -582,426 +585,593 @@ QSet<QObject *> QUmlPortObject::subsettingContext() const
 
 void QUmlPortObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlPortObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlPortObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlPortObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlPortObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlPortObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlPortObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlPortObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlPort *>(this)->setName(name);
 }
 
 void QUmlPortObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlPortObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlPortObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlPort *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlPortObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlPort *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TypedElement]
 
 void QUmlPortObject::setType(QObject *type)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->setType(qmodelingobjectproperty_cast<QUmlType *>(type));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->setType(qmodelingelementproperty_cast<QUmlType *>(type));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [MultiplicityElement]
 
 void QUmlPortObject::setOrdered(bool isOrdered)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->setOrdered(isOrdered);
+    qmodelingelementproperty_cast<QUmlPort *>(this)->setOrdered(isOrdered);
 }
 
 void QUmlPortObject::unsetOrdered()
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("ordered"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("ordered"));
 }
 
 void QUmlPortObject::setUnique(bool isUnique)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->setUnique(isUnique);
+    qmodelingelementproperty_cast<QUmlPort *>(this)->setUnique(isUnique);
 }
 
 void QUmlPortObject::unsetUnique()
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("unique"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("unique"));
 }
 
 void QUmlPortObject::setLower(int lower)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->setLower(lower);
+    qmodelingelementproperty_cast<QUmlPort *>(this)->setLower(lower);
 }
 
 void QUmlPortObject::unsetLower()
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("lower"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("lower"));
 }
 
 void QUmlPortObject::setLowerValue(QObject *lowerValue)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->setLowerValue(qmodelingobjectproperty_cast<QUmlValueSpecification *>(lowerValue));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->setLowerValue(qmodelingelementproperty_cast<QUmlValueSpecification *>(lowerValue));
 }
 
 void QUmlPortObject::setUpper(int upper)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->setUpper(upper);
+    qmodelingelementproperty_cast<QUmlPort *>(this)->setUpper(upper);
 }
 
 void QUmlPortObject::unsetUpper()
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("upper"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("upper"));
 }
 
 void QUmlPortObject::setUpperValue(QObject *upperValue)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->setUpperValue(qmodelingobjectproperty_cast<QUmlValueSpecification *>(upperValue));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->setUpperValue(qmodelingelementproperty_cast<QUmlValueSpecification *>(upperValue));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlPortObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlPort *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlPortObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlPortObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlPortObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlPortObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlPortObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Feature]
 
 void QUmlPortObject::addFeaturingClassifier(QObject *featuringClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->addFeaturingClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(featuringClassifier));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->addFeaturingClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(featuringClassifier));
 }
 
 void QUmlPortObject::removeFeaturingClassifier(QObject *featuringClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->removeFeaturingClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(featuringClassifier));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->removeFeaturingClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(featuringClassifier));
 }
 
 void QUmlPortObject::setStatic(bool isStatic)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->setStatic(isStatic);
+    qmodelingelementproperty_cast<QUmlPort *>(this)->setStatic(isStatic);
 }
 
 void QUmlPortObject::unsetStatic()
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("static"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("static"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlPortObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 // SLOTS FOR OWNED ATTRIBUTES [ConnectableElement]
 
 void QUmlPortObject::addEnd(QObject *end)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->addEnd(qmodelingobjectproperty_cast<QUmlConnectorEnd *>(end));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->addEnd(qmodelingelementproperty_cast<QUmlConnectorEnd *>(end));
 }
 
 void QUmlPortObject::removeEnd(QObject *end)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->removeEnd(qmodelingobjectproperty_cast<QUmlConnectorEnd *>(end));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->removeEnd(qmodelingelementproperty_cast<QUmlConnectorEnd *>(end));
 }
 
 void QUmlPortObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlConnectableElementTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlConnectableElementTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [DeploymentTarget]
 
 void QUmlPortObject::addDeployedElement(QObject *deployedElement)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->addDeployedElement(qmodelingobjectproperty_cast<QUmlPackageableElement *>(deployedElement));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->addDeployedElement(qmodelingelementproperty_cast<QUmlPackageableElement *>(deployedElement));
 }
 
 void QUmlPortObject::removeDeployedElement(QObject *deployedElement)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->removeDeployedElement(qmodelingobjectproperty_cast<QUmlPackageableElement *>(deployedElement));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->removeDeployedElement(qmodelingelementproperty_cast<QUmlPackageableElement *>(deployedElement));
 }
 
 void QUmlPortObject::addDeployment(QObject *deployment)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->addDeployment(qmodelingobjectproperty_cast<QUmlDeployment *>(deployment));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->addDeployment(qmodelingelementproperty_cast<QUmlDeployment *>(deployment));
 }
 
 void QUmlPortObject::removeDeployment(QObject *deployment)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->removeDeployment(qmodelingobjectproperty_cast<QUmlDeployment *>(deployment));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->removeDeployment(qmodelingelementproperty_cast<QUmlDeployment *>(deployment));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Property]
 
 void QUmlPortObject::setAggregation(QtUml::AggregationKind aggregation)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->setAggregation(aggregation);
+    qmodelingelementproperty_cast<QUmlPort *>(this)->setAggregation(aggregation);
 }
 
 void QUmlPortObject::unsetAggregation()
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("aggregation"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("aggregation"));
 }
 
 void QUmlPortObject::setAssociation(QObject *association)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->setAssociation(qmodelingobjectproperty_cast<QUmlAssociation *>(association));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->setAssociation(qmodelingelementproperty_cast<QUmlAssociation *>(association));
 }
 
 void QUmlPortObject::setAssociationEnd(QObject *associationEnd)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->setAssociationEnd(qmodelingobjectproperty_cast<QUmlProperty *>(associationEnd));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->setAssociationEnd(qmodelingelementproperty_cast<QUmlProperty *>(associationEnd));
 }
 
 void QUmlPortObject::setClass(QObject *class_)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->setClass(qmodelingobjectproperty_cast<QUmlClass *>(class_));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->setClass(qmodelingelementproperty_cast<QUmlClass *>(class_));
 }
 
 void QUmlPortObject::setDatatype(QObject *datatype)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->setDatatype(qmodelingobjectproperty_cast<QUmlDataType *>(datatype));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->setDatatype(qmodelingelementproperty_cast<QUmlDataType *>(datatype));
 }
 
 void QUmlPortObject::setDefault(QString default_)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->setDefault(default_);
+    qmodelingelementproperty_cast<QUmlPort *>(this)->setDefault(default_);
 }
 
 void QUmlPortObject::setDefaultValue(QObject *defaultValue)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->setDefaultValue(qmodelingobjectproperty_cast<QUmlValueSpecification *>(defaultValue));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->setDefaultValue(qmodelingelementproperty_cast<QUmlValueSpecification *>(defaultValue));
 }
 
 void QUmlPortObject::setInterface(QObject *interface_)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->setInterface(qmodelingobjectproperty_cast<QUmlInterface *>(interface_));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->setInterface(qmodelingelementproperty_cast<QUmlInterface *>(interface_));
 }
 
 void QUmlPortObject::setComposite(bool isComposite)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->setComposite(isComposite);
+    qmodelingelementproperty_cast<QUmlPort *>(this)->setComposite(isComposite);
 }
 
 void QUmlPortObject::unsetComposite()
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("composite"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("composite"));
 }
 
 void QUmlPortObject::setDerived(bool isDerived)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->setDerived(isDerived);
+    qmodelingelementproperty_cast<QUmlPort *>(this)->setDerived(isDerived);
 }
 
 void QUmlPortObject::unsetDerived()
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("derived"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("derived"));
 }
 
 void QUmlPortObject::setDerivedUnion(bool isDerivedUnion)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->setDerivedUnion(isDerivedUnion);
+    qmodelingelementproperty_cast<QUmlPort *>(this)->setDerivedUnion(isDerivedUnion);
 }
 
 void QUmlPortObject::unsetDerivedUnion()
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("derivedUnion"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("derivedUnion"));
 }
 
 void QUmlPortObject::setID(bool isID)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->setID(isID);
+    qmodelingelementproperty_cast<QUmlPort *>(this)->setID(isID);
 }
 
 void QUmlPortObject::unsetID()
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("iD"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("iD"));
 }
 
 void QUmlPortObject::setReadOnly(bool isReadOnly)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->setReadOnly(isReadOnly);
+    qmodelingelementproperty_cast<QUmlPort *>(this)->setReadOnly(isReadOnly);
 }
 
 void QUmlPortObject::unsetReadOnly()
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("readOnly"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("readOnly"));
 }
 
 void QUmlPortObject::setOpposite(QObject *opposite)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->setOpposite(qmodelingobjectproperty_cast<QUmlProperty *>(opposite));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->setOpposite(qmodelingelementproperty_cast<QUmlProperty *>(opposite));
 }
 
 void QUmlPortObject::setOwningAssociation(QObject *owningAssociation)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->setOwningAssociation(qmodelingobjectproperty_cast<QUmlAssociation *>(owningAssociation));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->setOwningAssociation(qmodelingelementproperty_cast<QUmlAssociation *>(owningAssociation));
 }
 
 void QUmlPortObject::addQualifier(QObject *qualifier)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->addQualifier(qmodelingobjectproperty_cast<QUmlProperty *>(qualifier));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->addQualifier(qmodelingelementproperty_cast<QUmlProperty *>(qualifier));
 }
 
 void QUmlPortObject::removeQualifier(QObject *qualifier)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->removeQualifier(qmodelingobjectproperty_cast<QUmlProperty *>(qualifier));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->removeQualifier(qmodelingelementproperty_cast<QUmlProperty *>(qualifier));
 }
 
 void QUmlPortObject::addRedefinedProperty(QObject *redefinedProperty)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->addRedefinedProperty(qmodelingobjectproperty_cast<QUmlProperty *>(redefinedProperty));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->addRedefinedProperty(qmodelingelementproperty_cast<QUmlProperty *>(redefinedProperty));
 }
 
 void QUmlPortObject::removeRedefinedProperty(QObject *redefinedProperty)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->removeRedefinedProperty(qmodelingobjectproperty_cast<QUmlProperty *>(redefinedProperty));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->removeRedefinedProperty(qmodelingelementproperty_cast<QUmlProperty *>(redefinedProperty));
 }
 
 void QUmlPortObject::addSubsettedProperty(QObject *subsettedProperty)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->addSubsettedProperty(qmodelingobjectproperty_cast<QUmlProperty *>(subsettedProperty));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->addSubsettedProperty(qmodelingelementproperty_cast<QUmlProperty *>(subsettedProperty));
 }
 
 void QUmlPortObject::removeSubsettedProperty(QObject *subsettedProperty)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->removeSubsettedProperty(qmodelingobjectproperty_cast<QUmlProperty *>(subsettedProperty));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->removeSubsettedProperty(qmodelingelementproperty_cast<QUmlProperty *>(subsettedProperty));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Port]
 
 void QUmlPortObject::setBehavior(bool isBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->setBehavior(isBehavior);
+    qmodelingelementproperty_cast<QUmlPort *>(this)->setBehavior(isBehavior);
 }
 
 void QUmlPortObject::unsetBehavior()
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("behavior"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("behavior"));
 }
 
 void QUmlPortObject::setConjugated(bool isConjugated)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->setConjugated(isConjugated);
+    qmodelingelementproperty_cast<QUmlPort *>(this)->setConjugated(isConjugated);
 }
 
 void QUmlPortObject::unsetConjugated()
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("conjugated"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("conjugated"));
 }
 
 void QUmlPortObject::setService(bool isService)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->setService(isService);
+    qmodelingelementproperty_cast<QUmlPort *>(this)->setService(isService);
 }
 
 void QUmlPortObject::unsetService()
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("service"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("service"));
 }
 
 void QUmlPortObject::setProtocol(QObject *protocol)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->setProtocol(qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(protocol));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->setProtocol(qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(protocol));
 }
 
 void QUmlPortObject::addProvided(QObject *provided)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->addProvided(qmodelingobjectproperty_cast<QUmlInterface *>(provided));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->addProvided(qmodelingelementproperty_cast<QUmlInterface *>(provided));
 }
 
 void QUmlPortObject::removeProvided(QObject *provided)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->removeProvided(qmodelingobjectproperty_cast<QUmlInterface *>(provided));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->removeProvided(qmodelingelementproperty_cast<QUmlInterface *>(provided));
 }
 
 void QUmlPortObject::addRedefinedPort(QObject *redefinedPort)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->addRedefinedPort(qmodelingobjectproperty_cast<QUmlPort *>(redefinedPort));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->addRedefinedPort(qmodelingelementproperty_cast<QUmlPort *>(redefinedPort));
 }
 
 void QUmlPortObject::removeRedefinedPort(QObject *redefinedPort)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->removeRedefinedPort(qmodelingobjectproperty_cast<QUmlPort *>(redefinedPort));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->removeRedefinedPort(qmodelingelementproperty_cast<QUmlPort *>(redefinedPort));
 }
 
 void QUmlPortObject::addRequired(QObject *required)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->addRequired(qmodelingobjectproperty_cast<QUmlInterface *>(required));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->addRequired(qmodelingelementproperty_cast<QUmlInterface *>(required));
 }
 
 void QUmlPortObject::removeRequired(QObject *required)
 {
-    qmodelingobjectproperty_cast<QUmlPort *>(this)->removeRequired(qmodelingobjectproperty_cast<QUmlInterface *>(required));
+    qmodelingelementproperty_cast<QUmlPort *>(this)->removeRequired(qmodelingelementproperty_cast<QUmlInterface *>(required));
+}
+
+
+void QUmlPortObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTypedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
+
+    d->propertyGroups << QStringLiteral("QUmlMultiplicityElement");
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isOrdered"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isUnique"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lower"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lowerValue"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upper"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperValue"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlFeature");
+    d->groupProperties.insert(QStringLiteral("QUmlFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("featuringClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isStatic"))));
+
+    d->propertyGroups << QStringLiteral("QUmlStructuralFeature");
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlConnectableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlConnectableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ends"))));
+    d->groupProperties.insert(QStringLiteral("QUmlConnectableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDeploymentTarget");
+    d->groupProperties.insert(QStringLiteral("QUmlDeploymentTarget"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deployedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDeploymentTarget"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deployments"))));
+
+    d->propertyGroups << QStringLiteral("QUmlProperty");
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("aggregation"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("association"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("associationEnd"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("class_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("datatype"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("default_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("defaultValue"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interface_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isComposite"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isDerived"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isDerivedUnion"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isID"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isReadOnly"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("opposite"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningAssociation"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedProperties"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("subsettedProperties"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPort");
+    d->groupProperties.insert(QStringLiteral("QUmlPort"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isBehavior"))));
+    d->groupProperties.insert(QStringLiteral("QUmlPort"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isConjugated"))));
+    d->groupProperties.insert(QStringLiteral("QUmlPort"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isService"))));
+    d->groupProperties.insert(QStringLiteral("QUmlPort"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("protocol"))));
+    d->groupProperties.insert(QStringLiteral("QUmlPort"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("provided"))));
+    d->groupProperties.insert(QStringLiteral("QUmlPort"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedPorts"))));
+    d->groupProperties.insert(QStringLiteral("QUmlPort"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("required"))));
+}
+
+void QUmlPortObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, isBehavior, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, isBehavior, PropertyClassRole, QStringLiteral("QUmlPort"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, isBehavior, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, isBehavior, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, isBehavior, DocumentationRole, QStringLiteral("Specifies whether requests arriving at this port are sent to the classifier behavior of this classifier. Such ports are referred to as behavior port. Any invocation of a behavioral feature targeted at a behavior port will be handled by the instance of the owning classifier itself, rather than by any instances that this classifier may contain."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, isBehavior, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, isBehavior, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, isBehavior, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, isConjugated, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, isConjugated, PropertyClassRole, QStringLiteral("QUmlPort"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, isConjugated, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, isConjugated, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, isConjugated, DocumentationRole, QStringLiteral("Specifies the way that the provided and required interfaces are derived from the Port’s Type. The default value is false."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, isConjugated, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, isConjugated, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, isConjugated, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, isService, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, isService, PropertyClassRole, QStringLiteral("QUmlPort"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, isService, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, isService, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, isService, DocumentationRole, QStringLiteral("If true indicates that this port is used to provide the published functionality of a classifier; if false, this port is used to implement the classifier but is not part of the essential externally-visible functionality of the classifier and can, therefore, be altered or deleted along with the internal implementation of the classifier and other properties that are considered part of its implementation."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, isService, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, isService, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, isService, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, protocol, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, protocol, PropertyClassRole, QStringLiteral("QUmlPort"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, protocol, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, protocol, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, protocol, DocumentationRole, QStringLiteral("References an optional protocol state machine which describes valid interactions at this interaction point."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, protocol, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, protocol, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, protocol, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, provided, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, provided, PropertyClassRole, QStringLiteral("QUmlPort"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, provided, IsDerivedRole, true);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, provided, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, provided, DocumentationRole, QStringLiteral("References the interfaces specifying the set of operations and receptions that the classifier offers to its environment via this port, and which it will handle either directly or by forwarding it to a part of its internal structure. This association is derived according to the value of isConjugated. If isConjugated is false, provided is derived as the union of the sets of interfaces realized by the type of the port and its supertypes, or directly from the type of the port if the port is typed by an interface. If isConjugated is true, it is derived as the union of the sets of interfaces used by the type of the port and its supertypes."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, provided, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, provided, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, provided, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, redefinedPorts, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, redefinedPorts, PropertyClassRole, QStringLiteral("QUmlPort"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, redefinedPorts, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, redefinedPorts, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, redefinedPorts, DocumentationRole, QStringLiteral("A port may be redefined when its containing classifier is specialized. The redefining port may have additional interfaces to those that are associated with the redefined port or it may replace an interface by one of its subtypes."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, redefinedPorts, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, redefinedPorts, SubsettedPropertiesRole, QStringLiteral("Property-redefinedProperty"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, redefinedPorts, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, required, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, required, PropertyClassRole, QStringLiteral("QUmlPort"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, required, IsDerivedRole, true);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, required, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, required, DocumentationRole, QStringLiteral("References the interfaces specifying the set of operations and receptions that the classifier expects its environment to handle via this port. This association is derived according to the value of isConjugated. If isConjugated is false, required is derived as the union of the sets of interfaces used by the type of the port and its supertypes. If isConjugated is true, it is derived as the union of the sets of interfaces realized by the type of the port and its supertypes, or directly from the type of the port if the port is typed by an interface."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, required, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, required, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPort, required, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlportobject_p.h b/src/uml/qobjects/qumlportobject_p.h
index 4636b200..6e7ddf48 100644
--- a/src/uml/qobjects/qumlportobject_p.h
+++ b/src/uml/qobjects/qumlportobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlPort;
-class Q_UML_EXPORT QUmlPortObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlPortObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlPortObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -134,7 +137,7 @@ class Q_UML_EXPORT QUmlPortObject : public QObject
     Q_PROPERTY(QSet<QObject *> required READ required STORED false)
 
 public:
-    Q_INVOKABLE explicit QUmlPortObject(QUmlPort *qModelingObject);
+    Q_INVOKABLE explicit QUmlPortObject(QUmlPort *qModelingElement);
     virtual ~QUmlPortObject();
 
     // Owned attributes [Element]
@@ -350,6 +353,10 @@ public Q_SLOTS:
     void removeRedefinedPort(QObject *redefinedPort);
     void Q_DECL_HIDDEN addRequired(QObject *required);
     void Q_DECL_HIDDEN removeRequired(QObject *required);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlprimitivetypeobject.cpp b/src/uml/qobjects/qumlprimitivetypeobject.cpp
index b925c5c6..8c2e7a33 100644
--- a/src/uml/qobjects/qumlprimitivetypeobject.cpp
+++ b/src/uml/qobjects/qumlprimitivetypeobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlprimitivetypeobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlPrimitiveType>
 #include <QtUml/QUmlClassifier>
@@ -72,16 +73,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlPrimitiveTypeObject::QUmlPrimitiveTypeObject(QUmlPrimitiveType *qModelingObject)
+QUmlPrimitiveTypeObject::QUmlPrimitiveTypeObject(QUmlPrimitiveType *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlPrimitiveTypeObject::~QUmlPrimitiveTypeObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -90,25 +93,25 @@ QUmlPrimitiveTypeObject::~QUmlPrimitiveTypeObject()
 const QSet<QObject *> QUmlPrimitiveTypeObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPrimitiveTypeObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlPrimitiveTypeObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -116,35 +119,35 @@ QObject *QUmlPrimitiveTypeObject::owner() const
 const QSet<QObject *> QUmlPrimitiveTypeObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlPrimitiveTypeObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->name();
 }
 
 QObject *QUmlPrimitiveTypeObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlPrimitiveTypeObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlPrimitiveTypeObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [Namespace]
@@ -152,48 +155,48 @@ QString QUmlPrimitiveTypeObject::qualifiedName() const
 const QSet<QObject *> QUmlPrimitiveTypeObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPrimitiveTypeObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPrimitiveTypeObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPrimitiveTypeObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPrimitiveTypeObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPrimitiveTypeObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -201,49 +204,49 @@ const QSet<QObject *> QUmlPrimitiveTypeObject::packageImports() const
 
 QObject *QUmlPrimitiveTypeObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlPrimitiveTypeObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Type]
 
 QObject *QUmlPrimitiveTypeObject::package() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->package())
+    if (!qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->package())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->package()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->package()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlPrimitiveTypeObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlPrimitiveTypeObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPrimitiveTypeObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -252,8 +255,8 @@ const QSet<QObject *> QUmlPrimitiveTypeObject::redefinitionContexts() const
 const QSet<QObject *> QUmlPrimitiveTypeObject::templateBindings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTemplateBinding *element, qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->templateBindings())
-        set.insert(element->asQObject());
+    foreach (QUmlTemplateBinding *element, qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->templateBindings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -262,122 +265,122 @@ const QSet<QObject *> QUmlPrimitiveTypeObject::templateBindings() const
 const QSet<QObject *> QUmlPrimitiveTypeObject::attributes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->attributes())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->attributes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPrimitiveTypeObject::collaborationUses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlCollaborationUse *element, qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->collaborationUses())
-        set.insert(element->asQObject());
+    foreach (QUmlCollaborationUse *element, qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->collaborationUses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPrimitiveTypeObject::features() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->features())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->features())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPrimitiveTypeObject::generals() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->generals())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->generals())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPrimitiveTypeObject::generalizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralization *element, qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->generalizations())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralization *element, qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->generalizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPrimitiveTypeObject::inheritedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->inheritedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->inheritedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlPrimitiveTypeObject::isAbstract() const
 {
-    return qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->isAbstract();
+    return qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->isAbstract();
 }
 
 bool QUmlPrimitiveTypeObject::isFinalSpecialization() const
 {
-    return qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->isFinalSpecialization();
+    return qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->isFinalSpecialization();
 }
 
 QObject *QUmlPrimitiveTypeObject::ownedTemplateSignature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->ownedTemplateSignature())
+    if (!qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->ownedTemplateSignature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->ownedTemplateSignature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->ownedTemplateSignature()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlPrimitiveTypeObject::ownedUseCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->ownedUseCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->ownedUseCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPrimitiveTypeObject::powertypeExtents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralizationSet *element, qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->powertypeExtents())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralizationSet *element, qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->powertypeExtents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPrimitiveTypeObject::redefinedClassifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->redefinedClassifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->redefinedClassifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlPrimitiveTypeObject::representation() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->representation())
+    if (!qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->representation())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->representation()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->representation()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlPrimitiveTypeObject::substitutions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlSubstitution *element, qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->substitutions())
-        set.insert(element->asQObject());
+    foreach (QUmlSubstitution *element, qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->substitutions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlPrimitiveTypeObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->templateParameter()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlPrimitiveTypeObject::useCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->useCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->useCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -386,16 +389,16 @@ const QSet<QObject *> QUmlPrimitiveTypeObject::useCases() const
 const QList<QObject *> QUmlPrimitiveTypeObject::ownedAttributes() const
 {
     QList<QObject *> list;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->ownedAttributes())
-        list.append(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->ownedAttributes())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QList<QObject *> QUmlPrimitiveTypeObject::ownedOperations() const
 {
     QList<QObject *> list;
-    foreach (QUmlOperation *element, qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->ownedOperations())
-        list.append(element->asQObject());
+    foreach (QUmlOperation *element, qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->ownedOperations())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -404,14 +407,14 @@ const QList<QObject *> QUmlPrimitiveTypeObject::ownedOperations() const
 QSet<QObject *> QUmlPrimitiveTypeObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlPrimitiveTypeObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -419,27 +422,27 @@ bool QUmlPrimitiveTypeObject::mustBeOwned() const
 QList<QObject *> QUmlPrimitiveTypeObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlPrimitiveTypeObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlPrimitiveTypeObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlPrimitiveTypeObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->separator();
 }
 
 // OPERATIONS [Namespace]
@@ -448,44 +451,44 @@ QSet<QObject *> QUmlPrimitiveTypeObject::excludeCollisions(QSet<QObject *> imps)
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlPrimitiveTypeObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlPrimitiveTypeObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlPrimitiveTypeObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->membersAreDistinguishable();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlPrimitiveTypeObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlPrimitiveTypeObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [Type]
@@ -493,12 +496,12 @@ bool QUmlPrimitiveTypeObject::isTemplateParameter() const
 
 bool QUmlPrimitiveTypeObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlPrimitiveTypeObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [TemplateableElement]
@@ -506,8 +509,8 @@ bool QUmlPrimitiveTypeObject::isRedefinitionContextValid(QObject *redefined) con
 QSet<QObject *> QUmlPrimitiveTypeObject::parameterableElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterableElement *element, qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->parameterableElements())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterableElement *element, qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->parameterableElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -516,52 +519,52 @@ QSet<QObject *> QUmlPrimitiveTypeObject::parameterableElements() const
 QSet<QObject *> QUmlPrimitiveTypeObject::allFeatures() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->allFeatures())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->allFeatures())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlPrimitiveTypeObject::allParents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->allParents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->allParents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlPrimitiveTypeObject::conformsTo(QObject *other) const
 {
-    return qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->conformsTo(qmodelingobjectproperty_cast<QUmlClassifier *>(other));
+    return qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->conformsTo(qmodelingelementproperty_cast<QUmlClassifier *>(other));
 }
 
 bool QUmlPrimitiveTypeObject::hasVisibilityOf(QObject *n) const
 {
-    return qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->hasVisibilityOf(qmodelingobjectproperty_cast<QUmlNamedElement *>(n));
+    return qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->hasVisibilityOf(qmodelingelementproperty_cast<QUmlNamedElement *>(n));
 }
 
 QSet<QObject *> QUmlPrimitiveTypeObject::inheritableMembers(QObject *c) const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->inheritableMembers(qmodelingobjectproperty_cast<QUmlClassifier *>(c)))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->inheritableMembers(qmodelingelementproperty_cast<QUmlClassifier *>(c)))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlPrimitiveTypeObject::isTemplate() const
 {
-    return qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->isTemplate();
+    return qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->isTemplate();
 }
 
 bool QUmlPrimitiveTypeObject::maySpecializeType(QObject *c) const
 {
-    return qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->maySpecializeType(qmodelingobjectproperty_cast<QUmlClassifier *>(c));
+    return qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->maySpecializeType(qmodelingelementproperty_cast<QUmlClassifier *>(c));
 }
 
 QSet<QObject *> QUmlPrimitiveTypeObject::parents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->parents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->parents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -571,10 +574,10 @@ QSet<QObject *> QUmlPrimitiveTypeObject::inherit(QSet<QObject *> inhs) const
 {
     QSet<QUmlNamedElement *> inhsConverted;
     foreach (QObject *object, inhs)
-        inhsConverted.insert(qmodelingobjectproperty_cast<QUmlNamedElement *>(object));
+        inhsConverted.insert(qmodelingelementproperty_cast<QUmlNamedElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->inherit(inhsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->inherit(inhsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -582,358 +585,437 @@ QSet<QObject *> QUmlPrimitiveTypeObject::inherit(QSet<QObject *> inhs) const
 
 void QUmlPrimitiveTypeObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlPrimitiveTypeObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlPrimitiveTypeObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlPrimitiveTypeObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlPrimitiveTypeObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlPrimitiveTypeObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlPrimitiveTypeObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlPrimitiveTypeObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->setName(name);
 }
 
 void QUmlPrimitiveTypeObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlPrimitiveTypeObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlPrimitiveTypeObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlPrimitiveTypeObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlPrimitiveTypeObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlPrimitiveTypeObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlPrimitiveTypeObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlPrimitiveTypeObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlPrimitiveTypeObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlPrimitiveTypeObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlPrimitiveTypeObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlPrimitiveTypeObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlPrimitiveTypeObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlPrimitiveTypeObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlPrimitiveTypeObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlPrimitiveTypeObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlPrimitiveTypeObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->setVisibility(visibility);
 }
 
 void QUmlPrimitiveTypeObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Type]
 
 void QUmlPrimitiveTypeObject::setPackage(QObject *package)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->setPackage(qmodelingobjectproperty_cast<QUmlPackage *>(package));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->setPackage(qmodelingelementproperty_cast<QUmlPackage *>(package));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlPrimitiveTypeObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlPrimitiveTypeObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlPrimitiveTypeObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlPrimitiveTypeObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlPrimitiveTypeObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlPrimitiveTypeObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateableElement]
 
 void QUmlPrimitiveTypeObject::addTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->addTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->addTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 void QUmlPrimitiveTypeObject::removeTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->removeTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->removeTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Classifier]
 
 void QUmlPrimitiveTypeObject::addAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->addAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->addAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlPrimitiveTypeObject::removeAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->removeAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->removeAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlPrimitiveTypeObject::addCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->addCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->addCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlPrimitiveTypeObject::removeCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->removeCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->removeCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlPrimitiveTypeObject::addFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->addFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->addFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlPrimitiveTypeObject::removeFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->removeFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->removeFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlPrimitiveTypeObject::addGeneral(QObject *general)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->addGeneral(qmodelingobjectproperty_cast<QUmlClassifier *>(general));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->addGeneral(qmodelingelementproperty_cast<QUmlClassifier *>(general));
 }
 
 void QUmlPrimitiveTypeObject::removeGeneral(QObject *general)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->removeGeneral(qmodelingobjectproperty_cast<QUmlClassifier *>(general));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->removeGeneral(qmodelingelementproperty_cast<QUmlClassifier *>(general));
 }
 
 void QUmlPrimitiveTypeObject::addGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->addGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->addGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlPrimitiveTypeObject::removeGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->removeGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->removeGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlPrimitiveTypeObject::addInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->addInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->addInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlPrimitiveTypeObject::removeInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->removeInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->removeInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlPrimitiveTypeObject::setAbstract(bool isAbstract)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->setAbstract(isAbstract);
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->setAbstract(isAbstract);
 }
 
 void QUmlPrimitiveTypeObject::unsetAbstract()
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("abstract"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
 void QUmlPrimitiveTypeObject::setFinalSpecialization(bool isFinalSpecialization)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->setFinalSpecialization(isFinalSpecialization);
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->setFinalSpecialization(isFinalSpecialization);
 }
 
 void QUmlPrimitiveTypeObject::unsetFinalSpecialization()
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("finalSpecialization"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
 void QUmlPrimitiveTypeObject::setOwnedTemplateSignature(QObject *ownedTemplateSignature)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->setOwnedTemplateSignature(qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->setOwnedTemplateSignature(qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
 }
 
 void QUmlPrimitiveTypeObject::addOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->addOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->addOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlPrimitiveTypeObject::removeOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->removeOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->removeOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlPrimitiveTypeObject::addPowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->addPowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->addPowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlPrimitiveTypeObject::removePowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->removePowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->removePowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlPrimitiveTypeObject::addRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->addRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->addRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlPrimitiveTypeObject::removeRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->removeRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->removeRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlPrimitiveTypeObject::setRepresentation(QObject *representation)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->setRepresentation(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(representation));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->setRepresentation(qmodelingelementproperty_cast<QUmlCollaborationUse *>(representation));
 }
 
 void QUmlPrimitiveTypeObject::addSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->addSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->addSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlPrimitiveTypeObject::removeSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->removeSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->removeSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlPrimitiveTypeObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
 }
 
 void QUmlPrimitiveTypeObject::addUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->addUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->addUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 void QUmlPrimitiveTypeObject::removeUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->removeUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->removeUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [DataType]
 
 void QUmlPrimitiveTypeObject::addOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->addOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->addOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlPrimitiveTypeObject::removeOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->removeOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->removeOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlPrimitiveTypeObject::addOwnedOperation(QObject *ownedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->addOwnedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(ownedOperation));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->addOwnedOperation(qmodelingelementproperty_cast<QUmlOperation *>(ownedOperation));
 }
 
 void QUmlPrimitiveTypeObject::removeOwnedOperation(QObject *ownedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlPrimitiveType *>(this)->removeOwnedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(ownedOperation));
+    qmodelingelementproperty_cast<QUmlPrimitiveType *>(this)->removeOwnedOperation(qmodelingelementproperty_cast<QUmlOperation *>(ownedOperation));
+}
+
+
+void QUmlPrimitiveTypeObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlType");
+    d->groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generals"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDataType");
+    d->groupProperties.insert(QStringLiteral("QUmlDataType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDataType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPrimitiveType");
+}
+
+void QUmlPrimitiveTypeObject::setPropertyData()
+{
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlprimitivetypeobject_p.h b/src/uml/qobjects/qumlprimitivetypeobject_p.h
index fc39edef..b17b2ba5 100644
--- a/src/uml/qobjects/qumlprimitivetypeobject_p.h
+++ b/src/uml/qobjects/qumlprimitivetypeobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlPrimitiveType;
-class Q_UML_EXPORT QUmlPrimitiveTypeObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlPrimitiveTypeObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlPrimitiveTypeObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -118,7 +121,7 @@ class Q_UML_EXPORT QUmlPrimitiveTypeObject : public QObject
     Q_PROPERTY(QList<QObject *> ownedOperations READ ownedOperations)
 
 public:
-    Q_INVOKABLE explicit QUmlPrimitiveTypeObject(QUmlPrimitiveType *qModelingObject);
+    Q_INVOKABLE explicit QUmlPrimitiveTypeObject(QUmlPrimitiveType *qModelingElement);
     virtual ~QUmlPrimitiveTypeObject();
 
     // Owned attributes [Element]
@@ -311,6 +314,10 @@ public Q_SLOTS:
     void removeOwnedAttribute(QObject *ownedAttribute);
     void addOwnedOperation(QObject *ownedOperation);
     void removeOwnedOperation(QObject *ownedOperation);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlprofileapplicationobject.cpp b/src/uml/qobjects/qumlprofileapplicationobject.cpp
index e8a9b3cc..b43292bb 100644
--- a/src/uml/qobjects/qumlprofileapplicationobject.cpp
+++ b/src/uml/qobjects/qumlprofileapplicationobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlprofileapplicationobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlProfileApplication>
 #include <QtUml/QUmlComment>
@@ -48,16 +49,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlProfileApplicationObject::QUmlProfileApplicationObject(QUmlProfileApplication *qModelingObject)
+QUmlProfileApplicationObject::QUmlProfileApplicationObject(QUmlProfileApplication *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlProfileApplicationObject::~QUmlProfileApplicationObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlProfileApplication *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlProfileApplication *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -66,25 +69,25 @@ QUmlProfileApplicationObject::~QUmlProfileApplicationObject()
 const QSet<QObject *> QUmlProfileApplicationObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlProfileApplication *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlProfileApplication *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProfileApplicationObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlProfileApplication *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlProfileApplication *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlProfileApplicationObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProfileApplication *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlProfileApplication *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProfileApplication *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProfileApplication *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [Relationship]
@@ -92,8 +95,8 @@ QObject *QUmlProfileApplicationObject::owner() const
 const QSet<QObject *> QUmlProfileApplicationObject::relatedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlProfileApplication *>(this)->relatedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlProfileApplication *>(this)->relatedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -102,16 +105,16 @@ const QSet<QObject *> QUmlProfileApplicationObject::relatedElements() const
 const QSet<QObject *> QUmlProfileApplicationObject::sources() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlProfileApplication *>(this)->sources())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlProfileApplication *>(this)->sources())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProfileApplicationObject::targets() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlProfileApplication *>(this)->targets())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlProfileApplication *>(this)->targets())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -119,23 +122,23 @@ const QSet<QObject *> QUmlProfileApplicationObject::targets() const
 
 QObject *QUmlProfileApplicationObject::appliedProfile() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProfileApplication *>(this)->appliedProfile())
+    if (!qmodelingelementproperty_cast<QUmlProfileApplication *>(this)->appliedProfile())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProfileApplication *>(this)->appliedProfile()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProfileApplication *>(this)->appliedProfile()->asQModelingObject();
 }
 
 QObject *QUmlProfileApplicationObject::applyingPackage() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProfileApplication *>(this)->applyingPackage())
+    if (!qmodelingelementproperty_cast<QUmlProfileApplication *>(this)->applyingPackage())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProfileApplication *>(this)->applyingPackage()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProfileApplication *>(this)->applyingPackage()->asQModelingObject();
 }
 
 bool QUmlProfileApplicationObject::isStrict() const
 {
-    return qmodelingobjectproperty_cast<QUmlProfileApplication *>(this)->isStrict();
+    return qmodelingelementproperty_cast<QUmlProfileApplication *>(this)->isStrict();
 }
 
 // OPERATIONS [Element]
@@ -143,97 +146,156 @@ bool QUmlProfileApplicationObject::isStrict() const
 QSet<QObject *> QUmlProfileApplicationObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlProfileApplication *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlProfileApplication *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlProfileApplicationObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlProfileApplication *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlProfileApplication *>(this)->mustBeOwned();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlProfileApplicationObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlProfileApplication *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlProfileApplication *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlProfileApplicationObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlProfileApplication *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlProfileApplication *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlProfileApplicationObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlProfileApplication *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlProfileApplication *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlProfileApplicationObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlProfileApplication *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlProfileApplication *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlProfileApplicationObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlProfileApplication *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlProfileApplication *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Relationship]
 
 void QUmlProfileApplicationObject::addRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlProfileApplication *>(this)->addRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlProfileApplication *>(this)->addRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 void QUmlProfileApplicationObject::removeRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlProfileApplication *>(this)->removeRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlProfileApplication *>(this)->removeRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [DirectedRelationship]
 
 void QUmlProfileApplicationObject::addSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlProfileApplication *>(this)->addSource(qmodelingobjectproperty_cast<QUmlElement *>(source));
+    qmodelingelementproperty_cast<QUmlProfileApplication *>(this)->addSource(qmodelingelementproperty_cast<QUmlElement *>(source));
 }
 
 void QUmlProfileApplicationObject::removeSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlProfileApplication *>(this)->removeSource(qmodelingobjectproperty_cast<QUmlElement *>(source));
+    qmodelingelementproperty_cast<QUmlProfileApplication *>(this)->removeSource(qmodelingelementproperty_cast<QUmlElement *>(source));
 }
 
 void QUmlProfileApplicationObject::addTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlProfileApplication *>(this)->addTarget(qmodelingobjectproperty_cast<QUmlElement *>(target));
+    qmodelingelementproperty_cast<QUmlProfileApplication *>(this)->addTarget(qmodelingelementproperty_cast<QUmlElement *>(target));
 }
 
 void QUmlProfileApplicationObject::removeTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlProfileApplication *>(this)->removeTarget(qmodelingobjectproperty_cast<QUmlElement *>(target));
+    qmodelingelementproperty_cast<QUmlProfileApplication *>(this)->removeTarget(qmodelingelementproperty_cast<QUmlElement *>(target));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ProfileApplication]
 
 void QUmlProfileApplicationObject::setAppliedProfile(QObject *appliedProfile)
 {
-    qmodelingobjectproperty_cast<QUmlProfileApplication *>(this)->setAppliedProfile(qmodelingobjectproperty_cast<QUmlProfile *>(appliedProfile));
+    qmodelingelementproperty_cast<QUmlProfileApplication *>(this)->setAppliedProfile(qmodelingelementproperty_cast<QUmlProfile *>(appliedProfile));
 }
 
 void QUmlProfileApplicationObject::setApplyingPackage(QObject *applyingPackage)
 {
-    qmodelingobjectproperty_cast<QUmlProfileApplication *>(this)->setApplyingPackage(qmodelingobjectproperty_cast<QUmlPackage *>(applyingPackage));
+    qmodelingelementproperty_cast<QUmlProfileApplication *>(this)->setApplyingPackage(qmodelingelementproperty_cast<QUmlPackage *>(applyingPackage));
 }
 
 void QUmlProfileApplicationObject::setStrict(bool isStrict)
 {
-    qmodelingobjectproperty_cast<QUmlProfileApplication *>(this)->setStrict(isStrict);
+    qmodelingelementproperty_cast<QUmlProfileApplication *>(this)->setStrict(isStrict);
 }
 
 void QUmlProfileApplicationObject::unsetStrict()
 {
-    qmodelingobjectproperty_cast<QUmlProfileApplication *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("strict"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("strict"));
+}
+
+
+void QUmlProfileApplicationObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDirectedRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
+
+    d->propertyGroups << QStringLiteral("QUmlProfileApplication");
+    d->groupProperties.insert(QStringLiteral("QUmlProfileApplication"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("appliedProfile"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProfileApplication"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("applyingPackage"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProfileApplication"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isStrict"))));
+}
+
+void QUmlProfileApplicationObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfileApplication, appliedProfile, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfileApplication, appliedProfile, PropertyClassRole, QStringLiteral("QUmlProfileApplication"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfileApplication, appliedProfile, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfileApplication, appliedProfile, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfileApplication, appliedProfile, DocumentationRole, QStringLiteral("References the Profiles that are applied to a Package through this ProfileApplication."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfileApplication, appliedProfile, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfileApplication, appliedProfile, SubsettedPropertiesRole, QStringLiteral("DirectedRelationship-target"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfileApplication, appliedProfile, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfileApplication, applyingPackage, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfileApplication, applyingPackage, PropertyClassRole, QStringLiteral("QUmlProfileApplication"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfileApplication, applyingPackage, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfileApplication, applyingPackage, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfileApplication, applyingPackage, DocumentationRole, QStringLiteral("The package that owns the profile application."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfileApplication, applyingPackage, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfileApplication, applyingPackage, SubsettedPropertiesRole, QStringLiteral("Element-owner DirectedRelationship-source"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfileApplication, applyingPackage, OppositeEndRole, QStringLiteral("Package-profileApplication"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfileApplication, isStrict, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfileApplication, isStrict, PropertyClassRole, QStringLiteral("QUmlProfileApplication"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfileApplication, isStrict, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfileApplication, isStrict, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfileApplication, isStrict, DocumentationRole, QStringLiteral("Specifies that the Profile filtering rules for the metaclasses of the referenced metamodel shall be strictly applied."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfileApplication, isStrict, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfileApplication, isStrict, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfileApplication, isStrict, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlprofileapplicationobject_p.h b/src/uml/qobjects/qumlprofileapplicationobject_p.h
index 951a63c7..909ab4db 100644
--- a/src/uml/qobjects/qumlprofileapplicationobject_p.h
+++ b/src/uml/qobjects/qumlprofileapplicationobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 QT_BEGIN_HEADER
 
@@ -52,9 +52,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlProfileApplication;
-class Q_UML_EXPORT QUmlProfileApplicationObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlProfileApplicationObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlProfileApplicationObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -74,7 +77,7 @@ class Q_UML_EXPORT QUmlProfileApplicationObject : public QObject
     Q_PROPERTY(bool isStrict READ isStrict WRITE setStrict RESET unsetStrict)
 
 public:
-    Q_INVOKABLE explicit QUmlProfileApplicationObject(QUmlProfileApplication *qModelingObject);
+    Q_INVOKABLE explicit QUmlProfileApplicationObject(QUmlProfileApplication *qModelingElement);
     virtual ~QUmlProfileApplicationObject();
 
     // Owned attributes [Element]
@@ -122,6 +125,10 @@ public Q_SLOTS:
     void setApplyingPackage(QObject *applyingPackage = 0);
     void setStrict(bool isStrict);
     void unsetStrict();
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlprofileobject.cpp b/src/uml/qobjects/qumlprofileobject.cpp
index 7f1b171f..8a322d1b 100644
--- a/src/uml/qobjects/qumlprofileobject.cpp
+++ b/src/uml/qobjects/qumlprofileobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlprofileobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlProfile>
 #include <QtUml/QUmlComment>
@@ -63,16 +64,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlProfileObject::QUmlProfileObject(QUmlProfile *qModelingObject)
+QUmlProfileObject::QUmlProfileObject(QUmlProfile *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlProfileObject::~QUmlProfileObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlProfile *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlProfile *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -81,25 +84,25 @@ QUmlProfileObject::~QUmlProfileObject()
 const QSet<QObject *> QUmlProfileObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlProfile *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlProfile *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProfileObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlProfile *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlProfile *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlProfileObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProfile *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlProfile *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProfile *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProfile *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -107,35 +110,35 @@ QObject *QUmlProfileObject::owner() const
 const QSet<QObject *> QUmlProfileObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlProfile *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlProfile *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlProfileObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlProfile *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlProfile *>(this)->name();
 }
 
 QObject *QUmlProfileObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProfile *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlProfile *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProfile *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProfile *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlProfileObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProfile *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlProfile *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProfile *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProfile *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlProfileObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlProfile *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlProfile *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [Namespace]
@@ -143,48 +146,48 @@ QString QUmlProfileObject::qualifiedName() const
 const QSet<QObject *> QUmlProfileObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlProfile *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlProfile *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProfileObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlProfile *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlProfile *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProfileObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlProfile *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlProfile *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProfileObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlProfile *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlProfile *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProfileObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlProfile *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlProfile *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProfileObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlProfile *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlProfile *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -192,42 +195,42 @@ const QSet<QObject *> QUmlProfileObject::packageImports() const
 
 QObject *QUmlProfileObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProfile *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlProfile *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProfile *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProfile *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlProfileObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProfile *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlProfile *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProfile *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProfile *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlProfileObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlProfile *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlProfile *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [TemplateableElement]
 
 QObject *QUmlProfileObject::ownedTemplateSignature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProfile *>(this)->ownedTemplateSignature())
+    if (!qmodelingelementproperty_cast<QUmlProfile *>(this)->ownedTemplateSignature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProfile *>(this)->ownedTemplateSignature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProfile *>(this)->ownedTemplateSignature()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlProfileObject::templateBindings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTemplateBinding *element, qmodelingobjectproperty_cast<QUmlProfile *>(this)->templateBindings())
-        set.insert(element->asQObject());
+    foreach (QUmlTemplateBinding *element, qmodelingelementproperty_cast<QUmlProfile *>(this)->templateBindings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -235,62 +238,62 @@ const QSet<QObject *> QUmlProfileObject::templateBindings() const
 
 QString QUmlProfileObject::URI() const
 {
-    return qmodelingobjectproperty_cast<QUmlProfile *>(this)->URI();
+    return qmodelingelementproperty_cast<QUmlProfile *>(this)->URI();
 }
 
 const QSet<QObject *> QUmlProfileObject::nestedPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlProfile *>(this)->nestedPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlProfile *>(this)->nestedPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlProfileObject::nestingPackage() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProfile *>(this)->nestingPackage())
+    if (!qmodelingelementproperty_cast<QUmlProfile *>(this)->nestingPackage())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProfile *>(this)->nestingPackage()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProfile *>(this)->nestingPackage()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlProfileObject::ownedStereotypes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlStereotype *element, qmodelingobjectproperty_cast<QUmlProfile *>(this)->ownedStereotypes())
-        set.insert(element->asQObject());
+    foreach (QUmlStereotype *element, qmodelingelementproperty_cast<QUmlProfile *>(this)->ownedStereotypes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProfileObject::ownedTypes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlType *element, qmodelingobjectproperty_cast<QUmlProfile *>(this)->ownedTypes())
-        set.insert(element->asQObject());
+    foreach (QUmlType *element, qmodelingelementproperty_cast<QUmlProfile *>(this)->ownedTypes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProfileObject::packageMerges() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageMerge *element, qmodelingobjectproperty_cast<QUmlProfile *>(this)->packageMerges())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageMerge *element, qmodelingelementproperty_cast<QUmlProfile *>(this)->packageMerges())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProfileObject::packagedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlProfile *>(this)->packagedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlProfile *>(this)->packagedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProfileObject::profileApplications() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProfileApplication *element, qmodelingobjectproperty_cast<QUmlProfile *>(this)->profileApplications())
-        set.insert(element->asQObject());
+    foreach (QUmlProfileApplication *element, qmodelingelementproperty_cast<QUmlProfile *>(this)->profileApplications())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -299,16 +302,16 @@ const QSet<QObject *> QUmlProfileObject::profileApplications() const
 const QSet<QObject *> QUmlProfileObject::metaclassReferences() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlProfile *>(this)->metaclassReferences())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlProfile *>(this)->metaclassReferences())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProfileObject::metamodelReferences() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlProfile *>(this)->metamodelReferences())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlProfile *>(this)->metamodelReferences())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -317,8 +320,8 @@ const QSet<QObject *> QUmlProfileObject::metamodelReferences() const
 QSet<QObject *> QUmlProfileObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlProfile *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlProfile *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 // OPERATIONS [NamedElement]
@@ -326,27 +329,27 @@ QSet<QObject *> QUmlProfileObject::allOwnedElements() const
 QList<QObject *> QUmlProfileObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlProfile *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlProfile *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlProfileObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlProfile *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlProfile *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlProfileObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlProfile *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlProfile *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlProfileObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlProfile *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlProfile *>(this)->separator();
 }
 
 // OPERATIONS [Namespace]
@@ -355,58 +358,58 @@ QSet<QObject *> QUmlProfileObject::excludeCollisions(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlProfile *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlProfile *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlProfileObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlProfile *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlProfile *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlProfileObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlProfile *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlProfile *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlProfileObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlProfile *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlProfile *>(this)->membersAreDistinguishable();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlProfileObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlProfile *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlProfile *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlProfileObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlProfile *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlProfile *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [TemplateableElement]
 
 bool QUmlProfileObject::isTemplate() const
 {
-    return qmodelingobjectproperty_cast<QUmlProfile *>(this)->isTemplate();
+    return qmodelingelementproperty_cast<QUmlProfile *>(this)->isTemplate();
 }
 
 QSet<QObject *> QUmlProfileObject::parameterableElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterableElement *element, qmodelingobjectproperty_cast<QUmlProfile *>(this)->parameterableElements())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterableElement *element, qmodelingelementproperty_cast<QUmlProfile *>(this)->parameterableElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -415,34 +418,34 @@ QSet<QObject *> QUmlProfileObject::parameterableElements() const
 QSet<QObject *> QUmlProfileObject::allApplicableStereotypes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlStereotype *element, qmodelingobjectproperty_cast<QUmlProfile *>(this)->allApplicableStereotypes())
-        set.insert(element->asQObject());
+    foreach (QUmlStereotype *element, qmodelingelementproperty_cast<QUmlProfile *>(this)->allApplicableStereotypes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlProfileObject::containingProfile() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProfile *>(this)->containingProfile())
+    if (!qmodelingelementproperty_cast<QUmlProfile *>(this)->containingProfile())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProfile *>(this)->containingProfile()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProfile *>(this)->containingProfile()->asQModelingObject();
 }
 
 bool QUmlProfileObject::makesVisible(QObject *el) const
 {
-    return qmodelingobjectproperty_cast<QUmlProfile *>(this)->makesVisible(qmodelingobjectproperty_cast<QUmlNamedElement *>(el));
+    return qmodelingelementproperty_cast<QUmlProfile *>(this)->makesVisible(qmodelingelementproperty_cast<QUmlNamedElement *>(el));
 }
 
 bool QUmlProfileObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlProfile *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlProfile *>(this)->mustBeOwned();
 }
 
 QSet<QObject *> QUmlProfileObject::visibleMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlProfile *>(this)->visibleMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlProfile *>(this)->visibleMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -450,255 +453,333 @@ QSet<QObject *> QUmlProfileObject::visibleMembers() const
 
 void QUmlProfileObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlProfileObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlProfileObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlProfileObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlProfileObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlProfileObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlProfileObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlProfileObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->setName(name);
 }
 
 void QUmlProfileObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlProfileObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlProfileObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlProfileObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlProfileObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlProfileObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlProfileObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlProfileObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlProfileObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlProfileObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlProfileObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlProfileObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlProfileObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlProfileObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlProfileObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlProfileObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlProfileObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlProfileObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->setVisibility(visibility);
 }
 
 void QUmlProfileObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateableElement]
 
 void QUmlProfileObject::setOwnedTemplateSignature(QObject *ownedTemplateSignature)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->setOwnedTemplateSignature(qmodelingobjectproperty_cast<QUmlTemplateSignature *>(ownedTemplateSignature));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->setOwnedTemplateSignature(qmodelingelementproperty_cast<QUmlTemplateSignature *>(ownedTemplateSignature));
 }
 
 void QUmlProfileObject::addTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->addTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->addTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 void QUmlProfileObject::removeTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->removeTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->removeTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Package]
 
 void QUmlProfileObject::setURI(QString URI)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->setURI(URI);
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->setURI(URI);
 }
 
 void QUmlProfileObject::addNestedPackage(QObject *nestedPackage)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->addNestedPackage(qmodelingobjectproperty_cast<QUmlPackage *>(nestedPackage));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->addNestedPackage(qmodelingelementproperty_cast<QUmlPackage *>(nestedPackage));
 }
 
 void QUmlProfileObject::removeNestedPackage(QObject *nestedPackage)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->removeNestedPackage(qmodelingobjectproperty_cast<QUmlPackage *>(nestedPackage));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->removeNestedPackage(qmodelingelementproperty_cast<QUmlPackage *>(nestedPackage));
 }
 
 void QUmlProfileObject::setNestingPackage(QObject *nestingPackage)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->setNestingPackage(qmodelingobjectproperty_cast<QUmlPackage *>(nestingPackage));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->setNestingPackage(qmodelingelementproperty_cast<QUmlPackage *>(nestingPackage));
 }
 
 void QUmlProfileObject::addOwnedStereotype(QObject *ownedStereotype)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->addOwnedStereotype(qmodelingobjectproperty_cast<QUmlStereotype *>(ownedStereotype));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->addOwnedStereotype(qmodelingelementproperty_cast<QUmlStereotype *>(ownedStereotype));
 }
 
 void QUmlProfileObject::removeOwnedStereotype(QObject *ownedStereotype)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->removeOwnedStereotype(qmodelingobjectproperty_cast<QUmlStereotype *>(ownedStereotype));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->removeOwnedStereotype(qmodelingelementproperty_cast<QUmlStereotype *>(ownedStereotype));
 }
 
 void QUmlProfileObject::addOwnedType(QObject *ownedType)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->addOwnedType(qmodelingobjectproperty_cast<QUmlType *>(ownedType));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->addOwnedType(qmodelingelementproperty_cast<QUmlType *>(ownedType));
 }
 
 void QUmlProfileObject::removeOwnedType(QObject *ownedType)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->removeOwnedType(qmodelingobjectproperty_cast<QUmlType *>(ownedType));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->removeOwnedType(qmodelingelementproperty_cast<QUmlType *>(ownedType));
 }
 
 void QUmlProfileObject::addPackageMerge(QObject *packageMerge)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->addPackageMerge(qmodelingobjectproperty_cast<QUmlPackageMerge *>(packageMerge));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->addPackageMerge(qmodelingelementproperty_cast<QUmlPackageMerge *>(packageMerge));
 }
 
 void QUmlProfileObject::removePackageMerge(QObject *packageMerge)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->removePackageMerge(qmodelingobjectproperty_cast<QUmlPackageMerge *>(packageMerge));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->removePackageMerge(qmodelingelementproperty_cast<QUmlPackageMerge *>(packageMerge));
 }
 
 void QUmlProfileObject::addPackagedElement(QObject *packagedElement)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->addPackagedElement(qmodelingobjectproperty_cast<QUmlPackageableElement *>(packagedElement));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->addPackagedElement(qmodelingelementproperty_cast<QUmlPackageableElement *>(packagedElement));
 }
 
 void QUmlProfileObject::removePackagedElement(QObject *packagedElement)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->removePackagedElement(qmodelingobjectproperty_cast<QUmlPackageableElement *>(packagedElement));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->removePackagedElement(qmodelingelementproperty_cast<QUmlPackageableElement *>(packagedElement));
 }
 
 void QUmlProfileObject::addProfileApplication(QObject *profileApplication)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->addProfileApplication(qmodelingobjectproperty_cast<QUmlProfileApplication *>(profileApplication));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->addProfileApplication(qmodelingelementproperty_cast<QUmlProfileApplication *>(profileApplication));
 }
 
 void QUmlProfileObject::removeProfileApplication(QObject *profileApplication)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->removeProfileApplication(qmodelingobjectproperty_cast<QUmlProfileApplication *>(profileApplication));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->removeProfileApplication(qmodelingelementproperty_cast<QUmlProfileApplication *>(profileApplication));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Profile]
 
 void QUmlProfileObject::addMetaclassReference(QObject *metaclassReference)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->addMetaclassReference(qmodelingobjectproperty_cast<QUmlElementImport *>(metaclassReference));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->addMetaclassReference(qmodelingelementproperty_cast<QUmlElementImport *>(metaclassReference));
 }
 
 void QUmlProfileObject::removeMetaclassReference(QObject *metaclassReference)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->removeMetaclassReference(qmodelingobjectproperty_cast<QUmlElementImport *>(metaclassReference));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->removeMetaclassReference(qmodelingelementproperty_cast<QUmlElementImport *>(metaclassReference));
 }
 
 void QUmlProfileObject::addMetamodelReference(QObject *metamodelReference)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->addMetamodelReference(qmodelingobjectproperty_cast<QUmlPackageImport *>(metamodelReference));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->addMetamodelReference(qmodelingelementproperty_cast<QUmlPackageImport *>(metamodelReference));
 }
 
 void QUmlProfileObject::removeMetamodelReference(QObject *metamodelReference)
 {
-    qmodelingobjectproperty_cast<QUmlProfile *>(this)->removeMetamodelReference(qmodelingobjectproperty_cast<QUmlPackageImport *>(metamodelReference));
+    qmodelingelementproperty_cast<QUmlProfile *>(this)->removeMetamodelReference(qmodelingelementproperty_cast<QUmlPackageImport *>(metamodelReference));
+}
+
+
+void QUmlProfileObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackage");
+    d->groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("URI"))));
+    d->groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedPackages"))));
+    d->groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestingPackage"))));
+    d->groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedStereotypes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTypes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageMerges"))));
+    d->groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packagedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("profileApplications"))));
+
+    d->propertyGroups << QStringLiteral("QUmlProfile");
+    d->groupProperties.insert(QStringLiteral("QUmlProfile"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("metaclassReferences"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProfile"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("metamodelReferences"))));
+}
+
+void QUmlProfileObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfile, metaclassReferences, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfile, metaclassReferences, PropertyClassRole, QStringLiteral("QUmlProfile"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfile, metaclassReferences, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfile, metaclassReferences, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfile, metaclassReferences, DocumentationRole, QStringLiteral("References a metaclass that may be extended."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfile, metaclassReferences, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfile, metaclassReferences, SubsettedPropertiesRole, QStringLiteral("Namespace-elementImport"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfile, metaclassReferences, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfile, metamodelReferences, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfile, metamodelReferences, PropertyClassRole, QStringLiteral("QUmlProfile"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfile, metamodelReferences, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfile, metamodelReferences, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfile, metamodelReferences, DocumentationRole, QStringLiteral("References a package containing (directly or indirectly) metaclasses that may be extended."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfile, metamodelReferences, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfile, metamodelReferences, SubsettedPropertiesRole, QStringLiteral("Namespace-packageImport"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProfile, metamodelReferences, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlprofileobject_p.h b/src/uml/qobjects/qumlprofileobject_p.h
index abbce72c..2fee7b8a 100644
--- a/src/uml/qobjects/qumlprofileobject_p.h
+++ b/src/uml/qobjects/qumlprofileobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlProfile;
-class Q_UML_EXPORT QUmlProfileObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlProfileObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlProfileObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -104,7 +107,7 @@ class Q_UML_EXPORT QUmlProfileObject : public QObject
     Q_PROPERTY(QSet<QObject *> metamodelReferences READ metamodelReferences)
 
 public:
-    Q_INVOKABLE explicit QUmlProfileObject(QUmlProfile *qModelingObject);
+    Q_INVOKABLE explicit QUmlProfileObject(QUmlProfile *qModelingElement);
     virtual ~QUmlProfileObject();
 
     // Owned attributes [Element]
@@ -247,6 +250,10 @@ public Q_SLOTS:
     void removeMetaclassReference(QObject *metaclassReference);
     void addMetamodelReference(QObject *metamodelReference);
     void removeMetamodelReference(QObject *metamodelReference);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlpropertyobject.cpp b/src/uml/qobjects/qumlpropertyobject.cpp
index 14b5d05a..1f367574 100644
--- a/src/uml/qobjects/qumlpropertyobject.cpp
+++ b/src/uml/qobjects/qumlpropertyobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlpropertyobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlProperty>
 #include <QtUml/QUmlAssociation>
@@ -66,16 +67,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlPropertyObject::QUmlPropertyObject(QUmlProperty *qModelingObject)
+QUmlPropertyObject::QUmlPropertyObject(QUmlProperty *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlPropertyObject::~QUmlPropertyObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlProperty *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlProperty *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -84,25 +87,25 @@ QUmlPropertyObject::~QUmlPropertyObject()
 const QSet<QObject *> QUmlPropertyObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlProperty *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlProperty *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPropertyObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlProperty *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlProperty *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlPropertyObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProperty *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlProperty *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProperty *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProperty *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -110,110 +113,110 @@ QObject *QUmlPropertyObject::owner() const
 const QSet<QObject *> QUmlPropertyObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlProperty *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlProperty *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlPropertyObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlProperty *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlProperty *>(this)->name();
 }
 
 QObject *QUmlPropertyObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProperty *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlProperty *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProperty *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProperty *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlPropertyObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProperty *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlProperty *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProperty *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProperty *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlPropertyObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlProperty *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlProperty *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlPropertyObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlProperty *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlProperty *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [TypedElement]
 
 QObject *QUmlPropertyObject::type() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProperty *>(this)->type())
+    if (!qmodelingelementproperty_cast<QUmlProperty *>(this)->type())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProperty *>(this)->type()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProperty *>(this)->type()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [MultiplicityElement]
 
 bool QUmlPropertyObject::isOrdered() const
 {
-    return qmodelingobjectproperty_cast<QUmlProperty *>(this)->isOrdered();
+    return qmodelingelementproperty_cast<QUmlProperty *>(this)->isOrdered();
 }
 
 bool QUmlPropertyObject::isUnique() const
 {
-    return qmodelingobjectproperty_cast<QUmlProperty *>(this)->isUnique();
+    return qmodelingelementproperty_cast<QUmlProperty *>(this)->isUnique();
 }
 
 int QUmlPropertyObject::lower() const
 {
-    return qmodelingobjectproperty_cast<QUmlProperty *>(this)->lower();
+    return qmodelingelementproperty_cast<QUmlProperty *>(this)->lower();
 }
 
 QObject *QUmlPropertyObject::lowerValue() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProperty *>(this)->lowerValue())
+    if (!qmodelingelementproperty_cast<QUmlProperty *>(this)->lowerValue())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProperty *>(this)->lowerValue()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProperty *>(this)->lowerValue()->asQModelingObject();
 }
 
 int QUmlPropertyObject::upper() const
 {
-    return qmodelingobjectproperty_cast<QUmlProperty *>(this)->upper();
+    return qmodelingelementproperty_cast<QUmlProperty *>(this)->upper();
 }
 
 QObject *QUmlPropertyObject::upperValue() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProperty *>(this)->upperValue())
+    if (!qmodelingelementproperty_cast<QUmlProperty *>(this)->upperValue())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProperty *>(this)->upperValue()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProperty *>(this)->upperValue()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlPropertyObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlProperty *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlProperty *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlPropertyObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlProperty *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlProperty *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPropertyObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlProperty *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlProperty *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -222,24 +225,24 @@ const QSet<QObject *> QUmlPropertyObject::redefinitionContexts() const
 const QSet<QObject *> QUmlPropertyObject::featuringClassifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlProperty *>(this)->featuringClassifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlProperty *>(this)->featuringClassifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlPropertyObject::isStatic() const
 {
-    return qmodelingobjectproperty_cast<QUmlProperty *>(this)->isStatic();
+    return qmodelingelementproperty_cast<QUmlProperty *>(this)->isStatic();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlPropertyObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProperty *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlProperty *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProperty *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProperty *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ConnectableElement]
@@ -247,17 +250,17 @@ QObject *QUmlPropertyObject::owningTemplateParameter() const
 const QList<QObject *> QUmlPropertyObject::ends() const
 {
     QList<QObject *> list;
-    foreach (QUmlConnectorEnd *element, qmodelingobjectproperty_cast<QUmlProperty *>(this)->ends())
-        list.append(element->asQObject());
+    foreach (QUmlConnectorEnd *element, qmodelingelementproperty_cast<QUmlProperty *>(this)->ends())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 QObject *QUmlPropertyObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProperty *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlProperty *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProperty *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProperty *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [DeploymentTarget]
@@ -265,16 +268,16 @@ QObject *QUmlPropertyObject::templateParameter() const
 const QSet<QObject *> QUmlPropertyObject::deployedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlProperty *>(this)->deployedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlProperty *>(this)->deployedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPropertyObject::deployments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDeployment *element, qmodelingobjectproperty_cast<QUmlProperty *>(this)->deployments())
-        set.insert(element->asQObject());
+    foreach (QUmlDeployment *element, qmodelingelementproperty_cast<QUmlProperty *>(this)->deployments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -282,124 +285,124 @@ const QSet<QObject *> QUmlPropertyObject::deployments() const
 
 QtUml::AggregationKind QUmlPropertyObject::aggregation() const
 {
-    return qmodelingobjectproperty_cast<QUmlProperty *>(this)->aggregation();
+    return qmodelingelementproperty_cast<QUmlProperty *>(this)->aggregation();
 }
 
 QObject *QUmlPropertyObject::association() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProperty *>(this)->association())
+    if (!qmodelingelementproperty_cast<QUmlProperty *>(this)->association())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProperty *>(this)->association()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProperty *>(this)->association()->asQModelingObject();
 }
 
 QObject *QUmlPropertyObject::associationEnd() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProperty *>(this)->associationEnd())
+    if (!qmodelingelementproperty_cast<QUmlProperty *>(this)->associationEnd())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProperty *>(this)->associationEnd()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProperty *>(this)->associationEnd()->asQModelingObject();
 }
 
 QObject *QUmlPropertyObject::class_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProperty *>(this)->class_())
+    if (!qmodelingelementproperty_cast<QUmlProperty *>(this)->class_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProperty *>(this)->class_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProperty *>(this)->class_()->asQModelingObject();
 }
 
 QObject *QUmlPropertyObject::datatype() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProperty *>(this)->datatype())
+    if (!qmodelingelementproperty_cast<QUmlProperty *>(this)->datatype())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProperty *>(this)->datatype()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProperty *>(this)->datatype()->asQModelingObject();
 }
 
 QString QUmlPropertyObject::default_() const
 {
-    return qmodelingobjectproperty_cast<QUmlProperty *>(this)->default_();
+    return qmodelingelementproperty_cast<QUmlProperty *>(this)->default_();
 }
 
 QObject *QUmlPropertyObject::defaultValue() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProperty *>(this)->defaultValue())
+    if (!qmodelingelementproperty_cast<QUmlProperty *>(this)->defaultValue())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProperty *>(this)->defaultValue()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProperty *>(this)->defaultValue()->asQModelingObject();
 }
 
 QObject *QUmlPropertyObject::interface_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProperty *>(this)->interface_())
+    if (!qmodelingelementproperty_cast<QUmlProperty *>(this)->interface_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProperty *>(this)->interface_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProperty *>(this)->interface_()->asQModelingObject();
 }
 
 bool QUmlPropertyObject::isComposite() const
 {
-    return qmodelingobjectproperty_cast<QUmlProperty *>(this)->isComposite();
+    return qmodelingelementproperty_cast<QUmlProperty *>(this)->isComposite();
 }
 
 bool QUmlPropertyObject::isDerived() const
 {
-    return qmodelingobjectproperty_cast<QUmlProperty *>(this)->isDerived();
+    return qmodelingelementproperty_cast<QUmlProperty *>(this)->isDerived();
 }
 
 bool QUmlPropertyObject::isDerivedUnion() const
 {
-    return qmodelingobjectproperty_cast<QUmlProperty *>(this)->isDerivedUnion();
+    return qmodelingelementproperty_cast<QUmlProperty *>(this)->isDerivedUnion();
 }
 
 bool QUmlPropertyObject::isID() const
 {
-    return qmodelingobjectproperty_cast<QUmlProperty *>(this)->isID();
+    return qmodelingelementproperty_cast<QUmlProperty *>(this)->isID();
 }
 
 bool QUmlPropertyObject::isReadOnly() const
 {
-    return qmodelingobjectproperty_cast<QUmlProperty *>(this)->isReadOnly();
+    return qmodelingelementproperty_cast<QUmlProperty *>(this)->isReadOnly();
 }
 
 QObject *QUmlPropertyObject::opposite() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProperty *>(this)->opposite())
+    if (!qmodelingelementproperty_cast<QUmlProperty *>(this)->opposite())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProperty *>(this)->opposite()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProperty *>(this)->opposite()->asQModelingObject();
 }
 
 QObject *QUmlPropertyObject::owningAssociation() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProperty *>(this)->owningAssociation())
+    if (!qmodelingelementproperty_cast<QUmlProperty *>(this)->owningAssociation())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProperty *>(this)->owningAssociation()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProperty *>(this)->owningAssociation()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlPropertyObject::qualifiers() const
 {
     QList<QObject *> list;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlProperty *>(this)->qualifiers())
-        list.append(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlProperty *>(this)->qualifiers())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QSet<QObject *> QUmlPropertyObject::redefinedProperties() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlProperty *>(this)->redefinedProperties())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlProperty *>(this)->redefinedProperties())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPropertyObject::subsettedProperties() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlProperty *>(this)->subsettedProperties())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlProperty *>(this)->subsettedProperties())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -408,14 +411,14 @@ const QSet<QObject *> QUmlPropertyObject::subsettedProperties() const
 QSet<QObject *> QUmlPropertyObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlProperty *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlProperty *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlPropertyObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlProperty *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlProperty *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -423,107 +426,107 @@ bool QUmlPropertyObject::mustBeOwned() const
 QList<QObject *> QUmlPropertyObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlProperty *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlProperty *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlPropertyObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlProperty *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlProperty *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlPropertyObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlProperty *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlProperty *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlPropertyObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlProperty *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlProperty *>(this)->separator();
 }
 
 // OPERATIONS [MultiplicityElement]
 
 bool QUmlPropertyObject::compatibleWith(QObject *other) const
 {
-    return qmodelingobjectproperty_cast<QUmlProperty *>(this)->compatibleWith(qmodelingobjectproperty_cast<QUmlMultiplicityElement *>(other));
+    return qmodelingelementproperty_cast<QUmlProperty *>(this)->compatibleWith(qmodelingelementproperty_cast<QUmlMultiplicityElement *>(other));
 }
 
 bool QUmlPropertyObject::includesCardinality(int C) const
 {
-    return qmodelingobjectproperty_cast<QUmlProperty *>(this)->includesCardinality(C);
+    return qmodelingelementproperty_cast<QUmlProperty *>(this)->includesCardinality(C);
 }
 
 bool QUmlPropertyObject::includesMultiplicity(QObject *M) const
 {
-    return qmodelingobjectproperty_cast<QUmlProperty *>(this)->includesMultiplicity(qmodelingobjectproperty_cast<QUmlMultiplicityElement *>(M));
+    return qmodelingelementproperty_cast<QUmlProperty *>(this)->includesMultiplicity(qmodelingelementproperty_cast<QUmlMultiplicityElement *>(M));
 }
 
 bool QUmlPropertyObject::is(int lowerbound, int upperbound) const
 {
-    return qmodelingobjectproperty_cast<QUmlProperty *>(this)->is(lowerbound, upperbound);
+    return qmodelingelementproperty_cast<QUmlProperty *>(this)->is(lowerbound, upperbound);
 }
 
 bool QUmlPropertyObject::isMultivalued() const
 {
-    return qmodelingobjectproperty_cast<QUmlProperty *>(this)->isMultivalued();
+    return qmodelingelementproperty_cast<QUmlProperty *>(this)->isMultivalued();
 }
 
 int QUmlPropertyObject::lowerBound() const
 {
-    return qmodelingobjectproperty_cast<QUmlProperty *>(this)->lowerBound();
+    return qmodelingelementproperty_cast<QUmlProperty *>(this)->lowerBound();
 }
 
 //int QUmlPropertyObject::upperBound() const
 //{
-//    return qmodelingobjectproperty_cast<QUmlProperty *>(this)->upperBound();
+//    return qmodelingelementproperty_cast<QUmlProperty *>(this)->upperBound();
 //}
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlPropertyObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlProperty *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlProperty *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlPropertyObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlProperty *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlProperty *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [Property]
 
 bool QUmlPropertyObject::isAttribute(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlProperty *>(this)->isAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(p));
+    return qmodelingelementproperty_cast<QUmlProperty *>(this)->isAttribute(qmodelingelementproperty_cast<QUmlProperty *>(p));
 }
 
 bool QUmlPropertyObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlProperty *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlProperty *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlPropertyObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlProperty *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlProperty *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlPropertyObject::isNavigable() const
 {
-    return qmodelingobjectproperty_cast<QUmlProperty *>(this)->isNavigable();
+    return qmodelingelementproperty_cast<QUmlProperty *>(this)->isNavigable();
 }
 
 QSet<QObject *> QUmlPropertyObject::subsettingContext() const
 {
     QSet<QObject *> set;
-    foreach (QUmlType *element, qmodelingobjectproperty_cast<QUmlProperty *>(this)->subsettingContext())
-        set.insert(element->asQObject());
+    foreach (QUmlType *element, qmodelingelementproperty_cast<QUmlProperty *>(this)->subsettingContext())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -531,359 +534,613 @@ QSet<QObject *> QUmlPropertyObject::subsettingContext() const
 
 void QUmlPropertyObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlPropertyObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlPropertyObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlPropertyObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlPropertyObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlPropertyObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlPropertyObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlPropertyObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->setName(name);
 }
 
 void QUmlPropertyObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlPropertyObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlPropertyObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlPropertyObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TypedElement]
 
 void QUmlPropertyObject::setType(QObject *type)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->setType(qmodelingobjectproperty_cast<QUmlType *>(type));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->setType(qmodelingelementproperty_cast<QUmlType *>(type));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [MultiplicityElement]
 
 void QUmlPropertyObject::setOrdered(bool isOrdered)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->setOrdered(isOrdered);
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->setOrdered(isOrdered);
 }
 
 void QUmlPropertyObject::unsetOrdered()
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("ordered"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("ordered"));
 }
 
 void QUmlPropertyObject::setUnique(bool isUnique)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->setUnique(isUnique);
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->setUnique(isUnique);
 }
 
 void QUmlPropertyObject::unsetUnique()
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("unique"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("unique"));
 }
 
 void QUmlPropertyObject::setLower(int lower)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->setLower(lower);
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->setLower(lower);
 }
 
 void QUmlPropertyObject::unsetLower()
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("lower"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("lower"));
 }
 
 void QUmlPropertyObject::setLowerValue(QObject *lowerValue)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->setLowerValue(qmodelingobjectproperty_cast<QUmlValueSpecification *>(lowerValue));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->setLowerValue(qmodelingelementproperty_cast<QUmlValueSpecification *>(lowerValue));
 }
 
 void QUmlPropertyObject::setUpper(int upper)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->setUpper(upper);
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->setUpper(upper);
 }
 
 void QUmlPropertyObject::unsetUpper()
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("upper"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("upper"));
 }
 
 void QUmlPropertyObject::setUpperValue(QObject *upperValue)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->setUpperValue(qmodelingobjectproperty_cast<QUmlValueSpecification *>(upperValue));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->setUpperValue(qmodelingelementproperty_cast<QUmlValueSpecification *>(upperValue));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlPropertyObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlPropertyObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlPropertyObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlPropertyObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlPropertyObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlPropertyObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Feature]
 
 void QUmlPropertyObject::addFeaturingClassifier(QObject *featuringClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->addFeaturingClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(featuringClassifier));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->addFeaturingClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(featuringClassifier));
 }
 
 void QUmlPropertyObject::removeFeaturingClassifier(QObject *featuringClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->removeFeaturingClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(featuringClassifier));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->removeFeaturingClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(featuringClassifier));
 }
 
 void QUmlPropertyObject::setStatic(bool isStatic)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->setStatic(isStatic);
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->setStatic(isStatic);
 }
 
 void QUmlPropertyObject::unsetStatic()
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("static"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("static"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlPropertyObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 // SLOTS FOR OWNED ATTRIBUTES [ConnectableElement]
 
 void QUmlPropertyObject::addEnd(QObject *end)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->addEnd(qmodelingobjectproperty_cast<QUmlConnectorEnd *>(end));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->addEnd(qmodelingelementproperty_cast<QUmlConnectorEnd *>(end));
 }
 
 void QUmlPropertyObject::removeEnd(QObject *end)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->removeEnd(qmodelingobjectproperty_cast<QUmlConnectorEnd *>(end));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->removeEnd(qmodelingelementproperty_cast<QUmlConnectorEnd *>(end));
 }
 
 void QUmlPropertyObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlConnectableElementTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlConnectableElementTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [DeploymentTarget]
 
 void QUmlPropertyObject::addDeployedElement(QObject *deployedElement)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->addDeployedElement(qmodelingobjectproperty_cast<QUmlPackageableElement *>(deployedElement));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->addDeployedElement(qmodelingelementproperty_cast<QUmlPackageableElement *>(deployedElement));
 }
 
 void QUmlPropertyObject::removeDeployedElement(QObject *deployedElement)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->removeDeployedElement(qmodelingobjectproperty_cast<QUmlPackageableElement *>(deployedElement));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->removeDeployedElement(qmodelingelementproperty_cast<QUmlPackageableElement *>(deployedElement));
 }
 
 void QUmlPropertyObject::addDeployment(QObject *deployment)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->addDeployment(qmodelingobjectproperty_cast<QUmlDeployment *>(deployment));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->addDeployment(qmodelingelementproperty_cast<QUmlDeployment *>(deployment));
 }
 
 void QUmlPropertyObject::removeDeployment(QObject *deployment)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->removeDeployment(qmodelingobjectproperty_cast<QUmlDeployment *>(deployment));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->removeDeployment(qmodelingelementproperty_cast<QUmlDeployment *>(deployment));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Property]
 
 void QUmlPropertyObject::setAggregation(QtUml::AggregationKind aggregation)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->setAggregation(aggregation);
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->setAggregation(aggregation);
 }
 
 void QUmlPropertyObject::unsetAggregation()
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("aggregation"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("aggregation"));
 }
 
 void QUmlPropertyObject::setAssociation(QObject *association)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->setAssociation(qmodelingobjectproperty_cast<QUmlAssociation *>(association));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->setAssociation(qmodelingelementproperty_cast<QUmlAssociation *>(association));
 }
 
 void QUmlPropertyObject::setAssociationEnd(QObject *associationEnd)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->setAssociationEnd(qmodelingobjectproperty_cast<QUmlProperty *>(associationEnd));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->setAssociationEnd(qmodelingelementproperty_cast<QUmlProperty *>(associationEnd));
 }
 
 void QUmlPropertyObject::setClass(QObject *class_)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->setClass(qmodelingobjectproperty_cast<QUmlClass *>(class_));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->setClass(qmodelingelementproperty_cast<QUmlClass *>(class_));
 }
 
 void QUmlPropertyObject::setDatatype(QObject *datatype)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->setDatatype(qmodelingobjectproperty_cast<QUmlDataType *>(datatype));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->setDatatype(qmodelingelementproperty_cast<QUmlDataType *>(datatype));
 }
 
 void QUmlPropertyObject::setDefault(QString default_)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->setDefault(default_);
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->setDefault(default_);
 }
 
 void QUmlPropertyObject::setDefaultValue(QObject *defaultValue)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->setDefaultValue(qmodelingobjectproperty_cast<QUmlValueSpecification *>(defaultValue));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->setDefaultValue(qmodelingelementproperty_cast<QUmlValueSpecification *>(defaultValue));
 }
 
 void QUmlPropertyObject::setInterface(QObject *interface_)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->setInterface(qmodelingobjectproperty_cast<QUmlInterface *>(interface_));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->setInterface(qmodelingelementproperty_cast<QUmlInterface *>(interface_));
 }
 
 void QUmlPropertyObject::setComposite(bool isComposite)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->setComposite(isComposite);
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->setComposite(isComposite);
 }
 
 void QUmlPropertyObject::unsetComposite()
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("composite"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("composite"));
 }
 
 void QUmlPropertyObject::setDerived(bool isDerived)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->setDerived(isDerived);
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->setDerived(isDerived);
 }
 
 void QUmlPropertyObject::unsetDerived()
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("derived"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("derived"));
 }
 
 void QUmlPropertyObject::setDerivedUnion(bool isDerivedUnion)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->setDerivedUnion(isDerivedUnion);
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->setDerivedUnion(isDerivedUnion);
 }
 
 void QUmlPropertyObject::unsetDerivedUnion()
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("derivedUnion"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("derivedUnion"));
 }
 
 void QUmlPropertyObject::setID(bool isID)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->setID(isID);
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->setID(isID);
 }
 
 void QUmlPropertyObject::unsetID()
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("iD"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("iD"));
 }
 
 void QUmlPropertyObject::setReadOnly(bool isReadOnly)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->setReadOnly(isReadOnly);
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->setReadOnly(isReadOnly);
 }
 
 void QUmlPropertyObject::unsetReadOnly()
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("readOnly"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("readOnly"));
 }
 
 void QUmlPropertyObject::setOpposite(QObject *opposite)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->setOpposite(qmodelingobjectproperty_cast<QUmlProperty *>(opposite));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->setOpposite(qmodelingelementproperty_cast<QUmlProperty *>(opposite));
 }
 
 void QUmlPropertyObject::setOwningAssociation(QObject *owningAssociation)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->setOwningAssociation(qmodelingobjectproperty_cast<QUmlAssociation *>(owningAssociation));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->setOwningAssociation(qmodelingelementproperty_cast<QUmlAssociation *>(owningAssociation));
 }
 
 void QUmlPropertyObject::addQualifier(QObject *qualifier)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->addQualifier(qmodelingobjectproperty_cast<QUmlProperty *>(qualifier));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->addQualifier(qmodelingelementproperty_cast<QUmlProperty *>(qualifier));
 }
 
 void QUmlPropertyObject::removeQualifier(QObject *qualifier)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->removeQualifier(qmodelingobjectproperty_cast<QUmlProperty *>(qualifier));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->removeQualifier(qmodelingelementproperty_cast<QUmlProperty *>(qualifier));
 }
 
 void QUmlPropertyObject::addRedefinedProperty(QObject *redefinedProperty)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->addRedefinedProperty(qmodelingobjectproperty_cast<QUmlProperty *>(redefinedProperty));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->addRedefinedProperty(qmodelingelementproperty_cast<QUmlProperty *>(redefinedProperty));
 }
 
 void QUmlPropertyObject::removeRedefinedProperty(QObject *redefinedProperty)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->removeRedefinedProperty(qmodelingobjectproperty_cast<QUmlProperty *>(redefinedProperty));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->removeRedefinedProperty(qmodelingelementproperty_cast<QUmlProperty *>(redefinedProperty));
 }
 
 void QUmlPropertyObject::addSubsettedProperty(QObject *subsettedProperty)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->addSubsettedProperty(qmodelingobjectproperty_cast<QUmlProperty *>(subsettedProperty));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->addSubsettedProperty(qmodelingelementproperty_cast<QUmlProperty *>(subsettedProperty));
 }
 
 void QUmlPropertyObject::removeSubsettedProperty(QObject *subsettedProperty)
 {
-    qmodelingobjectproperty_cast<QUmlProperty *>(this)->removeSubsettedProperty(qmodelingobjectproperty_cast<QUmlProperty *>(subsettedProperty));
+    qmodelingelementproperty_cast<QUmlProperty *>(this)->removeSubsettedProperty(qmodelingelementproperty_cast<QUmlProperty *>(subsettedProperty));
+}
+
+
+void QUmlPropertyObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTypedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
+
+    d->propertyGroups << QStringLiteral("QUmlMultiplicityElement");
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isOrdered"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isUnique"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lower"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lowerValue"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upper"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperValue"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlFeature");
+    d->groupProperties.insert(QStringLiteral("QUmlFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("featuringClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isStatic"))));
+
+    d->propertyGroups << QStringLiteral("QUmlStructuralFeature");
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlConnectableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlConnectableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ends"))));
+    d->groupProperties.insert(QStringLiteral("QUmlConnectableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDeploymentTarget");
+    d->groupProperties.insert(QStringLiteral("QUmlDeploymentTarget"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deployedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDeploymentTarget"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deployments"))));
+
+    d->propertyGroups << QStringLiteral("QUmlProperty");
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("aggregation"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("association"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("associationEnd"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("class_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("datatype"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("default_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("defaultValue"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interface_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isComposite"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isDerived"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isDerivedUnion"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isID"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isReadOnly"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("opposite"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningAssociation"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedProperties"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("subsettedProperties"))));
+}
+
+void QUmlPropertyObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, aggregation, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, aggregation, PropertyClassRole, QStringLiteral("QUmlProperty"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, aggregation, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, aggregation, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, aggregation, DocumentationRole, QStringLiteral("Specifies the kind of aggregation that applies to the Property."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, aggregation, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, aggregation, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, aggregation, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, association, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, association, PropertyClassRole, QStringLiteral("QUmlProperty"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, association, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, association, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, association, DocumentationRole, QStringLiteral("References the association of which this property is a member, if any."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, association, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, association, SubsettedPropertiesRole, QStringLiteral("A_member_memberNamespace-memberNamespace"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, association, OppositeEndRole, QStringLiteral("Association-memberEnd"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, associationEnd, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, associationEnd, PropertyClassRole, QStringLiteral("QUmlProperty"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, associationEnd, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, associationEnd, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, associationEnd, DocumentationRole, QStringLiteral("Designates the optional association end that owns a qualifier attribute."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, associationEnd, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, associationEnd, SubsettedPropertiesRole, QStringLiteral("Element-owner"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, associationEnd, OppositeEndRole, QStringLiteral("Property-qualifier"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, class_, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, class_, PropertyClassRole, QStringLiteral("QUmlProperty"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, class_, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, class_, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, class_, DocumentationRole, QStringLiteral("References the Class that owns the Property.References the Class that owns the Property."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, class_, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, class_, SubsettedPropertiesRole, QStringLiteral("A_attribute_classifier-classifier A_ownedAttribute_structuredClassifier-structuredClassifier NamedElement-namespace"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, class_, OppositeEndRole, QStringLiteral("Class-ownedAttribute"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, datatype, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, datatype, PropertyClassRole, QStringLiteral("QUmlProperty"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, datatype, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, datatype, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, datatype, DocumentationRole, QStringLiteral("The DataType that owns this Property."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, datatype, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, datatype, SubsettedPropertiesRole, QStringLiteral("A_attribute_classifier-classifier NamedElement-namespace"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, datatype, OppositeEndRole, QStringLiteral("DataType-ownedAttribute"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, default_, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, default_, PropertyClassRole, QStringLiteral("QUmlProperty"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, default_, IsDerivedRole, true);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, default_, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, default_, DocumentationRole, QStringLiteral("Specifies a String that represents a value to be used when no argument is supplied for the Property.A String that is evaluated to give a default value for the Property when an object of the owning Classifier is instantiated."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, default_, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, default_, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, default_, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, defaultValue, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, defaultValue, PropertyClassRole, QStringLiteral("QUmlProperty"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, defaultValue, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, defaultValue, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, defaultValue, DocumentationRole, QStringLiteral("A ValueSpecification that is evaluated to give a default value for the Property when an object of the owning Classifier is instantiated."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, defaultValue, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, defaultValue, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, defaultValue, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, interface_, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, interface_, PropertyClassRole, QStringLiteral("QUmlProperty"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, interface_, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, interface_, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, interface_, DocumentationRole, QStringLiteral("References the Interface that owns the Property"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, interface_, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, interface_, SubsettedPropertiesRole, QStringLiteral("A_attribute_classifier-classifier NamedElement-namespace"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, interface_, OppositeEndRole, QStringLiteral("Interface-ownedAttribute"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isComposite, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isComposite, PropertyClassRole, QStringLiteral("QUmlProperty"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isComposite, IsDerivedRole, true);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isComposite, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isComposite, DocumentationRole, QStringLiteral("If isComposite is true, the object containing the attribute is a container for the object or value contained in the attribute.This is a derived value, indicating whether the aggregation of the Property is composite or not."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isComposite, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isComposite, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isComposite, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isDerived, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isDerived, PropertyClassRole, QStringLiteral("QUmlProperty"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isDerived, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isDerived, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isDerived, DocumentationRole, QStringLiteral("If isDerived is true, the value of the attribute is derived from information elsewhere.Specifies whether the Property is derived, i.e., whether its value or values can be computed from other information."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isDerived, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isDerived, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isDerived, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isDerivedUnion, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isDerivedUnion, PropertyClassRole, QStringLiteral("QUmlProperty"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isDerivedUnion, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isDerivedUnion, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isDerivedUnion, DocumentationRole, QStringLiteral("Specifies whether the property is derived as the union of all of the properties that are constrained to subset it."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isDerivedUnion, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isDerivedUnion, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isDerivedUnion, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isID, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isID, PropertyClassRole, QStringLiteral("QUmlProperty"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isID, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isID, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isID, DocumentationRole, QStringLiteral("True indicates this property can be used to uniquely identify an instance of the containing Class."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isID, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isID, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isID, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isReadOnly, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isReadOnly, PropertyClassRole, QStringLiteral("QUmlProperty"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isReadOnly, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isReadOnly, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isReadOnly, DocumentationRole, QStringLiteral("If true, the attribute may only be read, and not written.If isReadOnly is true, the attribute may not be written to after initialization."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isReadOnly, RedefinedPropertiesRole, QStringLiteral("StructuralFeature-isReadOnly"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isReadOnly, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, isReadOnly, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, opposite, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, opposite, PropertyClassRole, QStringLiteral("QUmlProperty"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, opposite, IsDerivedRole, true);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, opposite, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, opposite, DocumentationRole, QStringLiteral("In the case where the property is one navigable end of a binary association with both ends navigable, this gives the other end."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, opposite, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, opposite, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, opposite, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, owningAssociation, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, owningAssociation, PropertyClassRole, QStringLiteral("QUmlProperty"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, owningAssociation, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, owningAssociation, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, owningAssociation, DocumentationRole, QStringLiteral("References the owning association of this property, if any."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, owningAssociation, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, owningAssociation, SubsettedPropertiesRole, QStringLiteral("Feature-featuringClassifier RedefinableElement-redefinitionContext NamedElement-namespace Property-association"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, owningAssociation, OppositeEndRole, QStringLiteral("Association-ownedEnd"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, qualifiers, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, qualifiers, PropertyClassRole, QStringLiteral("QUmlProperty"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, qualifiers, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, qualifiers, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, qualifiers, DocumentationRole, QStringLiteral("An optional list of ordered qualifier attributes for the end. If the list is empty, then the Association is not qualified."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, qualifiers, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, qualifiers, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, qualifiers, OppositeEndRole, QStringLiteral("Property-associationEnd"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, redefinedProperties, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, redefinedProperties, PropertyClassRole, QStringLiteral("QUmlProperty"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, redefinedProperties, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, redefinedProperties, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, redefinedProperties, DocumentationRole, QStringLiteral("References the properties that are redefined by this property."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, redefinedProperties, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, redefinedProperties, SubsettedPropertiesRole, QStringLiteral("RedefinableElement-redefinedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, redefinedProperties, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, subsettedProperties, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, subsettedProperties, PropertyClassRole, QStringLiteral("QUmlProperty"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, subsettedProperties, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, subsettedProperties, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, subsettedProperties, DocumentationRole, QStringLiteral("References the properties of which this property is constrained to be a subset."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, subsettedProperties, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, subsettedProperties, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProperty, subsettedProperties, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlpropertyobject_p.h b/src/uml/qobjects/qumlpropertyobject_p.h
index f16d23e1..8d370eb4 100644
--- a/src/uml/qobjects/qumlpropertyobject_p.h
+++ b/src/uml/qobjects/qumlpropertyobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlProperty;
-class Q_UML_EXPORT QUmlPropertyObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlPropertyObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlPropertyObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -125,7 +128,7 @@ class Q_UML_EXPORT QUmlPropertyObject : public QObject
     Q_PROPERTY(QSet<QObject *> subsettedProperties READ subsettedProperties)
 
 public:
-    Q_INVOKABLE explicit QUmlPropertyObject(QUmlProperty *qModelingObject);
+    Q_INVOKABLE explicit QUmlPropertyObject(QUmlProperty *qModelingElement);
     virtual ~QUmlPropertyObject();
 
     // Owned attributes [Element]
@@ -317,6 +320,10 @@ public Q_SLOTS:
     void removeRedefinedProperty(QObject *redefinedProperty);
     void addSubsettedProperty(QObject *subsettedProperty);
     void removeSubsettedProperty(QObject *subsettedProperty);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlprotocolconformanceobject.cpp b/src/uml/qobjects/qumlprotocolconformanceobject.cpp
index d5e42236..28f80207 100644
--- a/src/uml/qobjects/qumlprotocolconformanceobject.cpp
+++ b/src/uml/qobjects/qumlprotocolconformanceobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlprotocolconformanceobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlProtocolConformance>
 #include <QtUml/QUmlComment>
@@ -47,16 +48,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlProtocolConformanceObject::QUmlProtocolConformanceObject(QUmlProtocolConformance *qModelingObject)
+QUmlProtocolConformanceObject::QUmlProtocolConformanceObject(QUmlProtocolConformance *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlProtocolConformanceObject::~QUmlProtocolConformanceObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlProtocolConformance *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlProtocolConformance *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -65,25 +68,25 @@ QUmlProtocolConformanceObject::~QUmlProtocolConformanceObject()
 const QSet<QObject *> QUmlProtocolConformanceObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlProtocolConformance *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlProtocolConformance *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProtocolConformanceObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlProtocolConformance *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlProtocolConformance *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlProtocolConformanceObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProtocolConformance *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlProtocolConformance *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProtocolConformance *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProtocolConformance *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [Relationship]
@@ -91,8 +94,8 @@ QObject *QUmlProtocolConformanceObject::owner() const
 const QSet<QObject *> QUmlProtocolConformanceObject::relatedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlProtocolConformance *>(this)->relatedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlProtocolConformance *>(this)->relatedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -101,16 +104,16 @@ const QSet<QObject *> QUmlProtocolConformanceObject::relatedElements() const
 const QSet<QObject *> QUmlProtocolConformanceObject::sources() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlProtocolConformance *>(this)->sources())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlProtocolConformance *>(this)->sources())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProtocolConformanceObject::targets() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlProtocolConformance *>(this)->targets())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlProtocolConformance *>(this)->targets())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -118,18 +121,18 @@ const QSet<QObject *> QUmlProtocolConformanceObject::targets() const
 
 QObject *QUmlProtocolConformanceObject::generalMachine() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProtocolConformance *>(this)->generalMachine())
+    if (!qmodelingelementproperty_cast<QUmlProtocolConformance *>(this)->generalMachine())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProtocolConformance *>(this)->generalMachine()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProtocolConformance *>(this)->generalMachine()->asQModelingObject();
 }
 
 QObject *QUmlProtocolConformanceObject::specificMachine() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProtocolConformance *>(this)->specificMachine())
+    if (!qmodelingelementproperty_cast<QUmlProtocolConformance *>(this)->specificMachine())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProtocolConformance *>(this)->specificMachine()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProtocolConformance *>(this)->specificMachine()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -137,87 +140,135 @@ QObject *QUmlProtocolConformanceObject::specificMachine() const
 QSet<QObject *> QUmlProtocolConformanceObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlProtocolConformance *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlProtocolConformance *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlProtocolConformanceObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlProtocolConformance *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlProtocolConformance *>(this)->mustBeOwned();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlProtocolConformanceObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolConformance *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlProtocolConformance *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlProtocolConformanceObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolConformance *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlProtocolConformance *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlProtocolConformanceObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolConformance *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlProtocolConformance *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlProtocolConformanceObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolConformance *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlProtocolConformance *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlProtocolConformanceObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolConformance *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlProtocolConformance *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Relationship]
 
 void QUmlProtocolConformanceObject::addRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolConformance *>(this)->addRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlProtocolConformance *>(this)->addRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 void QUmlProtocolConformanceObject::removeRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolConformance *>(this)->removeRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlProtocolConformance *>(this)->removeRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [DirectedRelationship]
 
 void QUmlProtocolConformanceObject::addSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolConformance *>(this)->addSource(qmodelingobjectproperty_cast<QUmlElement *>(source));
+    qmodelingelementproperty_cast<QUmlProtocolConformance *>(this)->addSource(qmodelingelementproperty_cast<QUmlElement *>(source));
 }
 
 void QUmlProtocolConformanceObject::removeSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolConformance *>(this)->removeSource(qmodelingobjectproperty_cast<QUmlElement *>(source));
+    qmodelingelementproperty_cast<QUmlProtocolConformance *>(this)->removeSource(qmodelingelementproperty_cast<QUmlElement *>(source));
 }
 
 void QUmlProtocolConformanceObject::addTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolConformance *>(this)->addTarget(qmodelingobjectproperty_cast<QUmlElement *>(target));
+    qmodelingelementproperty_cast<QUmlProtocolConformance *>(this)->addTarget(qmodelingelementproperty_cast<QUmlElement *>(target));
 }
 
 void QUmlProtocolConformanceObject::removeTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolConformance *>(this)->removeTarget(qmodelingobjectproperty_cast<QUmlElement *>(target));
+    qmodelingelementproperty_cast<QUmlProtocolConformance *>(this)->removeTarget(qmodelingelementproperty_cast<QUmlElement *>(target));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ProtocolConformance]
 
 void QUmlProtocolConformanceObject::setGeneralMachine(QObject *generalMachine)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolConformance *>(this)->setGeneralMachine(qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(generalMachine));
+    qmodelingelementproperty_cast<QUmlProtocolConformance *>(this)->setGeneralMachine(qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(generalMachine));
 }
 
 void QUmlProtocolConformanceObject::setSpecificMachine(QObject *specificMachine)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolConformance *>(this)->setSpecificMachine(qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(specificMachine));
+    qmodelingelementproperty_cast<QUmlProtocolConformance *>(this)->setSpecificMachine(qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(specificMachine));
+}
+
+
+void QUmlProtocolConformanceObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDirectedRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
+
+    d->propertyGroups << QStringLiteral("QUmlProtocolConformance");
+    d->groupProperties.insert(QStringLiteral("QUmlProtocolConformance"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalMachine"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProtocolConformance"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("specificMachine"))));
+}
+
+void QUmlProtocolConformanceObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolConformance, generalMachine, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolConformance, generalMachine, PropertyClassRole, QStringLiteral("QUmlProtocolConformance"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolConformance, generalMachine, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolConformance, generalMachine, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolConformance, generalMachine, DocumentationRole, QStringLiteral("Specifies the protocol state machine to which the specific state machine conforms."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolConformance, generalMachine, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolConformance, generalMachine, SubsettedPropertiesRole, QStringLiteral("DirectedRelationship-target"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolConformance, generalMachine, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolConformance, specificMachine, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolConformance, specificMachine, PropertyClassRole, QStringLiteral("QUmlProtocolConformance"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolConformance, specificMachine, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolConformance, specificMachine, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolConformance, specificMachine, DocumentationRole, QStringLiteral("Specifies the state machine which conforms to the general state machine."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolConformance, specificMachine, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolConformance, specificMachine, SubsettedPropertiesRole, QStringLiteral("Element-owner DirectedRelationship-source"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolConformance, specificMachine, OppositeEndRole, QStringLiteral("ProtocolStateMachine-conformance"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlprotocolconformanceobject_p.h b/src/uml/qobjects/qumlprotocolconformanceobject_p.h
index a73160e0..da7f3244 100644
--- a/src/uml/qobjects/qumlprotocolconformanceobject_p.h
+++ b/src/uml/qobjects/qumlprotocolconformanceobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 QT_BEGIN_HEADER
 
@@ -52,9 +52,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlProtocolConformance;
-class Q_UML_EXPORT QUmlProtocolConformanceObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlProtocolConformanceObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlProtocolConformanceObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -73,7 +76,7 @@ class Q_UML_EXPORT QUmlProtocolConformanceObject : public QObject
     Q_PROPERTY(QObject * specificMachine READ specificMachine WRITE setSpecificMachine)
 
 public:
-    Q_INVOKABLE explicit QUmlProtocolConformanceObject(QUmlProtocolConformance *qModelingObject);
+    Q_INVOKABLE explicit QUmlProtocolConformanceObject(QUmlProtocolConformance *qModelingElement);
     virtual ~QUmlProtocolConformanceObject();
 
     // Owned attributes [Element]
@@ -118,6 +121,10 @@ public Q_SLOTS:
     // Slots for owned attributes [ProtocolConformance]
     void setGeneralMachine(QObject *generalMachine = 0);
     void setSpecificMachine(QObject *specificMachine = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlprotocolstatemachineobject.cpp b/src/uml/qobjects/qumlprotocolstatemachineobject.cpp
index 660f8a4a..b9f0ff76 100644
--- a/src/uml/qobjects/qumlprotocolstatemachineobject.cpp
+++ b/src/uml/qobjects/qumlprotocolstatemachineobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlprotocolstatemachineobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlProtocolStateMachine>
 #include <QtUml/QUmlBehavior>
@@ -89,16 +90,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlProtocolStateMachineObject::QUmlProtocolStateMachineObject(QUmlProtocolStateMachine *qModelingObject)
+QUmlProtocolStateMachineObject::QUmlProtocolStateMachineObject(QUmlProtocolStateMachine *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlProtocolStateMachineObject::~QUmlProtocolStateMachineObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -107,25 +110,25 @@ QUmlProtocolStateMachineObject::~QUmlProtocolStateMachineObject()
 const QSet<QObject *> QUmlProtocolStateMachineObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProtocolStateMachineObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlProtocolStateMachineObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -133,35 +136,35 @@ QObject *QUmlProtocolStateMachineObject::owner() const
 const QSet<QObject *> QUmlProtocolStateMachineObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlProtocolStateMachineObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->name();
 }
 
 QObject *QUmlProtocolStateMachineObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlProtocolStateMachineObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlProtocolStateMachineObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [Namespace]
@@ -169,48 +172,48 @@ QString QUmlProtocolStateMachineObject::qualifiedName() const
 const QSet<QObject *> QUmlProtocolStateMachineObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProtocolStateMachineObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProtocolStateMachineObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProtocolStateMachineObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProtocolStateMachineObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProtocolStateMachineObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -218,49 +221,49 @@ const QSet<QObject *> QUmlProtocolStateMachineObject::packageImports() const
 
 QObject *QUmlProtocolStateMachineObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlProtocolStateMachineObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Type]
 
 QObject *QUmlProtocolStateMachineObject::package() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->package())
+    if (!qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->package())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->package()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->package()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlProtocolStateMachineObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlProtocolStateMachineObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProtocolStateMachineObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -269,8 +272,8 @@ const QSet<QObject *> QUmlProtocolStateMachineObject::redefinitionContexts() con
 const QSet<QObject *> QUmlProtocolStateMachineObject::templateBindings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTemplateBinding *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->templateBindings())
-        set.insert(element->asQObject());
+    foreach (QUmlTemplateBinding *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->templateBindings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -279,109 +282,109 @@ const QSet<QObject *> QUmlProtocolStateMachineObject::templateBindings() const
 const QSet<QObject *> QUmlProtocolStateMachineObject::attributes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->attributes())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->attributes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProtocolStateMachineObject::collaborationUses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlCollaborationUse *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->collaborationUses())
-        set.insert(element->asQObject());
+    foreach (QUmlCollaborationUse *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->collaborationUses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProtocolStateMachineObject::features() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->features())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->features())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProtocolStateMachineObject::generalizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralization *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->generalizations())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralization *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->generalizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProtocolStateMachineObject::inheritedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->inheritedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->inheritedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlProtocolStateMachineObject::isFinalSpecialization() const
 {
-    return qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->isFinalSpecialization();
+    return qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->isFinalSpecialization();
 }
 
 QObject *QUmlProtocolStateMachineObject::ownedTemplateSignature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->ownedTemplateSignature())
+    if (!qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->ownedTemplateSignature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->ownedTemplateSignature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->ownedTemplateSignature()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlProtocolStateMachineObject::ownedUseCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->ownedUseCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->ownedUseCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProtocolStateMachineObject::powertypeExtents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralizationSet *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->powertypeExtents())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralizationSet *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->powertypeExtents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProtocolStateMachineObject::redefinedClassifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->redefinedClassifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->redefinedClassifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlProtocolStateMachineObject::representation() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->representation())
+    if (!qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->representation())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->representation()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->representation()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlProtocolStateMachineObject::substitutions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlSubstitution *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->substitutions())
-        set.insert(element->asQObject());
+    foreach (QUmlSubstitution *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->substitutions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlProtocolStateMachineObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->templateParameter()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlProtocolStateMachineObject::useCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->useCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->useCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -390,24 +393,24 @@ const QSet<QObject *> QUmlProtocolStateMachineObject::useCases() const
 const QSet<QObject *> QUmlProtocolStateMachineObject::ownedConnectors() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConnector *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->ownedConnectors())
-        set.insert(element->asQObject());
+    foreach (QUmlConnector *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->ownedConnectors())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProtocolStateMachineObject::parts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->parts())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->parts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProtocolStateMachineObject::roles() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConnectableElement *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->roles())
-        set.insert(element->asQObject());
+    foreach (QUmlConnectableElement *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->roles())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -416,8 +419,8 @@ const QSet<QObject *> QUmlProtocolStateMachineObject::roles() const
 const QSet<QObject *> QUmlProtocolStateMachineObject::ownedPorts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPort *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->ownedPorts())
-        set.insert(element->asQObject());
+    foreach (QUmlPort *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->ownedPorts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -425,25 +428,25 @@ const QSet<QObject *> QUmlProtocolStateMachineObject::ownedPorts() const
 
 QObject *QUmlProtocolStateMachineObject::classifierBehavior() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->classifierBehavior())
+    if (!qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->classifierBehavior())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->classifierBehavior()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->classifierBehavior()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlProtocolStateMachineObject::interfaceRealizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterfaceRealization *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->interfaceRealizations())
-        set.insert(element->asQObject());
+    foreach (QUmlInterfaceRealization *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->interfaceRealizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProtocolStateMachineObject::ownedBehaviors() const
 {
     QSet<QObject *> set;
-    foreach (QUmlBehavior *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->ownedBehaviors())
-        set.insert(element->asQObject());
+    foreach (QUmlBehavior *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->ownedBehaviors())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -452,58 +455,58 @@ const QSet<QObject *> QUmlProtocolStateMachineObject::ownedBehaviors() const
 const QSet<QObject *> QUmlProtocolStateMachineObject::extensions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExtension *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->extensions())
-        set.insert(element->asQObject());
+    foreach (QUmlExtension *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->extensions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlProtocolStateMachineObject::isAbstract() const
 {
-    return qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->isAbstract();
+    return qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->isAbstract();
 }
 
 bool QUmlProtocolStateMachineObject::isActive() const
 {
-    return qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->isActive();
+    return qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->isActive();
 }
 
 const QList<QObject *> QUmlProtocolStateMachineObject::nestedClassifiers() const
 {
     QList<QObject *> list;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->nestedClassifiers())
-        list.append(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->nestedClassifiers())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QList<QObject *> QUmlProtocolStateMachineObject::ownedAttributes() const
 {
     QList<QObject *> list;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->ownedAttributes())
-        list.append(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->ownedAttributes())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QList<QObject *> QUmlProtocolStateMachineObject::ownedOperations() const
 {
     QList<QObject *> list;
-    foreach (QUmlOperation *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->ownedOperations())
-        list.append(element->asQObject());
+    foreach (QUmlOperation *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->ownedOperations())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QSet<QObject *> QUmlProtocolStateMachineObject::ownedReceptions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlReception *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->ownedReceptions())
-        set.insert(element->asQObject());
+    foreach (QUmlReception *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->ownedReceptions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProtocolStateMachineObject::superClasses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClass *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->superClasses())
-        set.insert(element->asQObject());
+    foreach (QUmlClass *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->superClasses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -511,55 +514,55 @@ const QSet<QObject *> QUmlProtocolStateMachineObject::superClasses() const
 
 QObject *QUmlProtocolStateMachineObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->context()->asQModelingObject();
 }
 
 bool QUmlProtocolStateMachineObject::isReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->isReentrant();
+    return qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->isReentrant();
 }
 
 const QList<QObject *> QUmlProtocolStateMachineObject::ownedParameters() const
 {
     QList<QObject *> list;
-    foreach (QUmlParameter *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->ownedParameters())
-        list.append(element->asQObject());
+    foreach (QUmlParameter *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->ownedParameters())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QSet<QObject *> QUmlProtocolStateMachineObject::ownedParameterSets() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterSet *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->ownedParameterSets())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterSet *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->ownedParameterSets())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProtocolStateMachineObject::postconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->postconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->postconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProtocolStateMachineObject::preconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->preconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->preconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlProtocolStateMachineObject::specification() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->specification())
+    if (!qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->specification())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->specification()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->specification()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [StateMachine]
@@ -567,32 +570,32 @@ QObject *QUmlProtocolStateMachineObject::specification() const
 const QSet<QObject *> QUmlProtocolStateMachineObject::connectionPoints() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPseudostate *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->connectionPoints())
-        set.insert(element->asQObject());
+    foreach (QUmlPseudostate *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->connectionPoints())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProtocolStateMachineObject::extendedStateMachines() const
 {
     QSet<QObject *> set;
-    foreach (QUmlStateMachine *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->extendedStateMachines())
-        set.insert(element->asQObject());
+    foreach (QUmlStateMachine *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->extendedStateMachines())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProtocolStateMachineObject::regions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRegion *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->regions())
-        set.insert(element->asQObject());
+    foreach (QUmlRegion *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->regions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProtocolStateMachineObject::submachineStates() const
 {
     QSet<QObject *> set;
-    foreach (QUmlState *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->submachineStates())
-        set.insert(element->asQObject());
+    foreach (QUmlState *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->submachineStates())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -601,8 +604,8 @@ const QSet<QObject *> QUmlProtocolStateMachineObject::submachineStates() const
 const QSet<QObject *> QUmlProtocolStateMachineObject::conformance() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProtocolConformance *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->conformance())
-        set.insert(element->asQObject());
+    foreach (QUmlProtocolConformance *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->conformance())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -611,14 +614,14 @@ const QSet<QObject *> QUmlProtocolStateMachineObject::conformance() const
 QSet<QObject *> QUmlProtocolStateMachineObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlProtocolStateMachineObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -626,27 +629,27 @@ bool QUmlProtocolStateMachineObject::mustBeOwned() const
 QList<QObject *> QUmlProtocolStateMachineObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlProtocolStateMachineObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlProtocolStateMachineObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlProtocolStateMachineObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->separator();
 }
 
 // OPERATIONS [Namespace]
@@ -655,44 +658,44 @@ QSet<QObject *> QUmlProtocolStateMachineObject::excludeCollisions(QSet<QObject *
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlProtocolStateMachineObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlProtocolStateMachineObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlProtocolStateMachineObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->membersAreDistinguishable();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlProtocolStateMachineObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlProtocolStateMachineObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [Type]
@@ -702,8 +705,8 @@ bool QUmlProtocolStateMachineObject::isTemplateParameter() const
 QSet<QObject *> QUmlProtocolStateMachineObject::parameterableElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterableElement *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->parameterableElements())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterableElement *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->parameterableElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -712,52 +715,52 @@ QSet<QObject *> QUmlProtocolStateMachineObject::parameterableElements() const
 QSet<QObject *> QUmlProtocolStateMachineObject::allFeatures() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->allFeatures())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->allFeatures())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlProtocolStateMachineObject::allParents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->allParents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->allParents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlProtocolStateMachineObject::conformsTo(QObject *other) const
 {
-    return qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->conformsTo(qmodelingobjectproperty_cast<QUmlClassifier *>(other));
+    return qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->conformsTo(qmodelingelementproperty_cast<QUmlClassifier *>(other));
 }
 
 bool QUmlProtocolStateMachineObject::hasVisibilityOf(QObject *n) const
 {
-    return qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->hasVisibilityOf(qmodelingobjectproperty_cast<QUmlNamedElement *>(n));
+    return qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->hasVisibilityOf(qmodelingelementproperty_cast<QUmlNamedElement *>(n));
 }
 
 QSet<QObject *> QUmlProtocolStateMachineObject::inheritableMembers(QObject *c) const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->inheritableMembers(qmodelingobjectproperty_cast<QUmlClassifier *>(c)))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->inheritableMembers(qmodelingelementproperty_cast<QUmlClassifier *>(c)))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlProtocolStateMachineObject::isTemplate() const
 {
-    return qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->isTemplate();
+    return qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->isTemplate();
 }
 
 bool QUmlProtocolStateMachineObject::maySpecializeType(QObject *c) const
 {
-    return qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->maySpecializeType(qmodelingobjectproperty_cast<QUmlClassifier *>(c));
+    return qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->maySpecializeType(qmodelingelementproperty_cast<QUmlClassifier *>(c));
 }
 
 QSet<QObject *> QUmlProtocolStateMachineObject::parents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->parents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->parents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -767,10 +770,10 @@ QSet<QObject *> QUmlProtocolStateMachineObject::inherit(QSet<QObject *> inhs) co
 {
     QSet<QUmlNamedElement *> inhsConverted;
     foreach (QObject *object, inhs)
-        inhsConverted.insert(qmodelingobjectproperty_cast<QUmlNamedElement *>(object));
+        inhsConverted.insert(qmodelingelementproperty_cast<QUmlNamedElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->inherit(inhsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->inherit(inhsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -778,610 +781,733 @@ QSet<QObject *> QUmlProtocolStateMachineObject::inherit(QSet<QObject *> inhs) co
 
 QObject *QUmlProtocolStateMachineObject::LCA(QObject *s1, QObject *s2) const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->LCA(qmodelingobjectproperty_cast<QUmlState *>(s1), qmodelingobjectproperty_cast<QUmlState *>(s2)))
+    if (!qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->LCA(qmodelingelementproperty_cast<QUmlState *>(s1), qmodelingelementproperty_cast<QUmlState *>(s2)))
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->LCA(qmodelingobjectproperty_cast<QUmlState *>(s1), qmodelingobjectproperty_cast<QUmlState *>(s2))->asQObject();
+        return qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->LCA(qmodelingelementproperty_cast<QUmlState *>(s1), qmodelingelementproperty_cast<QUmlState *>(s2))->asQModelingObject();
 }
 
 bool QUmlProtocolStateMachineObject::ancestor(QObject *s1, QObject *s2) const
 {
-    return qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->ancestor(qmodelingobjectproperty_cast<QUmlState *>(s1), qmodelingobjectproperty_cast<QUmlState *>(s2));
+    return qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->ancestor(qmodelingelementproperty_cast<QUmlState *>(s1), qmodelingelementproperty_cast<QUmlState *>(s2));
 }
 
 bool QUmlProtocolStateMachineObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlProtocolStateMachineObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlStateMachine *>(redefined));
+    return qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlStateMachine *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlProtocolStateMachineObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlProtocolStateMachineObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlProtocolStateMachineObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlProtocolStateMachineObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlProtocolStateMachineObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlProtocolStateMachineObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlProtocolStateMachineObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlProtocolStateMachineObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->setName(name);
 }
 
 void QUmlProtocolStateMachineObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlProtocolStateMachineObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlProtocolStateMachineObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlProtocolStateMachineObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlProtocolStateMachineObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlProtocolStateMachineObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlProtocolStateMachineObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlProtocolStateMachineObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlProtocolStateMachineObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlProtocolStateMachineObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlProtocolStateMachineObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlProtocolStateMachineObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlProtocolStateMachineObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlProtocolStateMachineObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlProtocolStateMachineObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlProtocolStateMachineObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlProtocolStateMachineObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->setVisibility(visibility);
 }
 
 void QUmlProtocolStateMachineObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Type]
 
 void QUmlProtocolStateMachineObject::setPackage(QObject *package)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->setPackage(qmodelingobjectproperty_cast<QUmlPackage *>(package));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->setPackage(qmodelingelementproperty_cast<QUmlPackage *>(package));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlProtocolStateMachineObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlProtocolStateMachineObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlProtocolStateMachineObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlProtocolStateMachineObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlProtocolStateMachineObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlProtocolStateMachineObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateableElement]
 
 void QUmlProtocolStateMachineObject::addTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 void QUmlProtocolStateMachineObject::removeTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removeTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removeTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Classifier]
 
 void QUmlProtocolStateMachineObject::addAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlProtocolStateMachineObject::removeAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removeAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removeAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlProtocolStateMachineObject::addCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlProtocolStateMachineObject::removeCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removeCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removeCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlProtocolStateMachineObject::addFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlProtocolStateMachineObject::removeFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removeFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removeFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlProtocolStateMachineObject::addGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlProtocolStateMachineObject::removeGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removeGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removeGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlProtocolStateMachineObject::addInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlProtocolStateMachineObject::removeInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removeInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removeInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlProtocolStateMachineObject::setFinalSpecialization(bool isFinalSpecialization)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->setFinalSpecialization(isFinalSpecialization);
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->setFinalSpecialization(isFinalSpecialization);
 }
 
 void QUmlProtocolStateMachineObject::unsetFinalSpecialization()
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("finalSpecialization"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
 void QUmlProtocolStateMachineObject::setOwnedTemplateSignature(QObject *ownedTemplateSignature)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->setOwnedTemplateSignature(qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->setOwnedTemplateSignature(qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
 }
 
 void QUmlProtocolStateMachineObject::addOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlProtocolStateMachineObject::removeOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removeOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removeOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlProtocolStateMachineObject::addPowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addPowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addPowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlProtocolStateMachineObject::removePowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removePowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removePowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlProtocolStateMachineObject::addRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlProtocolStateMachineObject::removeRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removeRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removeRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlProtocolStateMachineObject::setRepresentation(QObject *representation)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->setRepresentation(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(representation));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->setRepresentation(qmodelingelementproperty_cast<QUmlCollaborationUse *>(representation));
 }
 
 void QUmlProtocolStateMachineObject::addSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlProtocolStateMachineObject::removeSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removeSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removeSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlProtocolStateMachineObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
 }
 
 void QUmlProtocolStateMachineObject::addUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 void QUmlProtocolStateMachineObject::removeUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removeUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removeUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [StructuredClassifier]
 
 void QUmlProtocolStateMachineObject::addOwnedConnector(QObject *ownedConnector)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addOwnedConnector(qmodelingobjectproperty_cast<QUmlConnector *>(ownedConnector));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addOwnedConnector(qmodelingelementproperty_cast<QUmlConnector *>(ownedConnector));
 }
 
 void QUmlProtocolStateMachineObject::removeOwnedConnector(QObject *ownedConnector)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removeOwnedConnector(qmodelingobjectproperty_cast<QUmlConnector *>(ownedConnector));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removeOwnedConnector(qmodelingelementproperty_cast<QUmlConnector *>(ownedConnector));
 }
 
 void QUmlProtocolStateMachineObject::addPart(QObject *part)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addPart(qmodelingobjectproperty_cast<QUmlProperty *>(part));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addPart(qmodelingelementproperty_cast<QUmlProperty *>(part));
 }
 
 void QUmlProtocolStateMachineObject::removePart(QObject *part)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removePart(qmodelingobjectproperty_cast<QUmlProperty *>(part));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removePart(qmodelingelementproperty_cast<QUmlProperty *>(part));
 }
 
 void QUmlProtocolStateMachineObject::addRole(QObject *role)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addRole(qmodelingobjectproperty_cast<QUmlConnectableElement *>(role));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addRole(qmodelingelementproperty_cast<QUmlConnectableElement *>(role));
 }
 
 void QUmlProtocolStateMachineObject::removeRole(QObject *role)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removeRole(qmodelingobjectproperty_cast<QUmlConnectableElement *>(role));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removeRole(qmodelingelementproperty_cast<QUmlConnectableElement *>(role));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [EncapsulatedClassifier]
 
 void QUmlProtocolStateMachineObject::addOwnedPort(QObject *ownedPort)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addOwnedPort(qmodelingobjectproperty_cast<QUmlPort *>(ownedPort));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addOwnedPort(qmodelingelementproperty_cast<QUmlPort *>(ownedPort));
 }
 
 void QUmlProtocolStateMachineObject::removeOwnedPort(QObject *ownedPort)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removeOwnedPort(qmodelingobjectproperty_cast<QUmlPort *>(ownedPort));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removeOwnedPort(qmodelingelementproperty_cast<QUmlPort *>(ownedPort));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [BehavioredClassifier]
 
 void QUmlProtocolStateMachineObject::setClassifierBehavior(QObject *classifierBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->setClassifierBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(classifierBehavior));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->setClassifierBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(classifierBehavior));
 }
 
 void QUmlProtocolStateMachineObject::addInterfaceRealization(QObject *interfaceRealization)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addInterfaceRealization(qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addInterfaceRealization(qmodelingelementproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
 }
 
 void QUmlProtocolStateMachineObject::removeInterfaceRealization(QObject *interfaceRealization)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removeInterfaceRealization(qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removeInterfaceRealization(qmodelingelementproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
 }
 
 void QUmlProtocolStateMachineObject::addOwnedBehavior(QObject *ownedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addOwnedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(ownedBehavior));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addOwnedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(ownedBehavior));
 }
 
 void QUmlProtocolStateMachineObject::removeOwnedBehavior(QObject *ownedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removeOwnedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(ownedBehavior));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removeOwnedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(ownedBehavior));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Class]
 
 void QUmlProtocolStateMachineObject::addExtension(QObject *extension)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addExtension(qmodelingobjectproperty_cast<QUmlExtension *>(extension));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addExtension(qmodelingelementproperty_cast<QUmlExtension *>(extension));
 }
 
 void QUmlProtocolStateMachineObject::removeExtension(QObject *extension)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removeExtension(qmodelingobjectproperty_cast<QUmlExtension *>(extension));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removeExtension(qmodelingelementproperty_cast<QUmlExtension *>(extension));
 }
 
 void QUmlProtocolStateMachineObject::setAbstract(bool isAbstract)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->setAbstract(isAbstract);
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->setAbstract(isAbstract);
 }
 
 void QUmlProtocolStateMachineObject::unsetAbstract()
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("abstract"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
 void QUmlProtocolStateMachineObject::setActive(bool isActive)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->setActive(isActive);
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->setActive(isActive);
 }
 
 void QUmlProtocolStateMachineObject::unsetActive()
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("active"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("active"));
 }
 
 void QUmlProtocolStateMachineObject::addNestedClassifier(QObject *nestedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addNestedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(nestedClassifier));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addNestedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(nestedClassifier));
 }
 
 void QUmlProtocolStateMachineObject::removeNestedClassifier(QObject *nestedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removeNestedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(nestedClassifier));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removeNestedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(nestedClassifier));
 }
 
 void QUmlProtocolStateMachineObject::addOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlProtocolStateMachineObject::removeOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removeOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removeOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlProtocolStateMachineObject::addOwnedOperation(QObject *ownedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addOwnedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(ownedOperation));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addOwnedOperation(qmodelingelementproperty_cast<QUmlOperation *>(ownedOperation));
 }
 
 void QUmlProtocolStateMachineObject::removeOwnedOperation(QObject *ownedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removeOwnedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(ownedOperation));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removeOwnedOperation(qmodelingelementproperty_cast<QUmlOperation *>(ownedOperation));
 }
 
 void QUmlProtocolStateMachineObject::addOwnedReception(QObject *ownedReception)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addOwnedReception(qmodelingobjectproperty_cast<QUmlReception *>(ownedReception));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addOwnedReception(qmodelingelementproperty_cast<QUmlReception *>(ownedReception));
 }
 
 void QUmlProtocolStateMachineObject::removeOwnedReception(QObject *ownedReception)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removeOwnedReception(qmodelingobjectproperty_cast<QUmlReception *>(ownedReception));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removeOwnedReception(qmodelingelementproperty_cast<QUmlReception *>(ownedReception));
 }
 
 void QUmlProtocolStateMachineObject::addSuperClass(QObject *superClass)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addSuperClass(qmodelingobjectproperty_cast<QUmlClass *>(superClass));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addSuperClass(qmodelingelementproperty_cast<QUmlClass *>(superClass));
 }
 
 void QUmlProtocolStateMachineObject::removeSuperClass(QObject *superClass)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removeSuperClass(qmodelingobjectproperty_cast<QUmlClass *>(superClass));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removeSuperClass(qmodelingelementproperty_cast<QUmlClass *>(superClass));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Behavior]
 
 void QUmlProtocolStateMachineObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->setContext(qmodelingobjectproperty_cast<QUmlBehavioredClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->setContext(qmodelingelementproperty_cast<QUmlBehavioredClassifier *>(context));
 }
 
 void QUmlProtocolStateMachineObject::setReentrant(bool isReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->setReentrant(isReentrant);
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->setReentrant(isReentrant);
 }
 
 void QUmlProtocolStateMachineObject::unsetReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("reentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("reentrant"));
 }
 
 void QUmlProtocolStateMachineObject::addOwnedParameter(QObject *ownedParameter)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addOwnedParameter(qmodelingobjectproperty_cast<QUmlParameter *>(ownedParameter));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addOwnedParameter(qmodelingelementproperty_cast<QUmlParameter *>(ownedParameter));
 }
 
 void QUmlProtocolStateMachineObject::removeOwnedParameter(QObject *ownedParameter)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removeOwnedParameter(qmodelingobjectproperty_cast<QUmlParameter *>(ownedParameter));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removeOwnedParameter(qmodelingelementproperty_cast<QUmlParameter *>(ownedParameter));
 }
 
 void QUmlProtocolStateMachineObject::addOwnedParameterSet(QObject *ownedParameterSet)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addOwnedParameterSet(qmodelingobjectproperty_cast<QUmlParameterSet *>(ownedParameterSet));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addOwnedParameterSet(qmodelingelementproperty_cast<QUmlParameterSet *>(ownedParameterSet));
 }
 
 void QUmlProtocolStateMachineObject::removeOwnedParameterSet(QObject *ownedParameterSet)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removeOwnedParameterSet(qmodelingobjectproperty_cast<QUmlParameterSet *>(ownedParameterSet));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removeOwnedParameterSet(qmodelingelementproperty_cast<QUmlParameterSet *>(ownedParameterSet));
 }
 
 void QUmlProtocolStateMachineObject::addPostcondition(QObject *postcondition)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(postcondition));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(postcondition));
 }
 
 void QUmlProtocolStateMachineObject::removePostcondition(QObject *postcondition)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removePostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(postcondition));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removePostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(postcondition));
 }
 
 void QUmlProtocolStateMachineObject::addPrecondition(QObject *precondition)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(precondition));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(precondition));
 }
 
 void QUmlProtocolStateMachineObject::removePrecondition(QObject *precondition)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removePrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(precondition));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removePrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(precondition));
 }
 
 void QUmlProtocolStateMachineObject::setSpecification(QObject *specification)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->setSpecification(qmodelingobjectproperty_cast<QUmlBehavioralFeature *>(specification));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->setSpecification(qmodelingelementproperty_cast<QUmlBehavioralFeature *>(specification));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [StateMachine]
 
 void QUmlProtocolStateMachineObject::addConnectionPoint(QObject *connectionPoint)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addConnectionPoint(qmodelingobjectproperty_cast<QUmlPseudostate *>(connectionPoint));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addConnectionPoint(qmodelingelementproperty_cast<QUmlPseudostate *>(connectionPoint));
 }
 
 void QUmlProtocolStateMachineObject::removeConnectionPoint(QObject *connectionPoint)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removeConnectionPoint(qmodelingobjectproperty_cast<QUmlPseudostate *>(connectionPoint));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removeConnectionPoint(qmodelingelementproperty_cast<QUmlPseudostate *>(connectionPoint));
 }
 
 void QUmlProtocolStateMachineObject::addExtendedStateMachine(QObject *extendedStateMachine)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addExtendedStateMachine(qmodelingobjectproperty_cast<QUmlStateMachine *>(extendedStateMachine));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addExtendedStateMachine(qmodelingelementproperty_cast<QUmlStateMachine *>(extendedStateMachine));
 }
 
 void QUmlProtocolStateMachineObject::removeExtendedStateMachine(QObject *extendedStateMachine)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removeExtendedStateMachine(qmodelingobjectproperty_cast<QUmlStateMachine *>(extendedStateMachine));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removeExtendedStateMachine(qmodelingelementproperty_cast<QUmlStateMachine *>(extendedStateMachine));
 }
 
 void QUmlProtocolStateMachineObject::addRegion(QObject *region)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addRegion(qmodelingobjectproperty_cast<QUmlRegion *>(region));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addRegion(qmodelingelementproperty_cast<QUmlRegion *>(region));
 }
 
 void QUmlProtocolStateMachineObject::removeRegion(QObject *region)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removeRegion(qmodelingobjectproperty_cast<QUmlRegion *>(region));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removeRegion(qmodelingelementproperty_cast<QUmlRegion *>(region));
 }
 
 void QUmlProtocolStateMachineObject::addSubmachineState(QObject *submachineState)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addSubmachineState(qmodelingobjectproperty_cast<QUmlState *>(submachineState));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addSubmachineState(qmodelingelementproperty_cast<QUmlState *>(submachineState));
 }
 
 void QUmlProtocolStateMachineObject::removeSubmachineState(QObject *submachineState)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removeSubmachineState(qmodelingobjectproperty_cast<QUmlState *>(submachineState));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removeSubmachineState(qmodelingelementproperty_cast<QUmlState *>(submachineState));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ProtocolStateMachine]
 
 void QUmlProtocolStateMachineObject::addConformance(QObject *conformance)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->addConformance(qmodelingobjectproperty_cast<QUmlProtocolConformance *>(conformance));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->addConformance(qmodelingelementproperty_cast<QUmlProtocolConformance *>(conformance));
 }
 
 void QUmlProtocolStateMachineObject::removeConformance(QObject *conformance)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolStateMachine *>(this)->removeConformance(qmodelingobjectproperty_cast<QUmlProtocolConformance *>(conformance));
+    qmodelingelementproperty_cast<QUmlProtocolStateMachine *>(this)->removeConformance(qmodelingelementproperty_cast<QUmlProtocolConformance *>(conformance));
+}
+
+
+void QUmlProtocolStateMachineObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlType");
+    d->groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
+
+    d->propertyGroups << QStringLiteral("QUmlStructuredClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedConnectors"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parts"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("roles"))));
+
+    d->propertyGroups << QStringLiteral("QUmlEncapsulatedClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlEncapsulatedClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedPorts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlBehavioredClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifierBehavior"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interfaceRealizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedBehaviors"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClass");
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extensions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isActive"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedReceptions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superClasses"))));
+
+    d->propertyGroups << QStringLiteral("QUmlBehavior");
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameters"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameterSets"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("postconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("preconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("specification"))));
+
+    d->propertyGroups << QStringLiteral("QUmlStateMachine");
+    d->groupProperties.insert(QStringLiteral("QUmlStateMachine"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("connectionPoints"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStateMachine"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extendedStateMachines"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStateMachine"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("regions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStateMachine"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("submachineStates"))));
+
+    d->propertyGroups << QStringLiteral("QUmlProtocolStateMachine");
+    d->groupProperties.insert(QStringLiteral("QUmlProtocolStateMachine"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("conformance"))));
+}
+
+void QUmlProtocolStateMachineObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolStateMachine, conformance, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolStateMachine, conformance, PropertyClassRole, QStringLiteral("QUmlProtocolStateMachine"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolStateMachine, conformance, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolStateMachine, conformance, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolStateMachine, conformance, DocumentationRole, QStringLiteral("Conformance between protocol state machines."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolStateMachine, conformance, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolStateMachine, conformance, SubsettedPropertiesRole, QStringLiteral("A_source_directedRelationship-directedRelationship Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolStateMachine, conformance, OppositeEndRole, QStringLiteral("ProtocolConformance-specificMachine"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlprotocolstatemachineobject_p.h b/src/uml/qobjects/qumlprotocolstatemachineobject_p.h
index ae9c48ec..e6a9e570 100644
--- a/src/uml/qobjects/qumlprotocolstatemachineobject_p.h
+++ b/src/uml/qobjects/qumlprotocolstatemachineobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlProtocolStateMachine;
-class Q_UML_EXPORT QUmlProtocolStateMachineObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlProtocolStateMachineObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlProtocolStateMachineObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -153,7 +156,7 @@ class Q_UML_EXPORT QUmlProtocolStateMachineObject : public QObject
     Q_PROPERTY(QSet<QObject *> conformance READ conformance)
 
 public:
-    Q_INVOKABLE explicit QUmlProtocolStateMachineObject(QUmlProtocolStateMachine *qModelingObject);
+    Q_INVOKABLE explicit QUmlProtocolStateMachineObject(QUmlProtocolStateMachine *qModelingElement);
     virtual ~QUmlProtocolStateMachineObject();
 
     // Owned attributes [Element]
@@ -440,6 +443,10 @@ public Q_SLOTS:
     // Slots for owned attributes [ProtocolStateMachine]
     void addConformance(QObject *conformance);
     void removeConformance(QObject *conformance);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlprotocoltransitionobject.cpp b/src/uml/qobjects/qumlprotocoltransitionobject.cpp
index a7ba7184..11b065d1 100644
--- a/src/uml/qobjects/qumlprotocoltransitionobject.cpp
+++ b/src/uml/qobjects/qumlprotocoltransitionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlprotocoltransitionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlProtocolTransition>
 #include <QtUml/QUmlBehavior>
@@ -64,16 +65,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlProtocolTransitionObject::QUmlProtocolTransitionObject(QUmlProtocolTransition *qModelingObject)
+QUmlProtocolTransitionObject::QUmlProtocolTransitionObject(QUmlProtocolTransition *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlProtocolTransitionObject::~QUmlProtocolTransitionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -82,25 +85,25 @@ QUmlProtocolTransitionObject::~QUmlProtocolTransitionObject()
 const QSet<QObject *> QUmlProtocolTransitionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProtocolTransitionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlProtocolTransitionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -108,54 +111,54 @@ QObject *QUmlProtocolTransitionObject::owner() const
 const QSet<QObject *> QUmlProtocolTransitionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlProtocolTransitionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->name();
 }
 
 QObject *QUmlProtocolTransitionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlProtocolTransitionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlProtocolTransitionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlProtocolTransitionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlProtocolTransitionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlProtocolTransitionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -164,48 +167,48 @@ const QSet<QObject *> QUmlProtocolTransitionObject::redefinedElements() const
 const QSet<QObject *> QUmlProtocolTransitionObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProtocolTransitionObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProtocolTransitionObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProtocolTransitionObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProtocolTransitionObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlProtocolTransitionObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -213,70 +216,70 @@ const QSet<QObject *> QUmlProtocolTransitionObject::packageImports() const
 
 QObject *QUmlProtocolTransitionObject::container() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->container())
+    if (!qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->container())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->container()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->container()->asQModelingObject();
 }
 
 QObject *QUmlProtocolTransitionObject::effect() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->effect())
+    if (!qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->effect())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->effect()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->effect()->asQModelingObject();
 }
 
 QObject *QUmlProtocolTransitionObject::guard() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->guard())
+    if (!qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->guard())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->guard()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->guard()->asQModelingObject();
 }
 
 QtUml::TransitionKind QUmlProtocolTransitionObject::kind() const
 {
-    return qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->kind();
+    return qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->kind();
 }
 
 QObject *QUmlProtocolTransitionObject::redefinedTransition() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->redefinedTransition())
+    if (!qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->redefinedTransition())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->redefinedTransition()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->redefinedTransition()->asQModelingObject();
 }
 
 QObject *QUmlProtocolTransitionObject::redefinitionContext() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->redefinitionContext())
+    if (!qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->redefinitionContext())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->redefinitionContext()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->redefinitionContext()->asQModelingObject();
 }
 
 QObject *QUmlProtocolTransitionObject::source() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->source())
+    if (!qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->source())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->source()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->source()->asQModelingObject();
 }
 
 QObject *QUmlProtocolTransitionObject::target() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->target())
+    if (!qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->target())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->target()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->target()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlProtocolTransitionObject::triggers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTrigger *element, qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->triggers())
-        set.insert(element->asQObject());
+    foreach (QUmlTrigger *element, qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->triggers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -284,25 +287,25 @@ const QSet<QObject *> QUmlProtocolTransitionObject::triggers() const
 
 QObject *QUmlProtocolTransitionObject::postCondition() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->postCondition())
+    if (!qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->postCondition())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->postCondition()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->postCondition()->asQModelingObject();
 }
 
 QObject *QUmlProtocolTransitionObject::preCondition() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->preCondition())
+    if (!qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->preCondition())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->preCondition()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->preCondition()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlProtocolTransitionObject::referred() const
 {
     QSet<QObject *> set;
-    foreach (QUmlOperation *element, qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->referred())
-        set.insert(element->asQObject());
+    foreach (QUmlOperation *element, qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->referred())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -311,14 +314,14 @@ const QSet<QObject *> QUmlProtocolTransitionObject::referred() const
 QSet<QObject *> QUmlProtocolTransitionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlProtocolTransitionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -326,34 +329,34 @@ bool QUmlProtocolTransitionObject::mustBeOwned() const
 QList<QObject *> QUmlProtocolTransitionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlProtocolTransitionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlProtocolTransitionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlProtocolTransitionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlProtocolTransitionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [Namespace]
@@ -362,273 +365,357 @@ QSet<QObject *> QUmlProtocolTransitionObject::excludeCollisions(QSet<QObject *>
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlProtocolTransitionObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlProtocolTransitionObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlProtocolTransitionObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->membersAreDistinguishable();
 }
 
 // OPERATIONS [Transition]
 
 QObject *QUmlProtocolTransitionObject::containingStateMachine() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->containingStateMachine())
+    if (!qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->containingStateMachine())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->containingStateMachine()->asQObject();
+        return qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->containingStateMachine()->asQModelingObject();
 }
 
 bool QUmlProtocolTransitionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlProtocolTransitionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlProtocolTransitionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlProtocolTransitionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlProtocolTransitionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlProtocolTransitionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlProtocolTransitionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlProtocolTransitionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlProtocolTransitionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->setName(name);
 }
 
 void QUmlProtocolTransitionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlProtocolTransitionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlProtocolTransitionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlProtocolTransitionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlProtocolTransitionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlProtocolTransitionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlProtocolTransitionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlProtocolTransitionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlProtocolTransitionObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlProtocolTransitionObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlProtocolTransitionObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlProtocolTransitionObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlProtocolTransitionObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlProtocolTransitionObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlProtocolTransitionObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlProtocolTransitionObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlProtocolTransitionObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlProtocolTransitionObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlProtocolTransitionObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlProtocolTransitionObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Transition]
 
 void QUmlProtocolTransitionObject::setContainer(QObject *container)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->setContainer(qmodelingobjectproperty_cast<QUmlRegion *>(container));
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->setContainer(qmodelingelementproperty_cast<QUmlRegion *>(container));
 }
 
 void QUmlProtocolTransitionObject::setEffect(QObject *effect)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->setEffect(qmodelingobjectproperty_cast<QUmlBehavior *>(effect));
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->setEffect(qmodelingelementproperty_cast<QUmlBehavior *>(effect));
 }
 
 void QUmlProtocolTransitionObject::setGuard(QObject *guard)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->setGuard(qmodelingobjectproperty_cast<QUmlConstraint *>(guard));
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->setGuard(qmodelingelementproperty_cast<QUmlConstraint *>(guard));
 }
 
 void QUmlProtocolTransitionObject::setKind(QtUml::TransitionKind kind)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->setKind(kind);
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->setKind(kind);
 }
 
 void QUmlProtocolTransitionObject::unsetKind()
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("kind"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("kind"));
 }
 
 void QUmlProtocolTransitionObject::setRedefinedTransition(QObject *redefinedTransition)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->setRedefinedTransition(qmodelingobjectproperty_cast<QUmlTransition *>(redefinedTransition));
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->setRedefinedTransition(qmodelingelementproperty_cast<QUmlTransition *>(redefinedTransition));
 }
 
 void QUmlProtocolTransitionObject::setRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->setRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->setRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlProtocolTransitionObject::setSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->setSource(qmodelingobjectproperty_cast<QUmlVertex *>(source));
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->setSource(qmodelingelementproperty_cast<QUmlVertex *>(source));
 }
 
 void QUmlProtocolTransitionObject::setTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->setTarget(qmodelingobjectproperty_cast<QUmlVertex *>(target));
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->setTarget(qmodelingelementproperty_cast<QUmlVertex *>(target));
 }
 
 void QUmlProtocolTransitionObject::addTrigger(QObject *trigger)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->addTrigger(qmodelingobjectproperty_cast<QUmlTrigger *>(trigger));
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->addTrigger(qmodelingelementproperty_cast<QUmlTrigger *>(trigger));
 }
 
 void QUmlProtocolTransitionObject::removeTrigger(QObject *trigger)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->removeTrigger(qmodelingobjectproperty_cast<QUmlTrigger *>(trigger));
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->removeTrigger(qmodelingelementproperty_cast<QUmlTrigger *>(trigger));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ProtocolTransition]
 
 void QUmlProtocolTransitionObject::setPostCondition(QObject *postCondition)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->setPostCondition(qmodelingobjectproperty_cast<QUmlConstraint *>(postCondition));
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->setPostCondition(qmodelingelementproperty_cast<QUmlConstraint *>(postCondition));
 }
 
 void QUmlProtocolTransitionObject::setPreCondition(QObject *preCondition)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->setPreCondition(qmodelingobjectproperty_cast<QUmlConstraint *>(preCondition));
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->setPreCondition(qmodelingelementproperty_cast<QUmlConstraint *>(preCondition));
 }
 
 void QUmlProtocolTransitionObject::addReferred(QObject *referred)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->addReferred(qmodelingobjectproperty_cast<QUmlOperation *>(referred));
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->addReferred(qmodelingelementproperty_cast<QUmlOperation *>(referred));
 }
 
 void QUmlProtocolTransitionObject::removeReferred(QObject *referred)
 {
-    qmodelingobjectproperty_cast<QUmlProtocolTransition *>(this)->removeReferred(qmodelingobjectproperty_cast<QUmlOperation *>(referred));
+    qmodelingelementproperty_cast<QUmlProtocolTransition *>(this)->removeReferred(qmodelingelementproperty_cast<QUmlOperation *>(referred));
+}
+
+
+void QUmlProtocolTransitionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTransition");
+    d->groupProperties.insert(QStringLiteral("QUmlTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("container"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("effect"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("guard"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("kind"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedTransition"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContext"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("source"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("target"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("triggers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlProtocolTransition");
+    d->groupProperties.insert(QStringLiteral("QUmlProtocolTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("postCondition"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProtocolTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("preCondition"))));
+    d->groupProperties.insert(QStringLiteral("QUmlProtocolTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("referred"))));
+}
+
+void QUmlProtocolTransitionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolTransition, postCondition, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolTransition, postCondition, PropertyClassRole, QStringLiteral("QUmlProtocolTransition"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolTransition, postCondition, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolTransition, postCondition, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolTransition, postCondition, DocumentationRole, QStringLiteral("Specifies the post condition of the transition which is the condition that should be obtained once the transition is triggered. This post condition is part of the post condition of the operation connected to the transition."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolTransition, postCondition, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolTransition, postCondition, SubsettedPropertiesRole, QStringLiteral("Namespace-ownedRule"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolTransition, postCondition, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolTransition, preCondition, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolTransition, preCondition, PropertyClassRole, QStringLiteral("QUmlProtocolTransition"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolTransition, preCondition, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolTransition, preCondition, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolTransition, preCondition, DocumentationRole, QStringLiteral("Specifies the precondition of the transition. It specifies the condition that should be verified before triggering the transition. This guard condition added to the source state will be evaluated as part of the precondition of the operation referred by the transition if any."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolTransition, preCondition, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolTransition, preCondition, SubsettedPropertiesRole, QStringLiteral("Transition-guard"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolTransition, preCondition, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolTransition, referred, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolTransition, referred, PropertyClassRole, QStringLiteral("QUmlProtocolTransition"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolTransition, referred, IsDerivedRole, true);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolTransition, referred, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolTransition, referred, DocumentationRole, QStringLiteral("This association refers to the associated operation. It is derived from the operation of the call trigger when applicable."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolTransition, referred, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolTransition, referred, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlProtocolTransition, referred, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlprotocoltransitionobject_p.h b/src/uml/qobjects/qumlprotocoltransitionobject_p.h
index 613b58bc..ca64f1d8 100644
--- a/src/uml/qobjects/qumlprotocoltransitionobject_p.h
+++ b/src/uml/qobjects/qumlprotocoltransitionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlProtocolTransition;
-class Q_UML_EXPORT QUmlProtocolTransitionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlProtocolTransitionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlProtocolTransitionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -100,7 +103,7 @@ class Q_UML_EXPORT QUmlProtocolTransitionObject : public QObject
     Q_PROPERTY(QSet<QObject *> referred READ referred STORED false)
 
 public:
-    Q_INVOKABLE explicit QUmlProtocolTransitionObject(QUmlProtocolTransition *qModelingObject);
+    Q_INVOKABLE explicit QUmlProtocolTransitionObject(QUmlProtocolTransition *qModelingElement);
     virtual ~QUmlProtocolTransitionObject();
 
     // Owned attributes [Element]
@@ -223,6 +226,10 @@ public Q_SLOTS:
     void setPreCondition(QObject *preCondition = 0);
     void Q_DECL_HIDDEN addReferred(QObject *referred);
     void Q_DECL_HIDDEN removeReferred(QObject *referred);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlpseudostateobject.cpp b/src/uml/qobjects/qumlpseudostateobject.cpp
index ca53df1b..9677f39a 100644
--- a/src/uml/qobjects/qumlpseudostateobject.cpp
+++ b/src/uml/qobjects/qumlpseudostateobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlpseudostateobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlPseudostate>
 #include <QtUml/QUmlComment>
@@ -55,16 +56,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlPseudostateObject::QUmlPseudostateObject(QUmlPseudostate *qModelingObject)
+QUmlPseudostateObject::QUmlPseudostateObject(QUmlPseudostate *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlPseudostateObject::~QUmlPseudostateObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlPseudostate *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -73,25 +76,25 @@ QUmlPseudostateObject::~QUmlPseudostateObject()
 const QSet<QObject *> QUmlPseudostateObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlPseudostate *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPseudostateObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlPseudostate *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlPseudostateObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlPseudostate *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPseudostate *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -99,65 +102,65 @@ QObject *QUmlPseudostateObject::owner() const
 const QSet<QObject *> QUmlPseudostateObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlPseudostate *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlPseudostateObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlPseudostate *>(this)->name();
 }
 
 QObject *QUmlPseudostateObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlPseudostate *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPseudostate *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlPseudostateObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlPseudostate *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPseudostate *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlPseudostateObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlPseudostate *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlPseudostateObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlPseudostate *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Vertex]
 
 QObject *QUmlPseudostateObject::container() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->container())
+    if (!qmodelingelementproperty_cast<QUmlPseudostate *>(this)->container())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->container()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPseudostate *>(this)->container()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlPseudostateObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTransition *element, qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlTransition *element, qmodelingelementproperty_cast<QUmlPseudostate *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlPseudostateObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTransition *element, qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlTransition *element, qmodelingelementproperty_cast<QUmlPseudostate *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -165,23 +168,23 @@ const QSet<QObject *> QUmlPseudostateObject::outgoings() const
 
 QtUml::PseudostateKind QUmlPseudostateObject::kind() const
 {
-    return qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->kind();
+    return qmodelingelementproperty_cast<QUmlPseudostate *>(this)->kind();
 }
 
 QObject *QUmlPseudostateObject::state() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->state())
+    if (!qmodelingelementproperty_cast<QUmlPseudostate *>(this)->state())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->state()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPseudostate *>(this)->state()->asQModelingObject();
 }
 
 QObject *QUmlPseudostateObject::stateMachine() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->stateMachine())
+    if (!qmodelingelementproperty_cast<QUmlPseudostate *>(this)->stateMachine())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->stateMachine()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPseudostate *>(this)->stateMachine()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -189,14 +192,14 @@ QObject *QUmlPseudostateObject::stateMachine() const
 QSet<QObject *> QUmlPseudostateObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlPseudostate *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlPseudostateObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlPseudostate *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -204,150 +207,215 @@ bool QUmlPseudostateObject::mustBeOwned() const
 QList<QObject *> QUmlPseudostateObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlPseudostate *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlPseudostateObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlPseudostate *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlPseudostateObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlPseudostate *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlPseudostateObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlPseudostate *>(this)->separator();
 }
 
 // OPERATIONS [Vertex]
 
 QObject *QUmlPseudostateObject::containingStateMachine() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->containingStateMachine())
+    if (!qmodelingelementproperty_cast<QUmlPseudostate *>(this)->containingStateMachine())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->containingStateMachine()->asQObject();
+        return qmodelingelementproperty_cast<QUmlPseudostate *>(this)->containingStateMachine()->asQModelingObject();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlPseudostateObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlPseudostate *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlPseudostateObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlPseudostate *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlPseudostateObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlPseudostate *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlPseudostateObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlPseudostate *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlPseudostateObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlPseudostate *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlPseudostateObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlPseudostate *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlPseudostateObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlPseudostate *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlPseudostateObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlPseudostate *>(this)->setName(name);
 }
 
 void QUmlPseudostateObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlPseudostate *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlPseudostateObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlPseudostate *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlPseudostateObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlPseudostate *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlPseudostateObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlPseudostate *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Vertex]
 
 void QUmlPseudostateObject::setContainer(QObject *container)
 {
-    qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->setContainer(qmodelingobjectproperty_cast<QUmlRegion *>(container));
+    qmodelingelementproperty_cast<QUmlPseudostate *>(this)->setContainer(qmodelingelementproperty_cast<QUmlRegion *>(container));
 }
 
 void QUmlPseudostateObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlTransition *>(incoming));
+    qmodelingelementproperty_cast<QUmlPseudostate *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlTransition *>(incoming));
 }
 
 void QUmlPseudostateObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlTransition *>(incoming));
+    qmodelingelementproperty_cast<QUmlPseudostate *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlTransition *>(incoming));
 }
 
 void QUmlPseudostateObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlTransition *>(outgoing));
+    qmodelingelementproperty_cast<QUmlPseudostate *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlTransition *>(outgoing));
 }
 
 void QUmlPseudostateObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlTransition *>(outgoing));
+    qmodelingelementproperty_cast<QUmlPseudostate *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlTransition *>(outgoing));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Pseudostate]
 
 void QUmlPseudostateObject::setKind(QtUml::PseudostateKind kind)
 {
-    qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->setKind(kind);
+    qmodelingelementproperty_cast<QUmlPseudostate *>(this)->setKind(kind);
 }
 
 void QUmlPseudostateObject::unsetKind()
 {
-    qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("kind"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("kind"));
 }
 
 void QUmlPseudostateObject::setState(QObject *state)
 {
-    qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->setState(qmodelingobjectproperty_cast<QUmlState *>(state));
+    qmodelingelementproperty_cast<QUmlPseudostate *>(this)->setState(qmodelingelementproperty_cast<QUmlState *>(state));
 }
 
 void QUmlPseudostateObject::setStateMachine(QObject *stateMachine)
 {
-    qmodelingobjectproperty_cast<QUmlPseudostate *>(this)->setStateMachine(qmodelingobjectproperty_cast<QUmlStateMachine *>(stateMachine));
+    qmodelingelementproperty_cast<QUmlPseudostate *>(this)->setStateMachine(qmodelingelementproperty_cast<QUmlStateMachine *>(stateMachine));
+}
+
+
+void QUmlPseudostateObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlVertex");
+    d->groupProperties.insert(QStringLiteral("QUmlVertex"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("container"))));
+    d->groupProperties.insert(QStringLiteral("QUmlVertex"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlVertex"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPseudostate");
+    d->groupProperties.insert(QStringLiteral("QUmlPseudostate"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("kind"))));
+    d->groupProperties.insert(QStringLiteral("QUmlPseudostate"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("state"))));
+    d->groupProperties.insert(QStringLiteral("QUmlPseudostate"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("stateMachine"))));
+}
+
+void QUmlPseudostateObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPseudostate, kind, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPseudostate, kind, PropertyClassRole, QStringLiteral("QUmlPseudostate"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPseudostate, kind, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPseudostate, kind, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPseudostate, kind, DocumentationRole, QStringLiteral("Determines the precise type of the Pseudostate and can be one of: entryPoint, exitPoint, initial, deepHistory, shallowHistory, join, fork, junction, terminate or choice."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPseudostate, kind, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPseudostate, kind, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPseudostate, kind, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPseudostate, state, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPseudostate, state, PropertyClassRole, QStringLiteral("QUmlPseudostate"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPseudostate, state, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPseudostate, state, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPseudostate, state, DocumentationRole, QStringLiteral("The State that owns this pseudostate and in which it appears."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPseudostate, state, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPseudostate, state, SubsettedPropertiesRole, QStringLiteral("NamedElement-namespace"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPseudostate, state, OppositeEndRole, QStringLiteral("State-connectionPoint"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPseudostate, stateMachine, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPseudostate, stateMachine, PropertyClassRole, QStringLiteral("QUmlPseudostate"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPseudostate, stateMachine, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPseudostate, stateMachine, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPseudostate, stateMachine, DocumentationRole, QStringLiteral("The StateMachine in which this Pseudostate is defined. This only applies to Pseudostates of the kind entryPoint or exitPoint."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPseudostate, stateMachine, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPseudostate, stateMachine, SubsettedPropertiesRole, QStringLiteral("NamedElement-namespace"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlPseudostate, stateMachine, OppositeEndRole, QStringLiteral("StateMachine-connectionPoint"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlpseudostateobject_p.h b/src/uml/qobjects/qumlpseudostateobject_p.h
index d8405aae..30223ff1 100644
--- a/src/uml/qobjects/qumlpseudostateobject_p.h
+++ b/src/uml/qobjects/qumlpseudostateobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlPseudostate;
-class Q_UML_EXPORT QUmlPseudostateObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlPseudostateObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlPseudostateObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -82,7 +85,7 @@ class Q_UML_EXPORT QUmlPseudostateObject : public QObject
     Q_PROPERTY(QObject * stateMachine READ stateMachine WRITE setStateMachine)
 
 public:
-    Q_INVOKABLE explicit QUmlPseudostateObject(QUmlPseudostate *qModelingObject);
+    Q_INVOKABLE explicit QUmlPseudostateObject(QUmlPseudostate *qModelingElement);
     virtual ~QUmlPseudostateObject();
 
     // Owned attributes [Element]
@@ -151,6 +154,10 @@ public Q_SLOTS:
     void unsetKind();
     void setState(QObject *state = 0);
     void setStateMachine(QObject *stateMachine = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlqualifiervalueobject.cpp b/src/uml/qobjects/qumlqualifiervalueobject.cpp
index c7821637..814da315 100644
--- a/src/uml/qobjects/qumlqualifiervalueobject.cpp
+++ b/src/uml/qobjects/qumlqualifiervalueobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlqualifiervalueobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlQualifierValue>
 #include <QtUml/QUmlComment>
@@ -48,16 +49,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlQualifierValueObject::QUmlQualifierValueObject(QUmlQualifierValue *qModelingObject)
+QUmlQualifierValueObject::QUmlQualifierValueObject(QUmlQualifierValue *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlQualifierValueObject::~QUmlQualifierValueObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlQualifierValue *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlQualifierValue *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -66,43 +69,43 @@ QUmlQualifierValueObject::~QUmlQualifierValueObject()
 const QSet<QObject *> QUmlQualifierValueObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlQualifierValue *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlQualifierValue *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlQualifierValueObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlQualifierValue *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlQualifierValue *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlQualifierValueObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlQualifierValue *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlQualifierValue *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlQualifierValue *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlQualifierValue *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [QualifierValue]
 
 QObject *QUmlQualifierValueObject::qualifier() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlQualifierValue *>(this)->qualifier())
+    if (!qmodelingelementproperty_cast<QUmlQualifierValue *>(this)->qualifier())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlQualifierValue *>(this)->qualifier()->asQObject();
+        return qmodelingelementproperty_cast<QUmlQualifierValue *>(this)->qualifier()->asQModelingObject();
 }
 
 QObject *QUmlQualifierValueObject::value() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlQualifierValue *>(this)->value())
+    if (!qmodelingelementproperty_cast<QUmlQualifierValue *>(this)->value())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlQualifierValue *>(this)->value()->asQObject();
+        return qmodelingelementproperty_cast<QUmlQualifierValue *>(this)->value()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -110,53 +113,94 @@ QObject *QUmlQualifierValueObject::value() const
 QSet<QObject *> QUmlQualifierValueObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlQualifierValue *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlQualifierValue *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlQualifierValueObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlQualifierValue *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlQualifierValue *>(this)->mustBeOwned();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlQualifierValueObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlQualifierValue *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlQualifierValue *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlQualifierValueObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlQualifierValue *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlQualifierValue *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlQualifierValueObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlQualifierValue *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlQualifierValue *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlQualifierValueObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlQualifierValue *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlQualifierValue *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlQualifierValueObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlQualifierValue *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlQualifierValue *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [QualifierValue]
 
 void QUmlQualifierValueObject::setQualifier(QObject *qualifier)
 {
-    qmodelingobjectproperty_cast<QUmlQualifierValue *>(this)->setQualifier(qmodelingobjectproperty_cast<QUmlProperty *>(qualifier));
+    qmodelingelementproperty_cast<QUmlQualifierValue *>(this)->setQualifier(qmodelingelementproperty_cast<QUmlProperty *>(qualifier));
 }
 
 void QUmlQualifierValueObject::setValue(QObject *value)
 {
-    qmodelingobjectproperty_cast<QUmlQualifierValue *>(this)->setValue(qmodelingobjectproperty_cast<QUmlInputPin *>(value));
+    qmodelingelementproperty_cast<QUmlQualifierValue *>(this)->setValue(qmodelingelementproperty_cast<QUmlInputPin *>(value));
+}
+
+
+void QUmlQualifierValueObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlQualifierValue");
+    d->groupProperties.insert(QStringLiteral("QUmlQualifierValue"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifier"))));
+    d->groupProperties.insert(QStringLiteral("QUmlQualifierValue"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("value"))));
+}
+
+void QUmlQualifierValueObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlQualifierValue, qualifier, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlQualifierValue, qualifier, PropertyClassRole, QStringLiteral("QUmlQualifierValue"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlQualifierValue, qualifier, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlQualifierValue, qualifier, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlQualifierValue, qualifier, DocumentationRole, QStringLiteral("Attribute representing the qualifier for which the value is to be specified."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlQualifierValue, qualifier, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlQualifierValue, qualifier, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlQualifierValue, qualifier, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlQualifierValue, value, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlQualifierValue, value, PropertyClassRole, QStringLiteral("QUmlQualifierValue"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlQualifierValue, value, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlQualifierValue, value, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlQualifierValue, value, DocumentationRole, QStringLiteral("Input pin from which the specified value for the qualifier is taken."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlQualifierValue, value, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlQualifierValue, value, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlQualifierValue, value, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlqualifiervalueobject_p.h b/src/uml/qobjects/qumlqualifiervalueobject_p.h
index b74f6df3..4ed939d6 100644
--- a/src/uml/qobjects/qumlqualifiervalueobject_p.h
+++ b/src/uml/qobjects/qumlqualifiervalueobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 QT_BEGIN_HEADER
 
@@ -52,9 +52,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlQualifierValue;
-class Q_UML_EXPORT QUmlQualifierValueObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlQualifierValueObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlQualifierValueObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -66,7 +69,7 @@ class Q_UML_EXPORT QUmlQualifierValueObject : public QObject
     Q_PROPERTY(QObject * value READ value WRITE setValue)
 
 public:
-    Q_INVOKABLE explicit QUmlQualifierValueObject(QUmlQualifierValue *qModelingObject);
+    Q_INVOKABLE explicit QUmlQualifierValueObject(QUmlQualifierValue *qModelingElement);
     virtual ~QUmlQualifierValueObject();
 
     // Owned attributes [Element]
@@ -94,6 +97,10 @@ public Q_SLOTS:
     // Slots for owned attributes [QualifierValue]
     void setQualifier(QObject *qualifier = 0);
     void setValue(QObject *value = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlraiseexceptionactionobject.cpp b/src/uml/qobjects/qumlraiseexceptionactionobject.cpp
index 04495016..6d0e0510 100644
--- a/src/uml/qobjects/qumlraiseexceptionactionobject.cpp
+++ b/src/uml/qobjects/qumlraiseexceptionactionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlraiseexceptionactionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlRaiseExceptionAction>
 #include <QtUml/QUmlActivity>
@@ -64,16 +65,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlRaiseExceptionActionObject::QUmlRaiseExceptionActionObject(QUmlRaiseExceptionAction *qModelingObject)
+QUmlRaiseExceptionActionObject::QUmlRaiseExceptionActionObject(QUmlRaiseExceptionAction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlRaiseExceptionActionObject::~QUmlRaiseExceptionActionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -82,25 +85,25 @@ QUmlRaiseExceptionActionObject::~QUmlRaiseExceptionActionObject()
 const QSet<QObject *> QUmlRaiseExceptionActionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlRaiseExceptionActionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlRaiseExceptionActionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -108,62 +111,62 @@ QObject *QUmlRaiseExceptionActionObject::owner() const
 const QSet<QObject *> QUmlRaiseExceptionActionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlRaiseExceptionActionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->name();
 }
 
 QObject *QUmlRaiseExceptionActionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlRaiseExceptionActionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlRaiseExceptionActionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlRaiseExceptionActionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlRaiseExceptionActionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlRaiseExceptionActionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlRaiseExceptionActionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -171,65 +174,65 @@ const QSet<QObject *> QUmlRaiseExceptionActionObject::redefinitionContexts() con
 
 QObject *QUmlRaiseExceptionActionObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlRaiseExceptionActionObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlRaiseExceptionActionObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlRaiseExceptionActionObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlRaiseExceptionActionObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlRaiseExceptionActionObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlRaiseExceptionActionObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlRaiseExceptionActionObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -238,8 +241,8 @@ const QSet<QObject *> QUmlRaiseExceptionActionObject::redefinedNodes() const
 const QSet<QObject *> QUmlRaiseExceptionActionObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -247,46 +250,46 @@ const QSet<QObject *> QUmlRaiseExceptionActionObject::handlers() const
 
 QObject *QUmlRaiseExceptionActionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlRaiseExceptionActionObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlRaiseExceptionActionObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlRaiseExceptionActionObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlRaiseExceptionActionObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlRaiseExceptionActionObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -294,10 +297,10 @@ const QList<QObject *> QUmlRaiseExceptionActionObject::outputs() const
 
 QObject *QUmlRaiseExceptionActionObject::exception() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->exception())
+    if (!qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->exception())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->exception()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->exception()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -305,14 +308,14 @@ QObject *QUmlRaiseExceptionActionObject::exception() const
 QSet<QObject *> QUmlRaiseExceptionActionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlRaiseExceptionActionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -320,283 +323,350 @@ bool QUmlRaiseExceptionActionObject::mustBeOwned() const
 QList<QObject *> QUmlRaiseExceptionActionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlRaiseExceptionActionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlRaiseExceptionActionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlRaiseExceptionActionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlRaiseExceptionActionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlRaiseExceptionActionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlRaiseExceptionActionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlRaiseExceptionActionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlRaiseExceptionActionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlRaiseExceptionActionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlRaiseExceptionActionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlRaiseExceptionActionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlRaiseExceptionActionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlRaiseExceptionActionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->setName(name);
 }
 
 void QUmlRaiseExceptionActionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlRaiseExceptionActionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlRaiseExceptionActionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlRaiseExceptionActionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlRaiseExceptionActionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlRaiseExceptionActionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlRaiseExceptionActionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlRaiseExceptionActionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlRaiseExceptionActionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlRaiseExceptionActionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlRaiseExceptionActionObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlRaiseExceptionActionObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlRaiseExceptionActionObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlRaiseExceptionActionObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlRaiseExceptionActionObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlRaiseExceptionActionObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlRaiseExceptionActionObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlRaiseExceptionActionObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlRaiseExceptionActionObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlRaiseExceptionActionObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlRaiseExceptionActionObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlRaiseExceptionActionObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlRaiseExceptionActionObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlRaiseExceptionActionObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlRaiseExceptionActionObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlRaiseExceptionActionObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlRaiseExceptionActionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlRaiseExceptionActionObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlRaiseExceptionActionObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlRaiseExceptionActionObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlRaiseExceptionActionObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlRaiseExceptionActionObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlRaiseExceptionActionObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlRaiseExceptionActionObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlRaiseExceptionActionObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlRaiseExceptionActionObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlRaiseExceptionActionObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RaiseExceptionAction]
 
 void QUmlRaiseExceptionActionObject::setException(QObject *exception)
 {
-    qmodelingobjectproperty_cast<QUmlRaiseExceptionAction *>(this)->setException(qmodelingobjectproperty_cast<QUmlInputPin *>(exception));
+    qmodelingelementproperty_cast<QUmlRaiseExceptionAction *>(this)->setException(qmodelingelementproperty_cast<QUmlInputPin *>(exception));
+}
+
+
+void QUmlRaiseExceptionActionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRaiseExceptionAction");
+    d->groupProperties.insert(QStringLiteral("QUmlRaiseExceptionAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("exception"))));
+}
+
+void QUmlRaiseExceptionActionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRaiseExceptionAction, exception, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRaiseExceptionAction, exception, PropertyClassRole, QStringLiteral("QUmlRaiseExceptionAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRaiseExceptionAction, exception, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRaiseExceptionAction, exception, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRaiseExceptionAction, exception, DocumentationRole, QStringLiteral("An input pin whose value becomes an exception object."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRaiseExceptionAction, exception, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRaiseExceptionAction, exception, SubsettedPropertiesRole, QStringLiteral("Action-input"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRaiseExceptionAction, exception, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlraiseexceptionactionobject_p.h b/src/uml/qobjects/qumlraiseexceptionactionobject_p.h
index 93357433..146fe0d0 100644
--- a/src/uml/qobjects/qumlraiseexceptionactionobject_p.h
+++ b/src/uml/qobjects/qumlraiseexceptionactionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlRaiseExceptionAction;
-class Q_UML_EXPORT QUmlRaiseExceptionActionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlRaiseExceptionActionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlRaiseExceptionActionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -101,7 +104,7 @@ class Q_UML_EXPORT QUmlRaiseExceptionActionObject : public QObject
     Q_PROPERTY(QObject * exception READ exception WRITE setException)
 
 public:
-    Q_INVOKABLE explicit QUmlRaiseExceptionActionObject(QUmlRaiseExceptionAction *qModelingObject);
+    Q_INVOKABLE explicit QUmlRaiseExceptionActionObject(QUmlRaiseExceptionAction *qModelingElement);
     virtual ~QUmlRaiseExceptionActionObject();
 
     // Owned attributes [Element]
@@ -221,6 +224,10 @@ public Q_SLOTS:
 
     // Slots for owned attributes [RaiseExceptionAction]
     void setException(QObject *exception = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlreadextentactionobject.cpp b/src/uml/qobjects/qumlreadextentactionobject.cpp
index ef0ba42a..75a926b5 100644
--- a/src/uml/qobjects/qumlreadextentactionobject.cpp
+++ b/src/uml/qobjects/qumlreadextentactionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlreadextentactionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlReadExtentAction>
 #include <QtUml/QUmlActivity>
@@ -64,16 +65,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlReadExtentActionObject::QUmlReadExtentActionObject(QUmlReadExtentAction *qModelingObject)
+QUmlReadExtentActionObject::QUmlReadExtentActionObject(QUmlReadExtentAction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlReadExtentActionObject::~QUmlReadExtentActionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -82,25 +85,25 @@ QUmlReadExtentActionObject::~QUmlReadExtentActionObject()
 const QSet<QObject *> QUmlReadExtentActionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadExtentActionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlReadExtentActionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -108,62 +111,62 @@ QObject *QUmlReadExtentActionObject::owner() const
 const QSet<QObject *> QUmlReadExtentActionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlReadExtentActionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->name();
 }
 
 QObject *QUmlReadExtentActionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlReadExtentActionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlReadExtentActionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlReadExtentActionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlReadExtentActionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlReadExtentActionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadExtentActionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -171,65 +174,65 @@ const QSet<QObject *> QUmlReadExtentActionObject::redefinitionContexts() const
 
 QObject *QUmlReadExtentActionObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlReadExtentActionObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadExtentActionObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadExtentActionObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlReadExtentActionObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlReadExtentActionObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadExtentActionObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadExtentActionObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -238,8 +241,8 @@ const QSet<QObject *> QUmlReadExtentActionObject::redefinedNodes() const
 const QSet<QObject *> QUmlReadExtentActionObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -247,46 +250,46 @@ const QSet<QObject *> QUmlReadExtentActionObject::handlers() const
 
 QObject *QUmlReadExtentActionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlReadExtentActionObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlReadExtentActionObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlReadExtentActionObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadExtentActionObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlReadExtentActionObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -294,18 +297,18 @@ const QList<QObject *> QUmlReadExtentActionObject::outputs() const
 
 QObject *QUmlReadExtentActionObject::classifier() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->classifier())
+    if (!qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->classifier())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->classifier()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->classifier()->asQModelingObject();
 }
 
 QObject *QUmlReadExtentActionObject::result() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->result())
+    if (!qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->result())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->result()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->result()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -313,14 +316,14 @@ QObject *QUmlReadExtentActionObject::result() const
 QSet<QObject *> QUmlReadExtentActionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlReadExtentActionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -328,288 +331,365 @@ bool QUmlReadExtentActionObject::mustBeOwned() const
 QList<QObject *> QUmlReadExtentActionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlReadExtentActionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlReadExtentActionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlReadExtentActionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlReadExtentActionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlReadExtentActionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlReadExtentActionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlReadExtentActionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlReadExtentActionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlReadExtentActionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlReadExtentActionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlReadExtentActionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlReadExtentActionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlReadExtentActionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->setName(name);
 }
 
 void QUmlReadExtentActionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlReadExtentActionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlReadExtentActionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlReadExtentActionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlReadExtentActionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlReadExtentActionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlReadExtentActionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlReadExtentActionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlReadExtentActionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlReadExtentActionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlReadExtentActionObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlReadExtentActionObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlReadExtentActionObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlReadExtentActionObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlReadExtentActionObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlReadExtentActionObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlReadExtentActionObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlReadExtentActionObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlReadExtentActionObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlReadExtentActionObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlReadExtentActionObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlReadExtentActionObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlReadExtentActionObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlReadExtentActionObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlReadExtentActionObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlReadExtentActionObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlReadExtentActionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlReadExtentActionObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlReadExtentActionObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlReadExtentActionObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlReadExtentActionObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlReadExtentActionObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlReadExtentActionObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlReadExtentActionObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlReadExtentActionObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlReadExtentActionObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlReadExtentActionObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ReadExtentAction]
 
 void QUmlReadExtentActionObject::setClassifier(QObject *classifier)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->setClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(classifier));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->setClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(classifier));
 }
 
 void QUmlReadExtentActionObject::setResult(QObject *result)
 {
-    qmodelingobjectproperty_cast<QUmlReadExtentAction *>(this)->setResult(qmodelingobjectproperty_cast<QUmlOutputPin *>(result));
+    qmodelingelementproperty_cast<QUmlReadExtentAction *>(this)->setResult(qmodelingelementproperty_cast<QUmlOutputPin *>(result));
+}
+
+
+void QUmlReadExtentActionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlReadExtentAction");
+    d->groupProperties.insert(QStringLiteral("QUmlReadExtentAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifier"))));
+    d->groupProperties.insert(QStringLiteral("QUmlReadExtentAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("result"))));
+}
+
+void QUmlReadExtentActionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadExtentAction, classifier, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadExtentAction, classifier, PropertyClassRole, QStringLiteral("QUmlReadExtentAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadExtentAction, classifier, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadExtentAction, classifier, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadExtentAction, classifier, DocumentationRole, QStringLiteral("The classifier whose instances are to be retrieved."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadExtentAction, classifier, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadExtentAction, classifier, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadExtentAction, classifier, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadExtentAction, result, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadExtentAction, result, PropertyClassRole, QStringLiteral("QUmlReadExtentAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadExtentAction, result, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadExtentAction, result, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadExtentAction, result, DocumentationRole, QStringLiteral("The runtime instances of the classifier."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadExtentAction, result, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadExtentAction, result, SubsettedPropertiesRole, QStringLiteral("Action-output"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadExtentAction, result, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlreadextentactionobject_p.h b/src/uml/qobjects/qumlreadextentactionobject_p.h
index a23e1738..d28d2f6f 100644
--- a/src/uml/qobjects/qumlreadextentactionobject_p.h
+++ b/src/uml/qobjects/qumlreadextentactionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlReadExtentAction;
-class Q_UML_EXPORT QUmlReadExtentActionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlReadExtentActionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlReadExtentActionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -102,7 +105,7 @@ class Q_UML_EXPORT QUmlReadExtentActionObject : public QObject
     Q_PROPERTY(QObject * result READ result WRITE setResult)
 
 public:
-    Q_INVOKABLE explicit QUmlReadExtentActionObject(QUmlReadExtentAction *qModelingObject);
+    Q_INVOKABLE explicit QUmlReadExtentActionObject(QUmlReadExtentAction *qModelingElement);
     virtual ~QUmlReadExtentActionObject();
 
     // Owned attributes [Element]
@@ -224,6 +227,10 @@ public Q_SLOTS:
     // Slots for owned attributes [ReadExtentAction]
     void setClassifier(QObject *classifier = 0);
     void setResult(QObject *result = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlreadisclassifiedobjectactionobject.cpp b/src/uml/qobjects/qumlreadisclassifiedobjectactionobject.cpp
index c5180e4c..1675c282 100644
--- a/src/uml/qobjects/qumlreadisclassifiedobjectactionobject.cpp
+++ b/src/uml/qobjects/qumlreadisclassifiedobjectactionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlreadisclassifiedobjectactionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlReadIsClassifiedObjectAction>
 #include <QtUml/QUmlActivity>
@@ -64,16 +65,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlReadIsClassifiedObjectActionObject::QUmlReadIsClassifiedObjectActionObject(QUmlReadIsClassifiedObjectAction *qModelingObject)
+QUmlReadIsClassifiedObjectActionObject::QUmlReadIsClassifiedObjectActionObject(QUmlReadIsClassifiedObjectAction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlReadIsClassifiedObjectActionObject::~QUmlReadIsClassifiedObjectActionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -82,25 +85,25 @@ QUmlReadIsClassifiedObjectActionObject::~QUmlReadIsClassifiedObjectActionObject(
 const QSet<QObject *> QUmlReadIsClassifiedObjectActionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadIsClassifiedObjectActionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlReadIsClassifiedObjectActionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -108,62 +111,62 @@ QObject *QUmlReadIsClassifiedObjectActionObject::owner() const
 const QSet<QObject *> QUmlReadIsClassifiedObjectActionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlReadIsClassifiedObjectActionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->name();
 }
 
 QObject *QUmlReadIsClassifiedObjectActionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlReadIsClassifiedObjectActionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlReadIsClassifiedObjectActionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlReadIsClassifiedObjectActionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlReadIsClassifiedObjectActionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlReadIsClassifiedObjectActionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadIsClassifiedObjectActionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -171,65 +174,65 @@ const QSet<QObject *> QUmlReadIsClassifiedObjectActionObject::redefinitionContex
 
 QObject *QUmlReadIsClassifiedObjectActionObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlReadIsClassifiedObjectActionObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadIsClassifiedObjectActionObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadIsClassifiedObjectActionObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlReadIsClassifiedObjectActionObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlReadIsClassifiedObjectActionObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadIsClassifiedObjectActionObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadIsClassifiedObjectActionObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -238,8 +241,8 @@ const QSet<QObject *> QUmlReadIsClassifiedObjectActionObject::redefinedNodes() c
 const QSet<QObject *> QUmlReadIsClassifiedObjectActionObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -247,46 +250,46 @@ const QSet<QObject *> QUmlReadIsClassifiedObjectActionObject::handlers() const
 
 QObject *QUmlReadIsClassifiedObjectActionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlReadIsClassifiedObjectActionObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlReadIsClassifiedObjectActionObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlReadIsClassifiedObjectActionObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadIsClassifiedObjectActionObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlReadIsClassifiedObjectActionObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -294,31 +297,31 @@ const QList<QObject *> QUmlReadIsClassifiedObjectActionObject::outputs() const
 
 QObject *QUmlReadIsClassifiedObjectActionObject::classifier() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->classifier())
+    if (!qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->classifier())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->classifier()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->classifier()->asQModelingObject();
 }
 
 bool QUmlReadIsClassifiedObjectActionObject::isDirect() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->isDirect();
+    return qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->isDirect();
 }
 
 QObject *QUmlReadIsClassifiedObjectActionObject::object() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->object())
+    if (!qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->object())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->object()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->object()->asQModelingObject();
 }
 
 QObject *QUmlReadIsClassifiedObjectActionObject::result() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->result())
+    if (!qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->result())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->result()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->result()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -326,14 +329,14 @@ QObject *QUmlReadIsClassifiedObjectActionObject::result() const
 QSet<QObject *> QUmlReadIsClassifiedObjectActionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlReadIsClassifiedObjectActionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -341,303 +344,401 @@ bool QUmlReadIsClassifiedObjectActionObject::mustBeOwned() const
 QList<QObject *> QUmlReadIsClassifiedObjectActionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlReadIsClassifiedObjectActionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlReadIsClassifiedObjectActionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlReadIsClassifiedObjectActionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlReadIsClassifiedObjectActionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlReadIsClassifiedObjectActionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlReadIsClassifiedObjectActionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlReadIsClassifiedObjectActionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlReadIsClassifiedObjectActionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlReadIsClassifiedObjectActionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlReadIsClassifiedObjectActionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlReadIsClassifiedObjectActionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlReadIsClassifiedObjectActionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlReadIsClassifiedObjectActionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->setName(name);
 }
 
 void QUmlReadIsClassifiedObjectActionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlReadIsClassifiedObjectActionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlReadIsClassifiedObjectActionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlReadIsClassifiedObjectActionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlReadIsClassifiedObjectActionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlReadIsClassifiedObjectActionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlReadIsClassifiedObjectActionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlReadIsClassifiedObjectActionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlReadIsClassifiedObjectActionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlReadIsClassifiedObjectActionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlReadIsClassifiedObjectActionObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlReadIsClassifiedObjectActionObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlReadIsClassifiedObjectActionObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlReadIsClassifiedObjectActionObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlReadIsClassifiedObjectActionObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlReadIsClassifiedObjectActionObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlReadIsClassifiedObjectActionObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlReadIsClassifiedObjectActionObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlReadIsClassifiedObjectActionObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlReadIsClassifiedObjectActionObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlReadIsClassifiedObjectActionObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlReadIsClassifiedObjectActionObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlReadIsClassifiedObjectActionObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlReadIsClassifiedObjectActionObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlReadIsClassifiedObjectActionObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlReadIsClassifiedObjectActionObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlReadIsClassifiedObjectActionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlReadIsClassifiedObjectActionObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlReadIsClassifiedObjectActionObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlReadIsClassifiedObjectActionObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlReadIsClassifiedObjectActionObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlReadIsClassifiedObjectActionObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlReadIsClassifiedObjectActionObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlReadIsClassifiedObjectActionObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlReadIsClassifiedObjectActionObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlReadIsClassifiedObjectActionObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlReadIsClassifiedObjectActionObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ReadIsClassifiedObjectAction]
 
 void QUmlReadIsClassifiedObjectActionObject::setClassifier(QObject *classifier)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->setClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(classifier));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->setClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(classifier));
 }
 
 void QUmlReadIsClassifiedObjectActionObject::setDirect(bool isDirect)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->setDirect(isDirect);
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->setDirect(isDirect);
 }
 
 void QUmlReadIsClassifiedObjectActionObject::unsetDirect()
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("direct"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("direct"));
 }
 
 void QUmlReadIsClassifiedObjectActionObject::setObject(QObject *object)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->setObject(qmodelingobjectproperty_cast<QUmlInputPin *>(object));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->setObject(qmodelingelementproperty_cast<QUmlInputPin *>(object));
 }
 
 void QUmlReadIsClassifiedObjectActionObject::setResult(QObject *result)
 {
-    qmodelingobjectproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->setResult(qmodelingobjectproperty_cast<QUmlOutputPin *>(result));
+    qmodelingelementproperty_cast<QUmlReadIsClassifiedObjectAction *>(this)->setResult(qmodelingelementproperty_cast<QUmlOutputPin *>(result));
+}
+
+
+void QUmlReadIsClassifiedObjectActionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlReadIsClassifiedObjectAction");
+    d->groupProperties.insert(QStringLiteral("QUmlReadIsClassifiedObjectAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifier"))));
+    d->groupProperties.insert(QStringLiteral("QUmlReadIsClassifiedObjectAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isDirect"))));
+    d->groupProperties.insert(QStringLiteral("QUmlReadIsClassifiedObjectAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("object"))));
+    d->groupProperties.insert(QStringLiteral("QUmlReadIsClassifiedObjectAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("result"))));
+}
+
+void QUmlReadIsClassifiedObjectActionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadIsClassifiedObjectAction, classifier, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadIsClassifiedObjectAction, classifier, PropertyClassRole, QStringLiteral("QUmlReadIsClassifiedObjectAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadIsClassifiedObjectAction, classifier, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadIsClassifiedObjectAction, classifier, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadIsClassifiedObjectAction, classifier, DocumentationRole, QStringLiteral("The classifier against which the classification of the input object is tested."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadIsClassifiedObjectAction, classifier, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadIsClassifiedObjectAction, classifier, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadIsClassifiedObjectAction, classifier, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadIsClassifiedObjectAction, isDirect, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadIsClassifiedObjectAction, isDirect, PropertyClassRole, QStringLiteral("QUmlReadIsClassifiedObjectAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadIsClassifiedObjectAction, isDirect, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadIsClassifiedObjectAction, isDirect, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadIsClassifiedObjectAction, isDirect, DocumentationRole, QStringLiteral("Indicates whether the classifier must directly classify the input object."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadIsClassifiedObjectAction, isDirect, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadIsClassifiedObjectAction, isDirect, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadIsClassifiedObjectAction, isDirect, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadIsClassifiedObjectAction, object, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadIsClassifiedObjectAction, object, PropertyClassRole, QStringLiteral("QUmlReadIsClassifiedObjectAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadIsClassifiedObjectAction, object, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadIsClassifiedObjectAction, object, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadIsClassifiedObjectAction, object, DocumentationRole, QStringLiteral("Holds the object whose classification is to be tested."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadIsClassifiedObjectAction, object, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadIsClassifiedObjectAction, object, SubsettedPropertiesRole, QStringLiteral("Action-input"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadIsClassifiedObjectAction, object, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadIsClassifiedObjectAction, result, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadIsClassifiedObjectAction, result, PropertyClassRole, QStringLiteral("QUmlReadIsClassifiedObjectAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadIsClassifiedObjectAction, result, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadIsClassifiedObjectAction, result, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadIsClassifiedObjectAction, result, DocumentationRole, QStringLiteral("After termination of the action, will hold the result of the test."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadIsClassifiedObjectAction, result, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadIsClassifiedObjectAction, result, SubsettedPropertiesRole, QStringLiteral("Action-output"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadIsClassifiedObjectAction, result, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlreadisclassifiedobjectactionobject_p.h b/src/uml/qobjects/qumlreadisclassifiedobjectactionobject_p.h
index 32241a86..04a2f6df 100644
--- a/src/uml/qobjects/qumlreadisclassifiedobjectactionobject_p.h
+++ b/src/uml/qobjects/qumlreadisclassifiedobjectactionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlReadIsClassifiedObjectAction;
-class Q_UML_EXPORT QUmlReadIsClassifiedObjectActionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlReadIsClassifiedObjectActionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlReadIsClassifiedObjectActionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -104,7 +107,7 @@ class Q_UML_EXPORT QUmlReadIsClassifiedObjectActionObject : public QObject
     Q_PROPERTY(QObject * result READ result WRITE setResult)
 
 public:
-    Q_INVOKABLE explicit QUmlReadIsClassifiedObjectActionObject(QUmlReadIsClassifiedObjectAction *qModelingObject);
+    Q_INVOKABLE explicit QUmlReadIsClassifiedObjectActionObject(QUmlReadIsClassifiedObjectAction *qModelingElement);
     virtual ~QUmlReadIsClassifiedObjectActionObject();
 
     // Owned attributes [Element]
@@ -231,6 +234,10 @@ public Q_SLOTS:
     void unsetDirect();
     void setObject(QObject *object = 0);
     void setResult(QObject *result = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlreadlinkactionobject.cpp b/src/uml/qobjects/qumlreadlinkactionobject.cpp
index 5448c371..3de68587 100644
--- a/src/uml/qobjects/qumlreadlinkactionobject.cpp
+++ b/src/uml/qobjects/qumlreadlinkactionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlreadlinkactionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlReadLinkAction>
 #include <QtUml/QUmlActivity>
@@ -66,16 +67,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlReadLinkActionObject::QUmlReadLinkActionObject(QUmlReadLinkAction *qModelingObject)
+QUmlReadLinkActionObject::QUmlReadLinkActionObject(QUmlReadLinkAction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlReadLinkActionObject::~QUmlReadLinkActionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -84,25 +87,25 @@ QUmlReadLinkActionObject::~QUmlReadLinkActionObject()
 const QSet<QObject *> QUmlReadLinkActionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadLinkActionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlReadLinkActionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -110,62 +113,62 @@ QObject *QUmlReadLinkActionObject::owner() const
 const QSet<QObject *> QUmlReadLinkActionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlReadLinkActionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->name();
 }
 
 QObject *QUmlReadLinkActionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlReadLinkActionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlReadLinkActionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlReadLinkActionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlReadLinkActionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlReadLinkActionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadLinkActionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -173,65 +176,65 @@ const QSet<QObject *> QUmlReadLinkActionObject::redefinitionContexts() const
 
 QObject *QUmlReadLinkActionObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlReadLinkActionObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadLinkActionObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadLinkActionObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlReadLinkActionObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlReadLinkActionObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadLinkActionObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadLinkActionObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -240,8 +243,8 @@ const QSet<QObject *> QUmlReadLinkActionObject::redefinedNodes() const
 const QSet<QObject *> QUmlReadLinkActionObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -249,46 +252,46 @@ const QSet<QObject *> QUmlReadLinkActionObject::handlers() const
 
 QObject *QUmlReadLinkActionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlReadLinkActionObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlReadLinkActionObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlReadLinkActionObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadLinkActionObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlReadLinkActionObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -297,16 +300,16 @@ const QList<QObject *> QUmlReadLinkActionObject::outputs() const
 const QSet<QObject *> QUmlReadLinkActionObject::endData() const
 {
     QSet<QObject *> set;
-    foreach (QUmlLinkEndData *element, qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->endData())
-        set.insert(element->asQObject());
+    foreach (QUmlLinkEndData *element, qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->endData())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadLinkActionObject::inputValues() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->inputValues())
-        set.insert(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->inputValues())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -314,10 +317,10 @@ const QSet<QObject *> QUmlReadLinkActionObject::inputValues() const
 
 QObject *QUmlReadLinkActionObject::result() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->result())
+    if (!qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->result())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->result()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->result()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -325,14 +328,14 @@ QObject *QUmlReadLinkActionObject::result() const
 QSet<QObject *> QUmlReadLinkActionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlReadLinkActionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -340,315 +343,386 @@ bool QUmlReadLinkActionObject::mustBeOwned() const
 QList<QObject *> QUmlReadLinkActionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlReadLinkActionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlReadLinkActionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlReadLinkActionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlReadLinkActionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlReadLinkActionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [LinkAction]
 
 QObject *QUmlReadLinkActionObject::association() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->association())
+    if (!qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->association())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->association()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->association()->asQModelingObject();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlReadLinkActionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlReadLinkActionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlReadLinkActionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlReadLinkActionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlReadLinkActionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlReadLinkActionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlReadLinkActionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlReadLinkActionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->setName(name);
 }
 
 void QUmlReadLinkActionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlReadLinkActionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlReadLinkActionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlReadLinkActionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlReadLinkActionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlReadLinkActionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlReadLinkActionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlReadLinkActionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlReadLinkActionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlReadLinkActionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlReadLinkActionObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlReadLinkActionObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlReadLinkActionObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlReadLinkActionObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlReadLinkActionObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlReadLinkActionObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlReadLinkActionObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlReadLinkActionObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlReadLinkActionObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlReadLinkActionObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlReadLinkActionObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlReadLinkActionObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlReadLinkActionObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlReadLinkActionObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlReadLinkActionObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlReadLinkActionObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlReadLinkActionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlReadLinkActionObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlReadLinkActionObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlReadLinkActionObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlReadLinkActionObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlReadLinkActionObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlReadLinkActionObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlReadLinkActionObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlReadLinkActionObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlReadLinkActionObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlReadLinkActionObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [LinkAction]
 
 void QUmlReadLinkActionObject::addEndData(QObject *endData)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->addEndData(qmodelingobjectproperty_cast<QUmlLinkEndData *>(endData));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->addEndData(qmodelingelementproperty_cast<QUmlLinkEndData *>(endData));
 }
 
 void QUmlReadLinkActionObject::removeEndData(QObject *endData)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->removeEndData(qmodelingobjectproperty_cast<QUmlLinkEndData *>(endData));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->removeEndData(qmodelingelementproperty_cast<QUmlLinkEndData *>(endData));
 }
 
 void QUmlReadLinkActionObject::addInputValue(QObject *inputValue)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->addInputValue(qmodelingobjectproperty_cast<QUmlInputPin *>(inputValue));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->addInputValue(qmodelingelementproperty_cast<QUmlInputPin *>(inputValue));
 }
 
 void QUmlReadLinkActionObject::removeInputValue(QObject *inputValue)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->removeInputValue(qmodelingobjectproperty_cast<QUmlInputPin *>(inputValue));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->removeInputValue(qmodelingelementproperty_cast<QUmlInputPin *>(inputValue));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ReadLinkAction]
 
 void QUmlReadLinkActionObject::setResult(QObject *result)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkAction *>(this)->setResult(qmodelingobjectproperty_cast<QUmlOutputPin *>(result));
+    qmodelingelementproperty_cast<QUmlReadLinkAction *>(this)->setResult(qmodelingelementproperty_cast<QUmlOutputPin *>(result));
+}
+
+
+void QUmlReadLinkActionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlLinkAction");
+    d->groupProperties.insert(QStringLiteral("QUmlLinkAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("endData"))));
+    d->groupProperties.insert(QStringLiteral("QUmlLinkAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputValues"))));
+
+    d->propertyGroups << QStringLiteral("QUmlReadLinkAction");
+    d->groupProperties.insert(QStringLiteral("QUmlReadLinkAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("result"))));
+}
+
+void QUmlReadLinkActionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkAction, result, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkAction, result, PropertyClassRole, QStringLiteral("QUmlReadLinkAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkAction, result, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkAction, result, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkAction, result, DocumentationRole, QStringLiteral("The pin on which are put the objects participating in the association at the end not specified by the inputs."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkAction, result, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkAction, result, SubsettedPropertiesRole, QStringLiteral("Action-output"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkAction, result, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlreadlinkactionobject_p.h b/src/uml/qobjects/qumlreadlinkactionobject_p.h
index 1b8d5d5e..f1e20a00 100644
--- a/src/uml/qobjects/qumlreadlinkactionobject_p.h
+++ b/src/uml/qobjects/qumlreadlinkactionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlReadLinkAction;
-class Q_UML_EXPORT QUmlReadLinkActionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlReadLinkActionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlReadLinkActionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -105,7 +108,7 @@ class Q_UML_EXPORT QUmlReadLinkActionObject : public QObject
     Q_PROPERTY(QObject * result READ result WRITE setResult)
 
 public:
-    Q_INVOKABLE explicit QUmlReadLinkActionObject(QUmlReadLinkAction *qModelingObject);
+    Q_INVOKABLE explicit QUmlReadLinkActionObject(QUmlReadLinkAction *qModelingElement);
     virtual ~QUmlReadLinkActionObject();
 
     // Owned attributes [Element]
@@ -238,6 +241,10 @@ public Q_SLOTS:
 
     // Slots for owned attributes [ReadLinkAction]
     void setResult(QObject *result = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlreadlinkobjectendactionobject.cpp b/src/uml/qobjects/qumlreadlinkobjectendactionobject.cpp
index de1ebd33..2509c3c4 100644
--- a/src/uml/qobjects/qumlreadlinkobjectendactionobject.cpp
+++ b/src/uml/qobjects/qumlreadlinkobjectendactionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlreadlinkobjectendactionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlReadLinkObjectEndAction>
 #include <QtUml/QUmlActivity>
@@ -65,16 +66,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlReadLinkObjectEndActionObject::QUmlReadLinkObjectEndActionObject(QUmlReadLinkObjectEndAction *qModelingObject)
+QUmlReadLinkObjectEndActionObject::QUmlReadLinkObjectEndActionObject(QUmlReadLinkObjectEndAction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlReadLinkObjectEndActionObject::~QUmlReadLinkObjectEndActionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -83,25 +86,25 @@ QUmlReadLinkObjectEndActionObject::~QUmlReadLinkObjectEndActionObject()
 const QSet<QObject *> QUmlReadLinkObjectEndActionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadLinkObjectEndActionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlReadLinkObjectEndActionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -109,62 +112,62 @@ QObject *QUmlReadLinkObjectEndActionObject::owner() const
 const QSet<QObject *> QUmlReadLinkObjectEndActionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlReadLinkObjectEndActionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->name();
 }
 
 QObject *QUmlReadLinkObjectEndActionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlReadLinkObjectEndActionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlReadLinkObjectEndActionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlReadLinkObjectEndActionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlReadLinkObjectEndActionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlReadLinkObjectEndActionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadLinkObjectEndActionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -172,65 +175,65 @@ const QSet<QObject *> QUmlReadLinkObjectEndActionObject::redefinitionContexts()
 
 QObject *QUmlReadLinkObjectEndActionObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlReadLinkObjectEndActionObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadLinkObjectEndActionObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadLinkObjectEndActionObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlReadLinkObjectEndActionObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlReadLinkObjectEndActionObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadLinkObjectEndActionObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadLinkObjectEndActionObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -239,8 +242,8 @@ const QSet<QObject *> QUmlReadLinkObjectEndActionObject::redefinedNodes() const
 const QSet<QObject *> QUmlReadLinkObjectEndActionObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -248,46 +251,46 @@ const QSet<QObject *> QUmlReadLinkObjectEndActionObject::handlers() const
 
 QObject *QUmlReadLinkObjectEndActionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlReadLinkObjectEndActionObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlReadLinkObjectEndActionObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlReadLinkObjectEndActionObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadLinkObjectEndActionObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlReadLinkObjectEndActionObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -295,26 +298,26 @@ const QList<QObject *> QUmlReadLinkObjectEndActionObject::outputs() const
 
 QObject *QUmlReadLinkObjectEndActionObject::end() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->end())
+    if (!qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->end())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->end()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->end()->asQModelingObject();
 }
 
 QObject *QUmlReadLinkObjectEndActionObject::object() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->object())
+    if (!qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->object())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->object()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->object()->asQModelingObject();
 }
 
 QObject *QUmlReadLinkObjectEndActionObject::result() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->result())
+    if (!qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->result())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->result()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->result()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -322,14 +325,14 @@ QObject *QUmlReadLinkObjectEndActionObject::result() const
 QSet<QObject *> QUmlReadLinkObjectEndActionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlReadLinkObjectEndActionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -337,293 +340,380 @@ bool QUmlReadLinkObjectEndActionObject::mustBeOwned() const
 QList<QObject *> QUmlReadLinkObjectEndActionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlReadLinkObjectEndActionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlReadLinkObjectEndActionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlReadLinkObjectEndActionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlReadLinkObjectEndActionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlReadLinkObjectEndActionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlReadLinkObjectEndActionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlReadLinkObjectEndActionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlReadLinkObjectEndActionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlReadLinkObjectEndActionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlReadLinkObjectEndActionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlReadLinkObjectEndActionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlReadLinkObjectEndActionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlReadLinkObjectEndActionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->setName(name);
 }
 
 void QUmlReadLinkObjectEndActionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlReadLinkObjectEndActionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlReadLinkObjectEndActionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlReadLinkObjectEndActionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlReadLinkObjectEndActionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlReadLinkObjectEndActionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlReadLinkObjectEndActionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlReadLinkObjectEndActionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlReadLinkObjectEndActionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlReadLinkObjectEndActionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlReadLinkObjectEndActionObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlReadLinkObjectEndActionObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlReadLinkObjectEndActionObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlReadLinkObjectEndActionObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlReadLinkObjectEndActionObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlReadLinkObjectEndActionObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlReadLinkObjectEndActionObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlReadLinkObjectEndActionObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlReadLinkObjectEndActionObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlReadLinkObjectEndActionObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlReadLinkObjectEndActionObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlReadLinkObjectEndActionObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlReadLinkObjectEndActionObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlReadLinkObjectEndActionObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlReadLinkObjectEndActionObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlReadLinkObjectEndActionObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlReadLinkObjectEndActionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlReadLinkObjectEndActionObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlReadLinkObjectEndActionObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlReadLinkObjectEndActionObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlReadLinkObjectEndActionObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlReadLinkObjectEndActionObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlReadLinkObjectEndActionObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlReadLinkObjectEndActionObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlReadLinkObjectEndActionObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlReadLinkObjectEndActionObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlReadLinkObjectEndActionObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ReadLinkObjectEndAction]
 
 void QUmlReadLinkObjectEndActionObject::setEnd(QObject *end)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->setEnd(qmodelingobjectproperty_cast<QUmlProperty *>(end));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->setEnd(qmodelingelementproperty_cast<QUmlProperty *>(end));
 }
 
 void QUmlReadLinkObjectEndActionObject::setObject(QObject *object)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->setObject(qmodelingobjectproperty_cast<QUmlInputPin *>(object));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->setObject(qmodelingelementproperty_cast<QUmlInputPin *>(object));
 }
 
 void QUmlReadLinkObjectEndActionObject::setResult(QObject *result)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndAction *>(this)->setResult(qmodelingobjectproperty_cast<QUmlOutputPin *>(result));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndAction *>(this)->setResult(qmodelingelementproperty_cast<QUmlOutputPin *>(result));
+}
+
+
+void QUmlReadLinkObjectEndActionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlReadLinkObjectEndAction");
+    d->groupProperties.insert(QStringLiteral("QUmlReadLinkObjectEndAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("end"))));
+    d->groupProperties.insert(QStringLiteral("QUmlReadLinkObjectEndAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("object"))));
+    d->groupProperties.insert(QStringLiteral("QUmlReadLinkObjectEndAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("result"))));
+}
+
+void QUmlReadLinkObjectEndActionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndAction, end, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndAction, end, PropertyClassRole, QStringLiteral("QUmlReadLinkObjectEndAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndAction, end, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndAction, end, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndAction, end, DocumentationRole, QStringLiteral("Link end to be read."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndAction, end, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndAction, end, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndAction, end, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndAction, object, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndAction, object, PropertyClassRole, QStringLiteral("QUmlReadLinkObjectEndAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndAction, object, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndAction, object, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndAction, object, DocumentationRole, QStringLiteral("Gives the input pin from which the link object is obtained."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndAction, object, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndAction, object, SubsettedPropertiesRole, QStringLiteral("Action-input"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndAction, object, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndAction, result, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndAction, result, PropertyClassRole, QStringLiteral("QUmlReadLinkObjectEndAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndAction, result, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndAction, result, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndAction, result, DocumentationRole, QStringLiteral("Pin where the result value is placed."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndAction, result, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndAction, result, SubsettedPropertiesRole, QStringLiteral("Action-output"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndAction, result, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlreadlinkobjectendactionobject_p.h b/src/uml/qobjects/qumlreadlinkobjectendactionobject_p.h
index c5776d09..d4bed3c5 100644
--- a/src/uml/qobjects/qumlreadlinkobjectendactionobject_p.h
+++ b/src/uml/qobjects/qumlreadlinkobjectendactionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlReadLinkObjectEndAction;
-class Q_UML_EXPORT QUmlReadLinkObjectEndActionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlReadLinkObjectEndActionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlReadLinkObjectEndActionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -103,7 +106,7 @@ class Q_UML_EXPORT QUmlReadLinkObjectEndActionObject : public QObject
     Q_PROPERTY(QObject * result READ result WRITE setResult)
 
 public:
-    Q_INVOKABLE explicit QUmlReadLinkObjectEndActionObject(QUmlReadLinkObjectEndAction *qModelingObject);
+    Q_INVOKABLE explicit QUmlReadLinkObjectEndActionObject(QUmlReadLinkObjectEndAction *qModelingElement);
     virtual ~QUmlReadLinkObjectEndActionObject();
 
     // Owned attributes [Element]
@@ -227,6 +230,10 @@ public Q_SLOTS:
     void setEnd(QObject *end = 0);
     void setObject(QObject *object = 0);
     void setResult(QObject *result = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlreadlinkobjectendqualifieractionobject.cpp b/src/uml/qobjects/qumlreadlinkobjectendqualifieractionobject.cpp
index 1e1030be..dc1d1a64 100644
--- a/src/uml/qobjects/qumlreadlinkobjectendqualifieractionobject.cpp
+++ b/src/uml/qobjects/qumlreadlinkobjectendqualifieractionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlreadlinkobjectendqualifieractionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlReadLinkObjectEndQualifierAction>
 #include <QtUml/QUmlActivity>
@@ -65,16 +66,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlReadLinkObjectEndQualifierActionObject::QUmlReadLinkObjectEndQualifierActionObject(QUmlReadLinkObjectEndQualifierAction *qModelingObject)
+QUmlReadLinkObjectEndQualifierActionObject::QUmlReadLinkObjectEndQualifierActionObject(QUmlReadLinkObjectEndQualifierAction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlReadLinkObjectEndQualifierActionObject::~QUmlReadLinkObjectEndQualifierActionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -83,25 +86,25 @@ QUmlReadLinkObjectEndQualifierActionObject::~QUmlReadLinkObjectEndQualifierActio
 const QSet<QObject *> QUmlReadLinkObjectEndQualifierActionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadLinkObjectEndQualifierActionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlReadLinkObjectEndQualifierActionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -109,62 +112,62 @@ QObject *QUmlReadLinkObjectEndQualifierActionObject::owner() const
 const QSet<QObject *> QUmlReadLinkObjectEndQualifierActionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlReadLinkObjectEndQualifierActionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->name();
 }
 
 QObject *QUmlReadLinkObjectEndQualifierActionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlReadLinkObjectEndQualifierActionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlReadLinkObjectEndQualifierActionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlReadLinkObjectEndQualifierActionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlReadLinkObjectEndQualifierActionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlReadLinkObjectEndQualifierActionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadLinkObjectEndQualifierActionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -172,65 +175,65 @@ const QSet<QObject *> QUmlReadLinkObjectEndQualifierActionObject::redefinitionCo
 
 QObject *QUmlReadLinkObjectEndQualifierActionObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlReadLinkObjectEndQualifierActionObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadLinkObjectEndQualifierActionObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadLinkObjectEndQualifierActionObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlReadLinkObjectEndQualifierActionObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlReadLinkObjectEndQualifierActionObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadLinkObjectEndQualifierActionObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadLinkObjectEndQualifierActionObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -239,8 +242,8 @@ const QSet<QObject *> QUmlReadLinkObjectEndQualifierActionObject::redefinedNodes
 const QSet<QObject *> QUmlReadLinkObjectEndQualifierActionObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -248,46 +251,46 @@ const QSet<QObject *> QUmlReadLinkObjectEndQualifierActionObject::handlers() con
 
 QObject *QUmlReadLinkObjectEndQualifierActionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlReadLinkObjectEndQualifierActionObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlReadLinkObjectEndQualifierActionObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlReadLinkObjectEndQualifierActionObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadLinkObjectEndQualifierActionObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlReadLinkObjectEndQualifierActionObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -295,26 +298,26 @@ const QList<QObject *> QUmlReadLinkObjectEndQualifierActionObject::outputs() con
 
 QObject *QUmlReadLinkObjectEndQualifierActionObject::object() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->object())
+    if (!qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->object())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->object()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->object()->asQModelingObject();
 }
 
 QObject *QUmlReadLinkObjectEndQualifierActionObject::qualifier() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->qualifier())
+    if (!qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->qualifier())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->qualifier()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->qualifier()->asQModelingObject();
 }
 
 QObject *QUmlReadLinkObjectEndQualifierActionObject::result() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->result())
+    if (!qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->result())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->result()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->result()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -322,14 +325,14 @@ QObject *QUmlReadLinkObjectEndQualifierActionObject::result() const
 QSet<QObject *> QUmlReadLinkObjectEndQualifierActionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlReadLinkObjectEndQualifierActionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -337,293 +340,380 @@ bool QUmlReadLinkObjectEndQualifierActionObject::mustBeOwned() const
 QList<QObject *> QUmlReadLinkObjectEndQualifierActionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlReadLinkObjectEndQualifierActionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlReadLinkObjectEndQualifierActionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlReadLinkObjectEndQualifierActionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlReadLinkObjectEndQualifierActionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlReadLinkObjectEndQualifierActionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlReadLinkObjectEndQualifierActionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlReadLinkObjectEndQualifierActionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->setName(name);
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlReadLinkObjectEndQualifierActionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlReadLinkObjectEndQualifierActionObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlReadLinkObjectEndQualifierActionObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlReadLinkObjectEndQualifierActionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ReadLinkObjectEndQualifierAction]
 
 void QUmlReadLinkObjectEndQualifierActionObject::setObject(QObject *object)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->setObject(qmodelingobjectproperty_cast<QUmlInputPin *>(object));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->setObject(qmodelingelementproperty_cast<QUmlInputPin *>(object));
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::setQualifier(QObject *qualifier)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->setQualifier(qmodelingobjectproperty_cast<QUmlProperty *>(qualifier));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->setQualifier(qmodelingelementproperty_cast<QUmlProperty *>(qualifier));
 }
 
 void QUmlReadLinkObjectEndQualifierActionObject::setResult(QObject *result)
 {
-    qmodelingobjectproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->setResult(qmodelingobjectproperty_cast<QUmlOutputPin *>(result));
+    qmodelingelementproperty_cast<QUmlReadLinkObjectEndQualifierAction *>(this)->setResult(qmodelingelementproperty_cast<QUmlOutputPin *>(result));
+}
+
+
+void QUmlReadLinkObjectEndQualifierActionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlReadLinkObjectEndQualifierAction");
+    d->groupProperties.insert(QStringLiteral("QUmlReadLinkObjectEndQualifierAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("object"))));
+    d->groupProperties.insert(QStringLiteral("QUmlReadLinkObjectEndQualifierAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifier"))));
+    d->groupProperties.insert(QStringLiteral("QUmlReadLinkObjectEndQualifierAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("result"))));
+}
+
+void QUmlReadLinkObjectEndQualifierActionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndQualifierAction, object, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndQualifierAction, object, PropertyClassRole, QStringLiteral("QUmlReadLinkObjectEndQualifierAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndQualifierAction, object, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndQualifierAction, object, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndQualifierAction, object, DocumentationRole, QStringLiteral("Gives the input pin from which the link object is obtained."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndQualifierAction, object, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndQualifierAction, object, SubsettedPropertiesRole, QStringLiteral("Action-input"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndQualifierAction, object, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndQualifierAction, qualifier, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndQualifierAction, qualifier, PropertyClassRole, QStringLiteral("QUmlReadLinkObjectEndQualifierAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndQualifierAction, qualifier, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndQualifierAction, qualifier, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndQualifierAction, qualifier, DocumentationRole, QStringLiteral("The attribute representing the qualifier to be read."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndQualifierAction, qualifier, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndQualifierAction, qualifier, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndQualifierAction, qualifier, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndQualifierAction, result, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndQualifierAction, result, PropertyClassRole, QStringLiteral("QUmlReadLinkObjectEndQualifierAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndQualifierAction, result, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndQualifierAction, result, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndQualifierAction, result, DocumentationRole, QStringLiteral("Pin where the result value is placed."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndQualifierAction, result, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndQualifierAction, result, SubsettedPropertiesRole, QStringLiteral("Action-output"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadLinkObjectEndQualifierAction, result, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlreadlinkobjectendqualifieractionobject_p.h b/src/uml/qobjects/qumlreadlinkobjectendqualifieractionobject_p.h
index 382b7b44..48866fa2 100644
--- a/src/uml/qobjects/qumlreadlinkobjectendqualifieractionobject_p.h
+++ b/src/uml/qobjects/qumlreadlinkobjectendqualifieractionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlReadLinkObjectEndQualifierAction;
-class Q_UML_EXPORT QUmlReadLinkObjectEndQualifierActionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlReadLinkObjectEndQualifierActionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlReadLinkObjectEndQualifierActionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -103,7 +106,7 @@ class Q_UML_EXPORT QUmlReadLinkObjectEndQualifierActionObject : public QObject
     Q_PROPERTY(QObject * result READ result WRITE setResult)
 
 public:
-    Q_INVOKABLE explicit QUmlReadLinkObjectEndQualifierActionObject(QUmlReadLinkObjectEndQualifierAction *qModelingObject);
+    Q_INVOKABLE explicit QUmlReadLinkObjectEndQualifierActionObject(QUmlReadLinkObjectEndQualifierAction *qModelingElement);
     virtual ~QUmlReadLinkObjectEndQualifierActionObject();
 
     // Owned attributes [Element]
@@ -227,6 +230,10 @@ public Q_SLOTS:
     void setObject(QObject *object = 0);
     void setQualifier(QObject *qualifier = 0);
     void setResult(QObject *result = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlreadselfactionobject.cpp b/src/uml/qobjects/qumlreadselfactionobject.cpp
index 39abaed1..7cfbe3fd 100644
--- a/src/uml/qobjects/qumlreadselfactionobject.cpp
+++ b/src/uml/qobjects/qumlreadselfactionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlreadselfactionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlReadSelfAction>
 #include <QtUml/QUmlActivity>
@@ -64,16 +65,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlReadSelfActionObject::QUmlReadSelfActionObject(QUmlReadSelfAction *qModelingObject)
+QUmlReadSelfActionObject::QUmlReadSelfActionObject(QUmlReadSelfAction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlReadSelfActionObject::~QUmlReadSelfActionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -82,25 +85,25 @@ QUmlReadSelfActionObject::~QUmlReadSelfActionObject()
 const QSet<QObject *> QUmlReadSelfActionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadSelfActionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlReadSelfActionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -108,62 +111,62 @@ QObject *QUmlReadSelfActionObject::owner() const
 const QSet<QObject *> QUmlReadSelfActionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlReadSelfActionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->name();
 }
 
 QObject *QUmlReadSelfActionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlReadSelfActionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlReadSelfActionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlReadSelfActionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlReadSelfActionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlReadSelfActionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadSelfActionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -171,65 +174,65 @@ const QSet<QObject *> QUmlReadSelfActionObject::redefinitionContexts() const
 
 QObject *QUmlReadSelfActionObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlReadSelfActionObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadSelfActionObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadSelfActionObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlReadSelfActionObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlReadSelfActionObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadSelfActionObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadSelfActionObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -238,8 +241,8 @@ const QSet<QObject *> QUmlReadSelfActionObject::redefinedNodes() const
 const QSet<QObject *> QUmlReadSelfActionObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -247,46 +250,46 @@ const QSet<QObject *> QUmlReadSelfActionObject::handlers() const
 
 QObject *QUmlReadSelfActionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlReadSelfActionObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlReadSelfActionObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlReadSelfActionObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadSelfActionObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlReadSelfActionObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -294,10 +297,10 @@ const QList<QObject *> QUmlReadSelfActionObject::outputs() const
 
 QObject *QUmlReadSelfActionObject::result() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->result())
+    if (!qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->result())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->result()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->result()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -305,14 +308,14 @@ QObject *QUmlReadSelfActionObject::result() const
 QSet<QObject *> QUmlReadSelfActionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlReadSelfActionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -320,283 +323,350 @@ bool QUmlReadSelfActionObject::mustBeOwned() const
 QList<QObject *> QUmlReadSelfActionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlReadSelfActionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlReadSelfActionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlReadSelfActionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlReadSelfActionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlReadSelfActionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlReadSelfActionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlReadSelfActionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlReadSelfActionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlReadSelfActionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlReadSelfActionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlReadSelfActionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlReadSelfActionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlReadSelfActionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->setName(name);
 }
 
 void QUmlReadSelfActionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlReadSelfActionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlReadSelfActionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlReadSelfActionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlReadSelfActionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlReadSelfActionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlReadSelfActionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlReadSelfActionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlReadSelfActionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlReadSelfActionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlReadSelfActionObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlReadSelfActionObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlReadSelfActionObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlReadSelfActionObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlReadSelfActionObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlReadSelfActionObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlReadSelfActionObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlReadSelfActionObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlReadSelfActionObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlReadSelfActionObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlReadSelfActionObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlReadSelfActionObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlReadSelfActionObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlReadSelfActionObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlReadSelfActionObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlReadSelfActionObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlReadSelfActionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlReadSelfActionObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlReadSelfActionObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlReadSelfActionObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlReadSelfActionObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlReadSelfActionObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlReadSelfActionObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlReadSelfActionObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlReadSelfActionObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlReadSelfActionObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlReadSelfActionObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ReadSelfAction]
 
 void QUmlReadSelfActionObject::setResult(QObject *result)
 {
-    qmodelingobjectproperty_cast<QUmlReadSelfAction *>(this)->setResult(qmodelingobjectproperty_cast<QUmlOutputPin *>(result));
+    qmodelingelementproperty_cast<QUmlReadSelfAction *>(this)->setResult(qmodelingelementproperty_cast<QUmlOutputPin *>(result));
+}
+
+
+void QUmlReadSelfActionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlReadSelfAction");
+    d->groupProperties.insert(QStringLiteral("QUmlReadSelfAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("result"))));
+}
+
+void QUmlReadSelfActionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadSelfAction, result, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadSelfAction, result, PropertyClassRole, QStringLiteral("QUmlReadSelfAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadSelfAction, result, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadSelfAction, result, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadSelfAction, result, DocumentationRole, QStringLiteral("Gives the output pin on which the hosting object is placed."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadSelfAction, result, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadSelfAction, result, SubsettedPropertiesRole, QStringLiteral("Action-output"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadSelfAction, result, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlreadselfactionobject_p.h b/src/uml/qobjects/qumlreadselfactionobject_p.h
index 1a763ee5..87c8f6d5 100644
--- a/src/uml/qobjects/qumlreadselfactionobject_p.h
+++ b/src/uml/qobjects/qumlreadselfactionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlReadSelfAction;
-class Q_UML_EXPORT QUmlReadSelfActionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlReadSelfActionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlReadSelfActionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -101,7 +104,7 @@ class Q_UML_EXPORT QUmlReadSelfActionObject : public QObject
     Q_PROPERTY(QObject * result READ result WRITE setResult)
 
 public:
-    Q_INVOKABLE explicit QUmlReadSelfActionObject(QUmlReadSelfAction *qModelingObject);
+    Q_INVOKABLE explicit QUmlReadSelfActionObject(QUmlReadSelfAction *qModelingElement);
     virtual ~QUmlReadSelfActionObject();
 
     // Owned attributes [Element]
@@ -221,6 +224,10 @@ public Q_SLOTS:
 
     // Slots for owned attributes [ReadSelfAction]
     void setResult(QObject *result = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlreadstructuralfeatureactionobject.cpp b/src/uml/qobjects/qumlreadstructuralfeatureactionobject.cpp
index 82815265..15676811 100644
--- a/src/uml/qobjects/qumlreadstructuralfeatureactionobject.cpp
+++ b/src/uml/qobjects/qumlreadstructuralfeatureactionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlreadstructuralfeatureactionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlReadStructuralFeatureAction>
 #include <QtUml/QUmlActivity>
@@ -65,16 +66,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlReadStructuralFeatureActionObject::QUmlReadStructuralFeatureActionObject(QUmlReadStructuralFeatureAction *qModelingObject)
+QUmlReadStructuralFeatureActionObject::QUmlReadStructuralFeatureActionObject(QUmlReadStructuralFeatureAction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlReadStructuralFeatureActionObject::~QUmlReadStructuralFeatureActionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -83,25 +86,25 @@ QUmlReadStructuralFeatureActionObject::~QUmlReadStructuralFeatureActionObject()
 const QSet<QObject *> QUmlReadStructuralFeatureActionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadStructuralFeatureActionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlReadStructuralFeatureActionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -109,62 +112,62 @@ QObject *QUmlReadStructuralFeatureActionObject::owner() const
 const QSet<QObject *> QUmlReadStructuralFeatureActionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlReadStructuralFeatureActionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->name();
 }
 
 QObject *QUmlReadStructuralFeatureActionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlReadStructuralFeatureActionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlReadStructuralFeatureActionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlReadStructuralFeatureActionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlReadStructuralFeatureActionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlReadStructuralFeatureActionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadStructuralFeatureActionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -172,65 +175,65 @@ const QSet<QObject *> QUmlReadStructuralFeatureActionObject::redefinitionContext
 
 QObject *QUmlReadStructuralFeatureActionObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlReadStructuralFeatureActionObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadStructuralFeatureActionObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadStructuralFeatureActionObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlReadStructuralFeatureActionObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlReadStructuralFeatureActionObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadStructuralFeatureActionObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadStructuralFeatureActionObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -239,8 +242,8 @@ const QSet<QObject *> QUmlReadStructuralFeatureActionObject::redefinedNodes() co
 const QSet<QObject *> QUmlReadStructuralFeatureActionObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -248,46 +251,46 @@ const QSet<QObject *> QUmlReadStructuralFeatureActionObject::handlers() const
 
 QObject *QUmlReadStructuralFeatureActionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlReadStructuralFeatureActionObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlReadStructuralFeatureActionObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlReadStructuralFeatureActionObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadStructuralFeatureActionObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlReadStructuralFeatureActionObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -295,28 +298,28 @@ const QList<QObject *> QUmlReadStructuralFeatureActionObject::outputs() const
 
 QObject *QUmlReadStructuralFeatureActionObject::object() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->object())
+    if (!qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->object())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->object()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->object()->asQModelingObject();
 }
 
 QObject *QUmlReadStructuralFeatureActionObject::structuralFeature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->structuralFeature())
+    if (!qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->structuralFeature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->structuralFeature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->structuralFeature()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ReadStructuralFeatureAction]
 
 QObject *QUmlReadStructuralFeatureActionObject::result() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->result())
+    if (!qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->result())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->result()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->result()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -324,14 +327,14 @@ QObject *QUmlReadStructuralFeatureActionObject::result() const
 QSet<QObject *> QUmlReadStructuralFeatureActionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlReadStructuralFeatureActionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -339,295 +342,366 @@ bool QUmlReadStructuralFeatureActionObject::mustBeOwned() const
 QList<QObject *> QUmlReadStructuralFeatureActionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlReadStructuralFeatureActionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlReadStructuralFeatureActionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlReadStructuralFeatureActionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlReadStructuralFeatureActionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlReadStructuralFeatureActionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlReadStructuralFeatureActionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlReadStructuralFeatureActionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlReadStructuralFeatureActionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlReadStructuralFeatureActionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlReadStructuralFeatureActionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlReadStructuralFeatureActionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlReadStructuralFeatureActionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlReadStructuralFeatureActionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->setName(name);
 }
 
 void QUmlReadStructuralFeatureActionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlReadStructuralFeatureActionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlReadStructuralFeatureActionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlReadStructuralFeatureActionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlReadStructuralFeatureActionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlReadStructuralFeatureActionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlReadStructuralFeatureActionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlReadStructuralFeatureActionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlReadStructuralFeatureActionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlReadStructuralFeatureActionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlReadStructuralFeatureActionObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlReadStructuralFeatureActionObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlReadStructuralFeatureActionObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlReadStructuralFeatureActionObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlReadStructuralFeatureActionObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlReadStructuralFeatureActionObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlReadStructuralFeatureActionObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlReadStructuralFeatureActionObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlReadStructuralFeatureActionObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlReadStructuralFeatureActionObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlReadStructuralFeatureActionObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlReadStructuralFeatureActionObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlReadStructuralFeatureActionObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlReadStructuralFeatureActionObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlReadStructuralFeatureActionObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlReadStructuralFeatureActionObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlReadStructuralFeatureActionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlReadStructuralFeatureActionObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlReadStructuralFeatureActionObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlReadStructuralFeatureActionObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlReadStructuralFeatureActionObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlReadStructuralFeatureActionObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlReadStructuralFeatureActionObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlReadStructuralFeatureActionObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlReadStructuralFeatureActionObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlReadStructuralFeatureActionObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlReadStructuralFeatureActionObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [StructuralFeatureAction]
 
 void QUmlReadStructuralFeatureActionObject::setObject(QObject *object)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->setObject(qmodelingobjectproperty_cast<QUmlInputPin *>(object));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->setObject(qmodelingelementproperty_cast<QUmlInputPin *>(object));
 }
 
 void QUmlReadStructuralFeatureActionObject::setStructuralFeature(QObject *structuralFeature)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->setStructuralFeature(qmodelingobjectproperty_cast<QUmlStructuralFeature *>(structuralFeature));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->setStructuralFeature(qmodelingelementproperty_cast<QUmlStructuralFeature *>(structuralFeature));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ReadStructuralFeatureAction]
 
 void QUmlReadStructuralFeatureActionObject::setResult(QObject *result)
 {
-    qmodelingobjectproperty_cast<QUmlReadStructuralFeatureAction *>(this)->setResult(qmodelingobjectproperty_cast<QUmlOutputPin *>(result));
+    qmodelingelementproperty_cast<QUmlReadStructuralFeatureAction *>(this)->setResult(qmodelingelementproperty_cast<QUmlOutputPin *>(result));
+}
+
+
+void QUmlReadStructuralFeatureActionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlStructuralFeatureAction");
+    d->groupProperties.insert(QStringLiteral("QUmlStructuralFeatureAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("object"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuralFeatureAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("structuralFeature"))));
+
+    d->propertyGroups << QStringLiteral("QUmlReadStructuralFeatureAction");
+    d->groupProperties.insert(QStringLiteral("QUmlReadStructuralFeatureAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("result"))));
+}
+
+void QUmlReadStructuralFeatureActionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadStructuralFeatureAction, result, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadStructuralFeatureAction, result, PropertyClassRole, QStringLiteral("QUmlReadStructuralFeatureAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadStructuralFeatureAction, result, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadStructuralFeatureAction, result, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadStructuralFeatureAction, result, DocumentationRole, QStringLiteral("Gives the output pin on which the result is put."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadStructuralFeatureAction, result, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadStructuralFeatureAction, result, SubsettedPropertiesRole, QStringLiteral("Action-output"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadStructuralFeatureAction, result, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlreadstructuralfeatureactionobject_p.h b/src/uml/qobjects/qumlreadstructuralfeatureactionobject_p.h
index c46c13f4..20792d78 100644
--- a/src/uml/qobjects/qumlreadstructuralfeatureactionobject_p.h
+++ b/src/uml/qobjects/qumlreadstructuralfeatureactionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlReadStructuralFeatureAction;
-class Q_UML_EXPORT QUmlReadStructuralFeatureActionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlReadStructuralFeatureActionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlReadStructuralFeatureActionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -105,7 +108,7 @@ class Q_UML_EXPORT QUmlReadStructuralFeatureActionObject : public QObject
     Q_PROPERTY(QObject * result READ result WRITE setResult)
 
 public:
-    Q_INVOKABLE explicit QUmlReadStructuralFeatureActionObject(QUmlReadStructuralFeatureAction *qModelingObject);
+    Q_INVOKABLE explicit QUmlReadStructuralFeatureActionObject(QUmlReadStructuralFeatureAction *qModelingElement);
     virtual ~QUmlReadStructuralFeatureActionObject();
 
     // Owned attributes [Element]
@@ -233,6 +236,10 @@ public Q_SLOTS:
 
     // Slots for owned attributes [ReadStructuralFeatureAction]
     void setResult(QObject *result = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlreadvariableactionobject.cpp b/src/uml/qobjects/qumlreadvariableactionobject.cpp
index 54b1d93d..8ac9edfe 100644
--- a/src/uml/qobjects/qumlreadvariableactionobject.cpp
+++ b/src/uml/qobjects/qumlreadvariableactionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlreadvariableactionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlReadVariableAction>
 #include <QtUml/QUmlActivity>
@@ -65,16 +66,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlReadVariableActionObject::QUmlReadVariableActionObject(QUmlReadVariableAction *qModelingObject)
+QUmlReadVariableActionObject::QUmlReadVariableActionObject(QUmlReadVariableAction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlReadVariableActionObject::~QUmlReadVariableActionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -83,25 +86,25 @@ QUmlReadVariableActionObject::~QUmlReadVariableActionObject()
 const QSet<QObject *> QUmlReadVariableActionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadVariableActionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlReadVariableActionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -109,62 +112,62 @@ QObject *QUmlReadVariableActionObject::owner() const
 const QSet<QObject *> QUmlReadVariableActionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlReadVariableActionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->name();
 }
 
 QObject *QUmlReadVariableActionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlReadVariableActionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlReadVariableActionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlReadVariableActionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlReadVariableActionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlReadVariableActionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadVariableActionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -172,65 +175,65 @@ const QSet<QObject *> QUmlReadVariableActionObject::redefinitionContexts() const
 
 QObject *QUmlReadVariableActionObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlReadVariableActionObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadVariableActionObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadVariableActionObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlReadVariableActionObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlReadVariableActionObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadVariableActionObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadVariableActionObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -239,8 +242,8 @@ const QSet<QObject *> QUmlReadVariableActionObject::redefinedNodes() const
 const QSet<QObject *> QUmlReadVariableActionObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -248,46 +251,46 @@ const QSet<QObject *> QUmlReadVariableActionObject::handlers() const
 
 QObject *QUmlReadVariableActionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlReadVariableActionObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlReadVariableActionObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlReadVariableActionObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReadVariableActionObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlReadVariableActionObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -295,20 +298,20 @@ const QList<QObject *> QUmlReadVariableActionObject::outputs() const
 
 QObject *QUmlReadVariableActionObject::variable() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->variable())
+    if (!qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->variable())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->variable()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->variable()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ReadVariableAction]
 
 QObject *QUmlReadVariableActionObject::result() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->result())
+    if (!qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->result())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->result()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->result()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -316,14 +319,14 @@ QObject *QUmlReadVariableActionObject::result() const
 QSet<QObject *> QUmlReadVariableActionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlReadVariableActionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -331,290 +334,360 @@ bool QUmlReadVariableActionObject::mustBeOwned() const
 QList<QObject *> QUmlReadVariableActionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlReadVariableActionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlReadVariableActionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlReadVariableActionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlReadVariableActionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlReadVariableActionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlReadVariableActionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlReadVariableActionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlReadVariableActionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlReadVariableActionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlReadVariableActionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlReadVariableActionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlReadVariableActionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlReadVariableActionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->setName(name);
 }
 
 void QUmlReadVariableActionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlReadVariableActionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlReadVariableActionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlReadVariableActionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlReadVariableActionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlReadVariableActionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlReadVariableActionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlReadVariableActionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlReadVariableActionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlReadVariableActionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlReadVariableActionObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlReadVariableActionObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlReadVariableActionObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlReadVariableActionObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlReadVariableActionObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlReadVariableActionObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlReadVariableActionObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlReadVariableActionObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlReadVariableActionObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlReadVariableActionObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlReadVariableActionObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlReadVariableActionObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlReadVariableActionObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlReadVariableActionObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlReadVariableActionObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlReadVariableActionObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlReadVariableActionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlReadVariableActionObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlReadVariableActionObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlReadVariableActionObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlReadVariableActionObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlReadVariableActionObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlReadVariableActionObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlReadVariableActionObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlReadVariableActionObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlReadVariableActionObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlReadVariableActionObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [VariableAction]
 
 void QUmlReadVariableActionObject::setVariable(QObject *variable)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->setVariable(qmodelingobjectproperty_cast<QUmlVariable *>(variable));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->setVariable(qmodelingelementproperty_cast<QUmlVariable *>(variable));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ReadVariableAction]
 
 void QUmlReadVariableActionObject::setResult(QObject *result)
 {
-    qmodelingobjectproperty_cast<QUmlReadVariableAction *>(this)->setResult(qmodelingobjectproperty_cast<QUmlOutputPin *>(result));
+    qmodelingelementproperty_cast<QUmlReadVariableAction *>(this)->setResult(qmodelingelementproperty_cast<QUmlOutputPin *>(result));
+}
+
+
+void QUmlReadVariableActionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlVariableAction");
+    d->groupProperties.insert(QStringLiteral("QUmlVariableAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("variable"))));
+
+    d->propertyGroups << QStringLiteral("QUmlReadVariableAction");
+    d->groupProperties.insert(QStringLiteral("QUmlReadVariableAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("result"))));
+}
+
+void QUmlReadVariableActionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadVariableAction, result, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadVariableAction, result, PropertyClassRole, QStringLiteral("QUmlReadVariableAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadVariableAction, result, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadVariableAction, result, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadVariableAction, result, DocumentationRole, QStringLiteral("Gives the output pin on which the result is put."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadVariableAction, result, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadVariableAction, result, SubsettedPropertiesRole, QStringLiteral("Action-output"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReadVariableAction, result, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlreadvariableactionobject_p.h b/src/uml/qobjects/qumlreadvariableactionobject_p.h
index 02ca9bfe..fd2169b6 100644
--- a/src/uml/qobjects/qumlreadvariableactionobject_p.h
+++ b/src/uml/qobjects/qumlreadvariableactionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlReadVariableAction;
-class Q_UML_EXPORT QUmlReadVariableActionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlReadVariableActionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlReadVariableActionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -104,7 +107,7 @@ class Q_UML_EXPORT QUmlReadVariableActionObject : public QObject
     Q_PROPERTY(QObject * result READ result WRITE setResult)
 
 public:
-    Q_INVOKABLE explicit QUmlReadVariableActionObject(QUmlReadVariableAction *qModelingObject);
+    Q_INVOKABLE explicit QUmlReadVariableActionObject(QUmlReadVariableAction *qModelingElement);
     virtual ~QUmlReadVariableActionObject();
 
     // Owned attributes [Element]
@@ -230,6 +233,10 @@ public Q_SLOTS:
 
     // Slots for owned attributes [ReadVariableAction]
     void setResult(QObject *result = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlrealizationobject.cpp b/src/uml/qobjects/qumlrealizationobject.cpp
index 98e7f004..eea7734c 100644
--- a/src/uml/qobjects/qumlrealizationobject.cpp
+++ b/src/uml/qobjects/qumlrealizationobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlrealizationobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlRealization>
 #include <QtUml/QUmlComment>
@@ -54,16 +55,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlRealizationObject::QUmlRealizationObject(QUmlRealization *qModelingObject)
+QUmlRealizationObject::QUmlRealizationObject(QUmlRealization *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlRealizationObject::~QUmlRealizationObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlRealization *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlRealization *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -72,43 +75,43 @@ QUmlRealizationObject::~QUmlRealizationObject()
 const QSet<QObject *> QUmlRealizationObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlRealization *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlRealization *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlRealizationObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlRealization *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlRealization *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlRealizationObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRealization *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlRealization *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRealization *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRealization *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlRealizationObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRealization *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlRealization *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRealization *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRealization *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlRealizationObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRealization *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlRealization *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRealization *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRealization *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -116,42 +119,42 @@ QObject *QUmlRealizationObject::templateParameter() const
 const QSet<QObject *> QUmlRealizationObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlRealization *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlRealization *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlRealizationObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlRealization *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlRealization *>(this)->name();
 }
 
 QObject *QUmlRealizationObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRealization *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlRealization *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRealization *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRealization *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlRealizationObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRealization *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlRealization *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRealization *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRealization *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlRealizationObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlRealization *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlRealization *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlRealizationObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlRealization *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlRealization *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Relationship]
@@ -159,8 +162,8 @@ QtUml::VisibilityKind QUmlRealizationObject::visibility() const
 const QSet<QObject *> QUmlRealizationObject::relatedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlRealization *>(this)->relatedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlRealization *>(this)->relatedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -169,16 +172,16 @@ const QSet<QObject *> QUmlRealizationObject::relatedElements() const
 const QSet<QObject *> QUmlRealizationObject::sources() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlRealization *>(this)->sources())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlRealization *>(this)->sources())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlRealizationObject::targets() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlRealization *>(this)->targets())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlRealization *>(this)->targets())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -187,16 +190,16 @@ const QSet<QObject *> QUmlRealizationObject::targets() const
 const QSet<QObject *> QUmlRealizationObject::clients() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlRealization *>(this)->clients())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlRealization *>(this)->clients())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlRealizationObject::suppliers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlRealization *>(this)->suppliers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlRealization *>(this)->suppliers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -204,10 +207,10 @@ const QSet<QObject *> QUmlRealizationObject::suppliers() const
 
 QObject *QUmlRealizationObject::mapping() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRealization *>(this)->mapping())
+    if (!qmodelingelementproperty_cast<QUmlRealization *>(this)->mapping())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRealization *>(this)->mapping()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRealization *>(this)->mapping()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -215,26 +218,26 @@ QObject *QUmlRealizationObject::mapping() const
 QSet<QObject *> QUmlRealizationObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlRealization *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlRealization *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlRealizationObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlRealization *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlRealization *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlRealizationObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlRealization *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlRealization *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlRealizationObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlRealization *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlRealization *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [NamedElement]
@@ -242,172 +245,222 @@ bool QUmlRealizationObject::isTemplateParameter() const
 QList<QObject *> QUmlRealizationObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlRealization *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlRealization *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlRealizationObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlRealization *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlRealization *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlRealizationObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlRealization *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlRealization *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlRealizationObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlRealization *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlRealization *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlRealizationObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlRealization *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlRealization *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlRealizationObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlRealization *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlRealization *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlRealizationObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlRealization *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlRealization *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlRealizationObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlRealization *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlRealization *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlRealizationObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlRealization *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlRealization *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlRealizationObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlRealization *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlRealization *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlRealizationObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlRealization *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlRealization *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlRealizationObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlRealization *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlRealization *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlRealizationObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlRealization *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlRealization *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlRealizationObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlRealization *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlRealization *>(this)->setName(name);
 }
 
 void QUmlRealizationObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlRealization *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlRealization *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlRealizationObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlRealization *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlRealization *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlRealizationObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlRealization *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlRealization *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlRealizationObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlRealization *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlRealization *>(this)->setVisibility(visibility);
 }
 
 void QUmlRealizationObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlRealization *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Relationship]
 
 void QUmlRealizationObject::addRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlRealization *>(this)->addRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlRealization *>(this)->addRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 void QUmlRealizationObject::removeRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlRealization *>(this)->removeRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlRealization *>(this)->removeRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [DirectedRelationship]
 
 void QUmlRealizationObject::addSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlRealization *>(this)->addSource(qmodelingobjectproperty_cast<QUmlElement *>(source));
+    qmodelingelementproperty_cast<QUmlRealization *>(this)->addSource(qmodelingelementproperty_cast<QUmlElement *>(source));
 }
 
 void QUmlRealizationObject::removeSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlRealization *>(this)->removeSource(qmodelingobjectproperty_cast<QUmlElement *>(source));
+    qmodelingelementproperty_cast<QUmlRealization *>(this)->removeSource(qmodelingelementproperty_cast<QUmlElement *>(source));
 }
 
 void QUmlRealizationObject::addTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlRealization *>(this)->addTarget(qmodelingobjectproperty_cast<QUmlElement *>(target));
+    qmodelingelementproperty_cast<QUmlRealization *>(this)->addTarget(qmodelingelementproperty_cast<QUmlElement *>(target));
 }
 
 void QUmlRealizationObject::removeTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlRealization *>(this)->removeTarget(qmodelingobjectproperty_cast<QUmlElement *>(target));
+    qmodelingelementproperty_cast<QUmlRealization *>(this)->removeTarget(qmodelingelementproperty_cast<QUmlElement *>(target));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Dependency]
 
 void QUmlRealizationObject::addClient(QObject *client)
 {
-    qmodelingobjectproperty_cast<QUmlRealization *>(this)->addClient(qmodelingobjectproperty_cast<QUmlNamedElement *>(client));
+    qmodelingelementproperty_cast<QUmlRealization *>(this)->addClient(qmodelingelementproperty_cast<QUmlNamedElement *>(client));
 }
 
 void QUmlRealizationObject::removeClient(QObject *client)
 {
-    qmodelingobjectproperty_cast<QUmlRealization *>(this)->removeClient(qmodelingobjectproperty_cast<QUmlNamedElement *>(client));
+    qmodelingelementproperty_cast<QUmlRealization *>(this)->removeClient(qmodelingelementproperty_cast<QUmlNamedElement *>(client));
 }
 
 void QUmlRealizationObject::addSupplier(QObject *supplier)
 {
-    qmodelingobjectproperty_cast<QUmlRealization *>(this)->addSupplier(qmodelingobjectproperty_cast<QUmlNamedElement *>(supplier));
+    qmodelingelementproperty_cast<QUmlRealization *>(this)->addSupplier(qmodelingelementproperty_cast<QUmlNamedElement *>(supplier));
 }
 
 void QUmlRealizationObject::removeSupplier(QObject *supplier)
 {
-    qmodelingobjectproperty_cast<QUmlRealization *>(this)->removeSupplier(qmodelingobjectproperty_cast<QUmlNamedElement *>(supplier));
+    qmodelingelementproperty_cast<QUmlRealization *>(this)->removeSupplier(qmodelingelementproperty_cast<QUmlNamedElement *>(supplier));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Abstraction]
 
 void QUmlRealizationObject::setMapping(QObject *mapping)
 {
-    qmodelingobjectproperty_cast<QUmlRealization *>(this)->setMapping(qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(mapping));
+    qmodelingelementproperty_cast<QUmlRealization *>(this)->setMapping(qmodelingelementproperty_cast<QUmlOpaqueExpression *>(mapping));
+}
+
+
+void QUmlRealizationObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDirectedRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDependency");
+    d->groupProperties.insert(QStringLiteral("QUmlDependency"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clients"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDependency"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("suppliers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAbstraction");
+    d->groupProperties.insert(QStringLiteral("QUmlAbstraction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("mapping"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRealization");
+}
+
+void QUmlRealizationObject::setPropertyData()
+{
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlrealizationobject_p.h b/src/uml/qobjects/qumlrealizationobject_p.h
index de3da519..68f374ae 100644
--- a/src/uml/qobjects/qumlrealizationobject_p.h
+++ b/src/uml/qobjects/qumlrealizationobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlRealization;
-class Q_UML_EXPORT QUmlRealizationObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlRealizationObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlRealizationObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -92,7 +95,7 @@ class Q_UML_EXPORT QUmlRealizationObject : public QObject
     Q_PROPERTY(QObject * mapping READ mapping WRITE setMapping)
 
 public:
-    Q_INVOKABLE explicit QUmlRealizationObject(QUmlRealization *qModelingObject);
+    Q_INVOKABLE explicit QUmlRealizationObject(QUmlRealization *qModelingElement);
     virtual ~QUmlRealizationObject();
 
     // Owned attributes [Element]
@@ -185,6 +188,10 @@ public Q_SLOTS:
 
     // Slots for owned attributes [Abstraction]
     void setMapping(QObject *mapping = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlreceptionobject.cpp b/src/uml/qobjects/qumlreceptionobject.cpp
index 5f80d6ce..bd2c3e20 100644
--- a/src/uml/qobjects/qumlreceptionobject.cpp
+++ b/src/uml/qobjects/qumlreceptionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlreceptionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlReception>
 #include <QtUml/QUmlBehavior>
@@ -62,16 +63,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlReceptionObject::QUmlReceptionObject(QUmlReception *qModelingObject)
+QUmlReceptionObject::QUmlReceptionObject(QUmlReception *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlReceptionObject::~QUmlReceptionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlReception *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlReception *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -80,25 +83,25 @@ QUmlReceptionObject::~QUmlReceptionObject()
 const QSet<QObject *> QUmlReceptionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlReception *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlReception *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReceptionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlReception *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlReception *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlReceptionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReception *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlReception *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReception *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReception *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -106,40 +109,40 @@ QObject *QUmlReceptionObject::owner() const
 const QSet<QObject *> QUmlReceptionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlReception *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlReception *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlReceptionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlReception *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlReception *>(this)->name();
 }
 
 QObject *QUmlReceptionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReception *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlReception *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReception *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReception *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlReceptionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReception *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlReception *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReception *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReception *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlReceptionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlReception *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlReception *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlReceptionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlReception *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlReception *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Namespace]
@@ -147,48 +150,48 @@ QtUml::VisibilityKind QUmlReceptionObject::visibility() const
 const QSet<QObject *> QUmlReceptionObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlReception *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlReception *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReceptionObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlReception *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlReception *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReceptionObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlReception *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlReception *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReceptionObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlReception *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlReception *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReceptionObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlReception *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlReception *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReceptionObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlReception *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlReception *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -196,22 +199,22 @@ const QSet<QObject *> QUmlReceptionObject::packageImports() const
 
 bool QUmlReceptionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlReception *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlReception *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlReceptionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlReception *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlReception *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReceptionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlReception *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlReception *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -220,57 +223,57 @@ const QSet<QObject *> QUmlReceptionObject::redefinitionContexts() const
 const QSet<QObject *> QUmlReceptionObject::featuringClassifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlReception *>(this)->featuringClassifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlReception *>(this)->featuringClassifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlReceptionObject::isStatic() const
 {
-    return qmodelingobjectproperty_cast<QUmlReception *>(this)->isStatic();
+    return qmodelingelementproperty_cast<QUmlReception *>(this)->isStatic();
 }
 
 // OWNED ATTRIBUTES [BehavioralFeature]
 
 QtUml::CallConcurrencyKind QUmlReceptionObject::concurrency() const
 {
-    return qmodelingobjectproperty_cast<QUmlReception *>(this)->concurrency();
+    return qmodelingelementproperty_cast<QUmlReception *>(this)->concurrency();
 }
 
 bool QUmlReceptionObject::isAbstract() const
 {
-    return qmodelingobjectproperty_cast<QUmlReception *>(this)->isAbstract();
+    return qmodelingelementproperty_cast<QUmlReception *>(this)->isAbstract();
 }
 
 const QSet<QObject *> QUmlReceptionObject::methods() const
 {
     QSet<QObject *> set;
-    foreach (QUmlBehavior *element, qmodelingobjectproperty_cast<QUmlReception *>(this)->methods())
-        set.insert(element->asQObject());
+    foreach (QUmlBehavior *element, qmodelingelementproperty_cast<QUmlReception *>(this)->methods())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlReceptionObject::ownedParameters() const
 {
     QList<QObject *> list;
-    foreach (QUmlParameter *element, qmodelingobjectproperty_cast<QUmlReception *>(this)->ownedParameters())
-        list.append(element->asQObject());
+    foreach (QUmlParameter *element, qmodelingelementproperty_cast<QUmlReception *>(this)->ownedParameters())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QSet<QObject *> QUmlReceptionObject::ownedParameterSets() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterSet *element, qmodelingobjectproperty_cast<QUmlReception *>(this)->ownedParameterSets())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterSet *element, qmodelingelementproperty_cast<QUmlReception *>(this)->ownedParameterSets())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReceptionObject::raisedExceptions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlType *element, qmodelingobjectproperty_cast<QUmlReception *>(this)->raisedExceptions())
-        set.insert(element->asQObject());
+    foreach (QUmlType *element, qmodelingelementproperty_cast<QUmlReception *>(this)->raisedExceptions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -278,10 +281,10 @@ const QSet<QObject *> QUmlReceptionObject::raisedExceptions() const
 
 QObject *QUmlReceptionObject::signal() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReception *>(this)->signal())
+    if (!qmodelingelementproperty_cast<QUmlReception *>(this)->signal())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReception *>(this)->signal()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReception *>(this)->signal()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -289,14 +292,14 @@ QObject *QUmlReceptionObject::signal() const
 QSet<QObject *> QUmlReceptionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlReception *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlReception *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlReceptionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlReception *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlReception *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -304,22 +307,22 @@ bool QUmlReceptionObject::mustBeOwned() const
 QList<QObject *> QUmlReceptionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlReception *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlReception *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlReceptionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlReception *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlReception *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlReceptionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlReception *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlReception *>(this)->separator();
 }
 
 // OPERATIONS [Namespace]
@@ -328,300 +331,368 @@ QSet<QObject *> QUmlReceptionObject::excludeCollisions(QSet<QObject *> imps) con
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlReception *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlReception *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlReceptionObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlReception *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlReception *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlReceptionObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlReception *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlReception *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlReceptionObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlReception *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlReception *>(this)->membersAreDistinguishable();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlReceptionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlReception *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlReception *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlReceptionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlReception *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlReception *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [BehavioralFeature]
 
 bool QUmlReceptionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlReception *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlReception *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlReceptionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlReception *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlReceptionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlReception *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlReceptionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlReception *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlReceptionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlReception *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlReceptionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlReception *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlReceptionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlReception *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlReceptionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlReception *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlReceptionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlReception *>(this)->setName(name);
 }
 
 void QUmlReceptionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlReception *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlReceptionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlReception *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlReceptionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlReception *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlReceptionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlReception *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlReceptionObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlReception *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlReceptionObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlReception *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlReceptionObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlReception *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlReceptionObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlReception *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlReceptionObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlReception *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlReceptionObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlReception *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlReceptionObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlReception *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlReceptionObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlReception *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlReceptionObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlReception *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlReceptionObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlReception *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlReceptionObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlReception *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlReceptionObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlReception *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlReceptionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlReception *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlReceptionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlReceptionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlReception *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlReceptionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlReception *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlReceptionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlReception *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlReceptionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlReception *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Feature]
 
 void QUmlReceptionObject::addFeaturingClassifier(QObject *featuringClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->addFeaturingClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(featuringClassifier));
+    qmodelingelementproperty_cast<QUmlReception *>(this)->addFeaturingClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(featuringClassifier));
 }
 
 void QUmlReceptionObject::removeFeaturingClassifier(QObject *featuringClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->removeFeaturingClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(featuringClassifier));
+    qmodelingelementproperty_cast<QUmlReception *>(this)->removeFeaturingClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(featuringClassifier));
 }
 
 void QUmlReceptionObject::setStatic(bool isStatic)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->setStatic(isStatic);
+    qmodelingelementproperty_cast<QUmlReception *>(this)->setStatic(isStatic);
 }
 
 void QUmlReceptionObject::unsetStatic()
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("static"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("static"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [BehavioralFeature]
 
 void QUmlReceptionObject::setConcurrency(QtUml::CallConcurrencyKind concurrency)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->setConcurrency(concurrency);
+    qmodelingelementproperty_cast<QUmlReception *>(this)->setConcurrency(concurrency);
 }
 
 void QUmlReceptionObject::unsetConcurrency()
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("concurrency"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("concurrency"));
 }
 
 void QUmlReceptionObject::setAbstract(bool isAbstract)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->setAbstract(isAbstract);
+    qmodelingelementproperty_cast<QUmlReception *>(this)->setAbstract(isAbstract);
 }
 
 void QUmlReceptionObject::unsetAbstract()
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("abstract"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
 void QUmlReceptionObject::addMethod(QObject *method)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->addMethod(qmodelingobjectproperty_cast<QUmlBehavior *>(method));
+    qmodelingelementproperty_cast<QUmlReception *>(this)->addMethod(qmodelingelementproperty_cast<QUmlBehavior *>(method));
 }
 
 void QUmlReceptionObject::removeMethod(QObject *method)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->removeMethod(qmodelingobjectproperty_cast<QUmlBehavior *>(method));
+    qmodelingelementproperty_cast<QUmlReception *>(this)->removeMethod(qmodelingelementproperty_cast<QUmlBehavior *>(method));
 }
 
 void QUmlReceptionObject::addOwnedParameter(QObject *ownedParameter)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->addOwnedParameter(qmodelingobjectproperty_cast<QUmlParameter *>(ownedParameter));
+    qmodelingelementproperty_cast<QUmlReception *>(this)->addOwnedParameter(qmodelingelementproperty_cast<QUmlParameter *>(ownedParameter));
 }
 
 void QUmlReceptionObject::removeOwnedParameter(QObject *ownedParameter)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->removeOwnedParameter(qmodelingobjectproperty_cast<QUmlParameter *>(ownedParameter));
+    qmodelingelementproperty_cast<QUmlReception *>(this)->removeOwnedParameter(qmodelingelementproperty_cast<QUmlParameter *>(ownedParameter));
 }
 
 void QUmlReceptionObject::addOwnedParameterSet(QObject *ownedParameterSet)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->addOwnedParameterSet(qmodelingobjectproperty_cast<QUmlParameterSet *>(ownedParameterSet));
+    qmodelingelementproperty_cast<QUmlReception *>(this)->addOwnedParameterSet(qmodelingelementproperty_cast<QUmlParameterSet *>(ownedParameterSet));
 }
 
 void QUmlReceptionObject::removeOwnedParameterSet(QObject *ownedParameterSet)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->removeOwnedParameterSet(qmodelingobjectproperty_cast<QUmlParameterSet *>(ownedParameterSet));
+    qmodelingelementproperty_cast<QUmlReception *>(this)->removeOwnedParameterSet(qmodelingelementproperty_cast<QUmlParameterSet *>(ownedParameterSet));
 }
 
 void QUmlReceptionObject::addRaisedException(QObject *raisedException)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->addRaisedException(qmodelingobjectproperty_cast<QUmlType *>(raisedException));
+    qmodelingelementproperty_cast<QUmlReception *>(this)->addRaisedException(qmodelingelementproperty_cast<QUmlType *>(raisedException));
 }
 
 void QUmlReceptionObject::removeRaisedException(QObject *raisedException)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->removeRaisedException(qmodelingobjectproperty_cast<QUmlType *>(raisedException));
+    qmodelingelementproperty_cast<QUmlReception *>(this)->removeRaisedException(qmodelingelementproperty_cast<QUmlType *>(raisedException));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Reception]
 
 void QUmlReceptionObject::setSignal(QObject *signal)
 {
-    qmodelingobjectproperty_cast<QUmlReception *>(this)->setSignal(qmodelingobjectproperty_cast<QUmlSignal *>(signal));
+    qmodelingelementproperty_cast<QUmlReception *>(this)->setSignal(qmodelingelementproperty_cast<QUmlSignal *>(signal));
+}
+
+
+void QUmlReceptionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlFeature");
+    d->groupProperties.insert(QStringLiteral("QUmlFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("featuringClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isStatic"))));
+
+    d->propertyGroups << QStringLiteral("QUmlBehavioralFeature");
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioralFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("concurrency"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioralFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioralFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("methods"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioralFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameters"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioralFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameterSets"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioralFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("raisedExceptions"))));
+
+    d->propertyGroups << QStringLiteral("QUmlReception");
+    d->groupProperties.insert(QStringLiteral("QUmlReception"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("signal"))));
+}
+
+void QUmlReceptionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReception, signal, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReception, signal, PropertyClassRole, QStringLiteral("QUmlReception"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReception, signal, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReception, signal, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReception, signal, DocumentationRole, QStringLiteral("The signal that this reception handles."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReception, signal, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReception, signal, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReception, signal, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlreceptionobject_p.h b/src/uml/qobjects/qumlreceptionobject_p.h
index 756fb84d..07a459a3 100644
--- a/src/uml/qobjects/qumlreceptionobject_p.h
+++ b/src/uml/qobjects/qumlreceptionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlReception;
-class Q_UML_EXPORT QUmlReceptionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlReceptionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlReceptionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -100,7 +103,7 @@ class Q_UML_EXPORT QUmlReceptionObject : public QObject
     Q_PROPERTY(QObject * signal READ signal WRITE setSignal)
 
 public:
-    Q_INVOKABLE explicit QUmlReceptionObject(QUmlReception *qModelingObject);
+    Q_INVOKABLE explicit QUmlReceptionObject(QUmlReception *qModelingElement);
     virtual ~QUmlReceptionObject();
 
     // Owned attributes [Element]
@@ -228,6 +231,10 @@ public Q_SLOTS:
 
     // Slots for owned attributes [Reception]
     void setSignal(QObject *signal = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlreclassifyobjectactionobject.cpp b/src/uml/qobjects/qumlreclassifyobjectactionobject.cpp
index adb6c78b..a4f7a297 100644
--- a/src/uml/qobjects/qumlreclassifyobjectactionobject.cpp
+++ b/src/uml/qobjects/qumlreclassifyobjectactionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlreclassifyobjectactionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlReclassifyObjectAction>
 #include <QtUml/QUmlActivity>
@@ -64,16 +65,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlReclassifyObjectActionObject::QUmlReclassifyObjectActionObject(QUmlReclassifyObjectAction *qModelingObject)
+QUmlReclassifyObjectActionObject::QUmlReclassifyObjectActionObject(QUmlReclassifyObjectAction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlReclassifyObjectActionObject::~QUmlReclassifyObjectActionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -82,25 +85,25 @@ QUmlReclassifyObjectActionObject::~QUmlReclassifyObjectActionObject()
 const QSet<QObject *> QUmlReclassifyObjectActionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReclassifyObjectActionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlReclassifyObjectActionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -108,62 +111,62 @@ QObject *QUmlReclassifyObjectActionObject::owner() const
 const QSet<QObject *> QUmlReclassifyObjectActionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlReclassifyObjectActionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->name();
 }
 
 QObject *QUmlReclassifyObjectActionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlReclassifyObjectActionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlReclassifyObjectActionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlReclassifyObjectActionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlReclassifyObjectActionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlReclassifyObjectActionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReclassifyObjectActionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -171,65 +174,65 @@ const QSet<QObject *> QUmlReclassifyObjectActionObject::redefinitionContexts() c
 
 QObject *QUmlReclassifyObjectActionObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlReclassifyObjectActionObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReclassifyObjectActionObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReclassifyObjectActionObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlReclassifyObjectActionObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlReclassifyObjectActionObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReclassifyObjectActionObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReclassifyObjectActionObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -238,8 +241,8 @@ const QSet<QObject *> QUmlReclassifyObjectActionObject::redefinedNodes() const
 const QSet<QObject *> QUmlReclassifyObjectActionObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -247,46 +250,46 @@ const QSet<QObject *> QUmlReclassifyObjectActionObject::handlers() const
 
 QObject *QUmlReclassifyObjectActionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlReclassifyObjectActionObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlReclassifyObjectActionObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlReclassifyObjectActionObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReclassifyObjectActionObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlReclassifyObjectActionObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -294,30 +297,30 @@ const QList<QObject *> QUmlReclassifyObjectActionObject::outputs() const
 
 bool QUmlReclassifyObjectActionObject::isReplaceAll() const
 {
-    return qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->isReplaceAll();
+    return qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->isReplaceAll();
 }
 
 const QSet<QObject *> QUmlReclassifyObjectActionObject::newClassifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->newClassifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->newClassifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlReclassifyObjectActionObject::object() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->object())
+    if (!qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->object())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->object()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->object()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlReclassifyObjectActionObject::oldClassifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->oldClassifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->oldClassifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -326,14 +329,14 @@ const QSet<QObject *> QUmlReclassifyObjectActionObject::oldClassifiers() const
 QSet<QObject *> QUmlReclassifyObjectActionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlReclassifyObjectActionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -341,313 +344,411 @@ bool QUmlReclassifyObjectActionObject::mustBeOwned() const
 QList<QObject *> QUmlReclassifyObjectActionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlReclassifyObjectActionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlReclassifyObjectActionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlReclassifyObjectActionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlReclassifyObjectActionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlReclassifyObjectActionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlReclassifyObjectActionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlReclassifyObjectActionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlReclassifyObjectActionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlReclassifyObjectActionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlReclassifyObjectActionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlReclassifyObjectActionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlReclassifyObjectActionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlReclassifyObjectActionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->setName(name);
 }
 
 void QUmlReclassifyObjectActionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlReclassifyObjectActionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlReclassifyObjectActionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlReclassifyObjectActionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlReclassifyObjectActionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlReclassifyObjectActionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlReclassifyObjectActionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlReclassifyObjectActionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlReclassifyObjectActionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlReclassifyObjectActionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlReclassifyObjectActionObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlReclassifyObjectActionObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlReclassifyObjectActionObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlReclassifyObjectActionObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlReclassifyObjectActionObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlReclassifyObjectActionObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlReclassifyObjectActionObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlReclassifyObjectActionObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlReclassifyObjectActionObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlReclassifyObjectActionObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlReclassifyObjectActionObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlReclassifyObjectActionObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlReclassifyObjectActionObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlReclassifyObjectActionObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlReclassifyObjectActionObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlReclassifyObjectActionObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlReclassifyObjectActionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlReclassifyObjectActionObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlReclassifyObjectActionObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlReclassifyObjectActionObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlReclassifyObjectActionObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlReclassifyObjectActionObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlReclassifyObjectActionObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlReclassifyObjectActionObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlReclassifyObjectActionObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlReclassifyObjectActionObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlReclassifyObjectActionObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ReclassifyObjectAction]
 
 void QUmlReclassifyObjectActionObject::setReplaceAll(bool isReplaceAll)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->setReplaceAll(isReplaceAll);
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->setReplaceAll(isReplaceAll);
 }
 
 void QUmlReclassifyObjectActionObject::unsetReplaceAll()
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("replaceAll"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("replaceAll"));
 }
 
 void QUmlReclassifyObjectActionObject::addNewClassifier(QObject *newClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->addNewClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(newClassifier));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->addNewClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(newClassifier));
 }
 
 void QUmlReclassifyObjectActionObject::removeNewClassifier(QObject *newClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->removeNewClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(newClassifier));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->removeNewClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(newClassifier));
 }
 
 void QUmlReclassifyObjectActionObject::setObject(QObject *object)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->setObject(qmodelingobjectproperty_cast<QUmlInputPin *>(object));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->setObject(qmodelingelementproperty_cast<QUmlInputPin *>(object));
 }
 
 void QUmlReclassifyObjectActionObject::addOldClassifier(QObject *oldClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->addOldClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(oldClassifier));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->addOldClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(oldClassifier));
 }
 
 void QUmlReclassifyObjectActionObject::removeOldClassifier(QObject *oldClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlReclassifyObjectAction *>(this)->removeOldClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(oldClassifier));
+    qmodelingelementproperty_cast<QUmlReclassifyObjectAction *>(this)->removeOldClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(oldClassifier));
+}
+
+
+void QUmlReclassifyObjectActionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlReclassifyObjectAction");
+    d->groupProperties.insert(QStringLiteral("QUmlReclassifyObjectAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isReplaceAll"))));
+    d->groupProperties.insert(QStringLiteral("QUmlReclassifyObjectAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("newClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlReclassifyObjectAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("object"))));
+    d->groupProperties.insert(QStringLiteral("QUmlReclassifyObjectAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("oldClassifiers"))));
+}
+
+void QUmlReclassifyObjectActionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReclassifyObjectAction, isReplaceAll, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReclassifyObjectAction, isReplaceAll, PropertyClassRole, QStringLiteral("QUmlReclassifyObjectAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReclassifyObjectAction, isReplaceAll, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReclassifyObjectAction, isReplaceAll, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReclassifyObjectAction, isReplaceAll, DocumentationRole, QStringLiteral("Specifies whether existing classifiers should be removed before adding the new classifiers."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReclassifyObjectAction, isReplaceAll, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReclassifyObjectAction, isReplaceAll, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReclassifyObjectAction, isReplaceAll, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReclassifyObjectAction, newClassifiers, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReclassifyObjectAction, newClassifiers, PropertyClassRole, QStringLiteral("QUmlReclassifyObjectAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReclassifyObjectAction, newClassifiers, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReclassifyObjectAction, newClassifiers, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReclassifyObjectAction, newClassifiers, DocumentationRole, QStringLiteral("A set of classifiers to be added to the classifiers of the object."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReclassifyObjectAction, newClassifiers, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReclassifyObjectAction, newClassifiers, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReclassifyObjectAction, newClassifiers, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReclassifyObjectAction, object, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReclassifyObjectAction, object, PropertyClassRole, QStringLiteral("QUmlReclassifyObjectAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReclassifyObjectAction, object, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReclassifyObjectAction, object, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReclassifyObjectAction, object, DocumentationRole, QStringLiteral("Holds the object to be reclassified."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReclassifyObjectAction, object, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReclassifyObjectAction, object, SubsettedPropertiesRole, QStringLiteral("Action-input"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReclassifyObjectAction, object, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReclassifyObjectAction, oldClassifiers, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReclassifyObjectAction, oldClassifiers, PropertyClassRole, QStringLiteral("QUmlReclassifyObjectAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReclassifyObjectAction, oldClassifiers, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReclassifyObjectAction, oldClassifiers, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReclassifyObjectAction, oldClassifiers, DocumentationRole, QStringLiteral("A set of classifiers to be removed from the classifiers of the object."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReclassifyObjectAction, oldClassifiers, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReclassifyObjectAction, oldClassifiers, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReclassifyObjectAction, oldClassifiers, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlreclassifyobjectactionobject_p.h b/src/uml/qobjects/qumlreclassifyobjectactionobject_p.h
index d449fef1..103a8186 100644
--- a/src/uml/qobjects/qumlreclassifyobjectactionobject_p.h
+++ b/src/uml/qobjects/qumlreclassifyobjectactionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlReclassifyObjectAction;
-class Q_UML_EXPORT QUmlReclassifyObjectActionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlReclassifyObjectActionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlReclassifyObjectActionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -104,7 +107,7 @@ class Q_UML_EXPORT QUmlReclassifyObjectActionObject : public QObject
     Q_PROPERTY(QSet<QObject *> oldClassifiers READ oldClassifiers)
 
 public:
-    Q_INVOKABLE explicit QUmlReclassifyObjectActionObject(QUmlReclassifyObjectAction *qModelingObject);
+    Q_INVOKABLE explicit QUmlReclassifyObjectActionObject(QUmlReclassifyObjectAction *qModelingElement);
     virtual ~QUmlReclassifyObjectActionObject();
 
     // Owned attributes [Element]
@@ -233,6 +236,10 @@ public Q_SLOTS:
     void setObject(QObject *object = 0);
     void addOldClassifier(QObject *oldClassifier);
     void removeOldClassifier(QObject *oldClassifier);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlredefinabletemplatesignatureobject.cpp b/src/uml/qobjects/qumlredefinabletemplatesignatureobject.cpp
index 1744ab47..21433960 100644
--- a/src/uml/qobjects/qumlredefinabletemplatesignatureobject.cpp
+++ b/src/uml/qobjects/qumlredefinabletemplatesignatureobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlredefinabletemplatesignatureobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlRedefinableTemplateSignature>
 #include <QtUml/QUmlClassifier>
@@ -55,16 +56,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlRedefinableTemplateSignatureObject::QUmlRedefinableTemplateSignatureObject(QUmlRedefinableTemplateSignature *qModelingObject)
+QUmlRedefinableTemplateSignatureObject::QUmlRedefinableTemplateSignatureObject(QUmlRedefinableTemplateSignature *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlRedefinableTemplateSignatureObject::~QUmlRedefinableTemplateSignatureObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -73,25 +76,25 @@ QUmlRedefinableTemplateSignatureObject::~QUmlRedefinableTemplateSignatureObject(
 const QSet<QObject *> QUmlRedefinableTemplateSignatureObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlRedefinableTemplateSignatureObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlRedefinableTemplateSignatureObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [TemplateSignature]
@@ -99,25 +102,25 @@ QObject *QUmlRedefinableTemplateSignatureObject::owner() const
 const QList<QObject *> QUmlRedefinableTemplateSignatureObject::ownedParameters() const
 {
     QList<QObject *> list;
-    foreach (QUmlTemplateParameter *element, qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->ownedParameters())
-        list.append(element->asQObject());
+    foreach (QUmlTemplateParameter *element, qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->ownedParameters())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QList<QObject *> QUmlRedefinableTemplateSignatureObject::parameters() const
 {
     QList<QObject *> list;
-    foreach (QUmlTemplateParameter *element, qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->parameters())
-        list.append(element->asQObject());
+    foreach (QUmlTemplateParameter *element, qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->parameters())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 QObject *QUmlRedefinableTemplateSignatureObject::template_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->template_())
+    if (!qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->template_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->template_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->template_()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -125,62 +128,62 @@ QObject *QUmlRedefinableTemplateSignatureObject::template_() const
 const QSet<QObject *> QUmlRedefinableTemplateSignatureObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlRedefinableTemplateSignatureObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->name();
 }
 
 QObject *QUmlRedefinableTemplateSignatureObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlRedefinableTemplateSignatureObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlRedefinableTemplateSignatureObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlRedefinableTemplateSignatureObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlRedefinableTemplateSignatureObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlRedefinableTemplateSignatureObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlRedefinableTemplateSignatureObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -188,25 +191,25 @@ const QSet<QObject *> QUmlRedefinableTemplateSignatureObject::redefinitionContex
 
 QObject *QUmlRedefinableTemplateSignatureObject::classifier() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->classifier())
+    if (!qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->classifier())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->classifier()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->classifier()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlRedefinableTemplateSignatureObject::extendedSignatures() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableTemplateSignature *element, qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->extendedSignatures())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableTemplateSignature *element, qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->extendedSignatures())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlRedefinableTemplateSignatureObject::inheritedParameters() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTemplateParameter *element, qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->inheritedParameters())
-        set.insert(element->asQObject());
+    foreach (QUmlTemplateParameter *element, qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->inheritedParameters())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -215,14 +218,14 @@ const QSet<QObject *> QUmlRedefinableTemplateSignatureObject::inheritedParameter
 QSet<QObject *> QUmlRedefinableTemplateSignatureObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlRedefinableTemplateSignatureObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -230,191 +233,261 @@ bool QUmlRedefinableTemplateSignatureObject::mustBeOwned() const
 QList<QObject *> QUmlRedefinableTemplateSignatureObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlRedefinableTemplateSignatureObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlRedefinableTemplateSignatureObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlRedefinableTemplateSignatureObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlRedefinableTemplateSignatureObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [RedefinableTemplateSignature]
 
 bool QUmlRedefinableTemplateSignatureObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlRedefinableTemplateSignatureObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlRedefinableTemplateSignatureObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlRedefinableTemplateSignatureObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlRedefinableTemplateSignatureObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlRedefinableTemplateSignatureObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateSignature]
 
 void QUmlRedefinableTemplateSignatureObject::addOwnedParameter(QObject *ownedParameter)
 {
-    qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->addOwnedParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(ownedParameter));
+    qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->addOwnedParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(ownedParameter));
 }
 
 void QUmlRedefinableTemplateSignatureObject::removeOwnedParameter(QObject *ownedParameter)
 {
-    qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->removeOwnedParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(ownedParameter));
+    qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->removeOwnedParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(ownedParameter));
 }
 
 void QUmlRedefinableTemplateSignatureObject::addParameter(QObject *parameter)
 {
-    qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->addParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(parameter));
+    qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->addParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(parameter));
 }
 
 void QUmlRedefinableTemplateSignatureObject::removeParameter(QObject *parameter)
 {
-    qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->removeParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(parameter));
+    qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->removeParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(parameter));
 }
 
 void QUmlRedefinableTemplateSignatureObject::setTemplate(QObject *template_)
 {
-    qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->setTemplate(qmodelingobjectproperty_cast<QUmlTemplateableElement *>(template_));
+    qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->setTemplate(qmodelingelementproperty_cast<QUmlTemplateableElement *>(template_));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlRedefinableTemplateSignatureObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlRedefinableTemplateSignatureObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlRedefinableTemplateSignatureObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->setName(name);
 }
 
 void QUmlRedefinableTemplateSignatureObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlRedefinableTemplateSignatureObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlRedefinableTemplateSignatureObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlRedefinableTemplateSignatureObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlRedefinableTemplateSignatureObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlRedefinableTemplateSignatureObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlRedefinableTemplateSignatureObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlRedefinableTemplateSignatureObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlRedefinableTemplateSignatureObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlRedefinableTemplateSignatureObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableTemplateSignature]
 
 void QUmlRedefinableTemplateSignatureObject::setClassifier(QObject *classifier)
 {
-    qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->setClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(classifier));
+    qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->setClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(classifier));
 }
 
 void QUmlRedefinableTemplateSignatureObject::addExtendedSignature(QObject *extendedSignature)
 {
-    qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->addExtendedSignature(qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(extendedSignature));
+    qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->addExtendedSignature(qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(extendedSignature));
 }
 
 void QUmlRedefinableTemplateSignatureObject::removeExtendedSignature(QObject *extendedSignature)
 {
-    qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->removeExtendedSignature(qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(extendedSignature));
+    qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->removeExtendedSignature(qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(extendedSignature));
 }
 
 void QUmlRedefinableTemplateSignatureObject::addInheritedParameter(QObject *inheritedParameter)
 {
-    qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->addInheritedParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(inheritedParameter));
+    qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->addInheritedParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(inheritedParameter));
 }
 
 void QUmlRedefinableTemplateSignatureObject::removeInheritedParameter(QObject *inheritedParameter)
 {
-    qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(this)->removeInheritedParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(inheritedParameter));
+    qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(this)->removeInheritedParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(inheritedParameter));
+}
+
+
+void QUmlRedefinableTemplateSignatureObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateSignature");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateSignature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameters"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateSignature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parameters"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateSignature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("template_"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableTemplateSignature");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableTemplateSignature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifier"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableTemplateSignature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extendedSignatures"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableTemplateSignature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedParameters"))));
+}
+
+void QUmlRedefinableTemplateSignatureObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRedefinableTemplateSignature, classifier, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRedefinableTemplateSignature, classifier, PropertyClassRole, QStringLiteral("QUmlRedefinableTemplateSignature"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRedefinableTemplateSignature, classifier, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRedefinableTemplateSignature, classifier, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRedefinableTemplateSignature, classifier, DocumentationRole, QStringLiteral("The classifier that owns this template signature."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRedefinableTemplateSignature, classifier, RedefinedPropertiesRole, QStringLiteral("TemplateSignature-template"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRedefinableTemplateSignature, classifier, SubsettedPropertiesRole, QStringLiteral("RedefinableElement-redefinitionContext"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRedefinableTemplateSignature, classifier, OppositeEndRole, QStringLiteral("Classifier-ownedTemplateSignature"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRedefinableTemplateSignature, extendedSignatures, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRedefinableTemplateSignature, extendedSignatures, PropertyClassRole, QStringLiteral("QUmlRedefinableTemplateSignature"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRedefinableTemplateSignature, extendedSignatures, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRedefinableTemplateSignature, extendedSignatures, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRedefinableTemplateSignature, extendedSignatures, DocumentationRole, QStringLiteral("The template signature that is extended by this template signature."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRedefinableTemplateSignature, extendedSignatures, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRedefinableTemplateSignature, extendedSignatures, SubsettedPropertiesRole, QStringLiteral("RedefinableElement-redefinedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRedefinableTemplateSignature, extendedSignatures, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRedefinableTemplateSignature, inheritedParameters, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRedefinableTemplateSignature, inheritedParameters, PropertyClassRole, QStringLiteral("QUmlRedefinableTemplateSignature"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRedefinableTemplateSignature, inheritedParameters, IsDerivedRole, true);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRedefinableTemplateSignature, inheritedParameters, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRedefinableTemplateSignature, inheritedParameters, DocumentationRole, QStringLiteral("The formal template parameters of the extendedSignature."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRedefinableTemplateSignature, inheritedParameters, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRedefinableTemplateSignature, inheritedParameters, SubsettedPropertiesRole, QStringLiteral("TemplateSignature-parameter"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRedefinableTemplateSignature, inheritedParameters, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlredefinabletemplatesignatureobject_p.h b/src/uml/qobjects/qumlredefinabletemplatesignatureobject_p.h
index c504a610..40522403 100644
--- a/src/uml/qobjects/qumlredefinabletemplatesignatureobject_p.h
+++ b/src/uml/qobjects/qumlredefinabletemplatesignatureobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlRedefinableTemplateSignature;
-class Q_UML_EXPORT QUmlRedefinableTemplateSignatureObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlRedefinableTemplateSignatureObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlRedefinableTemplateSignatureObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -87,7 +90,7 @@ class Q_UML_EXPORT QUmlRedefinableTemplateSignatureObject : public QObject
     Q_PROPERTY(QSet<QObject *> inheritedParameters READ inheritedParameters STORED false)
 
 public:
-    Q_INVOKABLE explicit QUmlRedefinableTemplateSignatureObject(QUmlRedefinableTemplateSignature *qModelingObject);
+    Q_INVOKABLE explicit QUmlRedefinableTemplateSignatureObject(QUmlRedefinableTemplateSignature *qModelingElement);
     virtual ~QUmlRedefinableTemplateSignatureObject();
 
     // Owned attributes [Element]
@@ -173,6 +176,10 @@ public Q_SLOTS:
     void removeExtendedSignature(QObject *extendedSignature);
     void Q_DECL_HIDDEN addInheritedParameter(QObject *inheritedParameter);
     void Q_DECL_HIDDEN removeInheritedParameter(QObject *inheritedParameter);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlreduceactionobject.cpp b/src/uml/qobjects/qumlreduceactionobject.cpp
index 8ea2eaac..617e9edb 100644
--- a/src/uml/qobjects/qumlreduceactionobject.cpp
+++ b/src/uml/qobjects/qumlreduceactionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlreduceactionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlReduceAction>
 #include <QtUml/QUmlActivity>
@@ -65,16 +66,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlReduceActionObject::QUmlReduceActionObject(QUmlReduceAction *qModelingObject)
+QUmlReduceActionObject::QUmlReduceActionObject(QUmlReduceAction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlReduceActionObject::~QUmlReduceActionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlReduceAction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -83,25 +86,25 @@ QUmlReduceActionObject::~QUmlReduceActionObject()
 const QSet<QObject *> QUmlReduceActionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlReduceAction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReduceActionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlReduceAction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlReduceActionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlReduceAction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReduceAction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -109,62 +112,62 @@ QObject *QUmlReduceActionObject::owner() const
 const QSet<QObject *> QUmlReduceActionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlReduceAction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlReduceActionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlReduceAction *>(this)->name();
 }
 
 QObject *QUmlReduceActionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlReduceAction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReduceAction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlReduceActionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlReduceAction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReduceAction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlReduceActionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlReduceAction *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlReduceActionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlReduceAction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlReduceActionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlReduceAction *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlReduceActionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlReduceAction *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReduceActionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlReduceAction *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -172,65 +175,65 @@ const QSet<QObject *> QUmlReduceActionObject::redefinitionContexts() const
 
 QObject *QUmlReduceActionObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlReduceAction *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReduceAction *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlReduceActionObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlReduceAction *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReduceActionObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlReduceAction *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReduceActionObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlReduceAction *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlReduceActionObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlReduceAction *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReduceAction *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlReduceActionObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlReduceAction *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReduceActionObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlReduceAction *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReduceActionObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlReduceAction *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -239,8 +242,8 @@ const QSet<QObject *> QUmlReduceActionObject::redefinedNodes() const
 const QSet<QObject *> QUmlReduceActionObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlReduceAction *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -248,46 +251,46 @@ const QSet<QObject *> QUmlReduceActionObject::handlers() const
 
 QObject *QUmlReduceActionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlReduceAction *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReduceAction *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlReduceActionObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlReduceAction *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlReduceActionObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlReduceAction *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlReduceActionObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlReduceAction *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReduceActionObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlReduceAction *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlReduceActionObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlReduceAction *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -295,31 +298,31 @@ const QList<QObject *> QUmlReduceActionObject::outputs() const
 
 QObject *QUmlReduceActionObject::collection() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->collection())
+    if (!qmodelingelementproperty_cast<QUmlReduceAction *>(this)->collection())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->collection()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReduceAction *>(this)->collection()->asQModelingObject();
 }
 
 bool QUmlReduceActionObject::isOrdered() const
 {
-    return qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->isOrdered();
+    return qmodelingelementproperty_cast<QUmlReduceAction *>(this)->isOrdered();
 }
 
 QObject *QUmlReduceActionObject::reducer() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->reducer())
+    if (!qmodelingelementproperty_cast<QUmlReduceAction *>(this)->reducer())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->reducer()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReduceAction *>(this)->reducer()->asQModelingObject();
 }
 
 QObject *QUmlReduceActionObject::result() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->result())
+    if (!qmodelingelementproperty_cast<QUmlReduceAction *>(this)->result())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->result()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReduceAction *>(this)->result()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -327,14 +330,14 @@ QObject *QUmlReduceActionObject::result() const
 QSet<QObject *> QUmlReduceActionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlReduceAction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlReduceActionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlReduceAction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -342,303 +345,401 @@ bool QUmlReduceActionObject::mustBeOwned() const
 QList<QObject *> QUmlReduceActionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlReduceAction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlReduceActionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlReduceAction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlReduceActionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlReduceAction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlReduceActionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlReduceAction *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlReduceActionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlReduceAction *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlReduceActionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlReduceAction *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlReduceActionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlReduceActionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlReduceActionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlReduceActionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlReduceActionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlReduceActionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlReduceActionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlReduceActionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->setName(name);
 }
 
 void QUmlReduceActionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlReduceActionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlReduceActionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlReduceActionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlReduceActionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlReduceActionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlReduceActionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlReduceActionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlReduceActionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlReduceActionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlReduceActionObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlReduceActionObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlReduceActionObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlReduceActionObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlReduceActionObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlReduceActionObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlReduceActionObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlReduceActionObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlReduceActionObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlReduceActionObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlReduceActionObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlReduceActionObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlReduceActionObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlReduceActionObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlReduceActionObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlReduceActionObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlReduceActionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlReduceActionObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlReduceActionObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlReduceActionObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlReduceActionObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlReduceActionObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlReduceActionObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlReduceActionObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlReduceActionObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlReduceActionObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlReduceActionObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ReduceAction]
 
 void QUmlReduceActionObject::setCollection(QObject *collection)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->setCollection(qmodelingobjectproperty_cast<QUmlInputPin *>(collection));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->setCollection(qmodelingelementproperty_cast<QUmlInputPin *>(collection));
 }
 
 void QUmlReduceActionObject::setOrdered(bool isOrdered)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->setOrdered(isOrdered);
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->setOrdered(isOrdered);
 }
 
 void QUmlReduceActionObject::unsetOrdered()
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("ordered"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("ordered"));
 }
 
 void QUmlReduceActionObject::setReducer(QObject *reducer)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->setReducer(qmodelingobjectproperty_cast<QUmlBehavior *>(reducer));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->setReducer(qmodelingelementproperty_cast<QUmlBehavior *>(reducer));
 }
 
 void QUmlReduceActionObject::setResult(QObject *result)
 {
-    qmodelingobjectproperty_cast<QUmlReduceAction *>(this)->setResult(qmodelingobjectproperty_cast<QUmlOutputPin *>(result));
+    qmodelingelementproperty_cast<QUmlReduceAction *>(this)->setResult(qmodelingelementproperty_cast<QUmlOutputPin *>(result));
+}
+
+
+void QUmlReduceActionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlReduceAction");
+    d->groupProperties.insert(QStringLiteral("QUmlReduceAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collection"))));
+    d->groupProperties.insert(QStringLiteral("QUmlReduceAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isOrdered"))));
+    d->groupProperties.insert(QStringLiteral("QUmlReduceAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("reducer"))));
+    d->groupProperties.insert(QStringLiteral("QUmlReduceAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("result"))));
+}
+
+void QUmlReduceActionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReduceAction, collection, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReduceAction, collection, PropertyClassRole, QStringLiteral("QUmlReduceAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReduceAction, collection, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReduceAction, collection, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReduceAction, collection, DocumentationRole, QStringLiteral("The collection to be reduced."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReduceAction, collection, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReduceAction, collection, SubsettedPropertiesRole, QStringLiteral("Action-input"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReduceAction, collection, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReduceAction, isOrdered, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReduceAction, isOrdered, PropertyClassRole, QStringLiteral("QUmlReduceAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReduceAction, isOrdered, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReduceAction, isOrdered, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReduceAction, isOrdered, DocumentationRole, QStringLiteral("Tells whether the order of the input collection should determine the order in which the behavior is applied to its elements."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReduceAction, isOrdered, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReduceAction, isOrdered, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReduceAction, isOrdered, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReduceAction, reducer, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReduceAction, reducer, PropertyClassRole, QStringLiteral("QUmlReduceAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReduceAction, reducer, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReduceAction, reducer, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReduceAction, reducer, DocumentationRole, QStringLiteral("Behavior that is applied to two elements of the input collection to produce a value that is the same type as elements of the collection."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReduceAction, reducer, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReduceAction, reducer, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReduceAction, reducer, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReduceAction, result, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReduceAction, result, PropertyClassRole, QStringLiteral("QUmlReduceAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReduceAction, result, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReduceAction, result, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReduceAction, result, DocumentationRole, QStringLiteral("Gives the output pin on which the result is put."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReduceAction, result, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReduceAction, result, SubsettedPropertiesRole, QStringLiteral("Action-output"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReduceAction, result, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlreduceactionobject_p.h b/src/uml/qobjects/qumlreduceactionobject_p.h
index c8e0ef16..c52c925a 100644
--- a/src/uml/qobjects/qumlreduceactionobject_p.h
+++ b/src/uml/qobjects/qumlreduceactionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlReduceAction;
-class Q_UML_EXPORT QUmlReduceActionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlReduceActionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlReduceActionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -104,7 +107,7 @@ class Q_UML_EXPORT QUmlReduceActionObject : public QObject
     Q_PROPERTY(QObject * result READ result WRITE setResult)
 
 public:
-    Q_INVOKABLE explicit QUmlReduceActionObject(QUmlReduceAction *qModelingObject);
+    Q_INVOKABLE explicit QUmlReduceActionObject(QUmlReduceAction *qModelingElement);
     virtual ~QUmlReduceActionObject();
 
     // Owned attributes [Element]
@@ -231,6 +234,10 @@ public Q_SLOTS:
     void unsetOrdered();
     void setReducer(QObject *reducer = 0);
     void setResult(QObject *result = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlregionobject.cpp b/src/uml/qobjects/qumlregionobject.cpp
index 6b297617..7590f0cf 100644
--- a/src/uml/qobjects/qumlregionobject.cpp
+++ b/src/uml/qobjects/qumlregionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlregionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlRegion>
 #include <QtUml/QUmlClassifier>
@@ -61,16 +62,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlRegionObject::QUmlRegionObject(QUmlRegion *qModelingObject)
+QUmlRegionObject::QUmlRegionObject(QUmlRegion *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlRegionObject::~QUmlRegionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlRegion *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlRegion *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -79,25 +82,25 @@ QUmlRegionObject::~QUmlRegionObject()
 const QSet<QObject *> QUmlRegionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlRegion *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlRegion *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlRegionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlRegion *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlRegion *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlRegionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRegion *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlRegion *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRegion *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRegion *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -105,54 +108,54 @@ QObject *QUmlRegionObject::owner() const
 const QSet<QObject *> QUmlRegionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlRegion *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlRegion *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlRegionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlRegion *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlRegion *>(this)->name();
 }
 
 QObject *QUmlRegionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRegion *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlRegion *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRegion *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRegion *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlRegionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRegion *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlRegion *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRegion *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRegion *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlRegionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlRegion *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlRegion *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlRegionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlRegion *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlRegion *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlRegionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlRegion *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlRegion *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlRegionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlRegion *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlRegion *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -161,48 +164,48 @@ const QSet<QObject *> QUmlRegionObject::redefinedElements() const
 const QSet<QObject *> QUmlRegionObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlRegion *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlRegion *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlRegionObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlRegion *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlRegion *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlRegionObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlRegion *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlRegion *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlRegionObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlRegion *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlRegion *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlRegionObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlRegion *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlRegion *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlRegionObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlRegion *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlRegion *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -210,49 +213,49 @@ const QSet<QObject *> QUmlRegionObject::packageImports() const
 
 QObject *QUmlRegionObject::extendedRegion() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRegion *>(this)->extendedRegion())
+    if (!qmodelingelementproperty_cast<QUmlRegion *>(this)->extendedRegion())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRegion *>(this)->extendedRegion()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRegion *>(this)->extendedRegion()->asQModelingObject();
 }
 
 QObject *QUmlRegionObject::redefinitionContext() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRegion *>(this)->redefinitionContext())
+    if (!qmodelingelementproperty_cast<QUmlRegion *>(this)->redefinitionContext())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRegion *>(this)->redefinitionContext()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRegion *>(this)->redefinitionContext()->asQModelingObject();
 }
 
 QObject *QUmlRegionObject::state() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRegion *>(this)->state())
+    if (!qmodelingelementproperty_cast<QUmlRegion *>(this)->state())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRegion *>(this)->state()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRegion *>(this)->state()->asQModelingObject();
 }
 
 QObject *QUmlRegionObject::stateMachine() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRegion *>(this)->stateMachine())
+    if (!qmodelingelementproperty_cast<QUmlRegion *>(this)->stateMachine())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRegion *>(this)->stateMachine()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRegion *>(this)->stateMachine()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlRegionObject::subvertices() const
 {
     QSet<QObject *> set;
-    foreach (QUmlVertex *element, qmodelingobjectproperty_cast<QUmlRegion *>(this)->subvertices())
-        set.insert(element->asQObject());
+    foreach (QUmlVertex *element, qmodelingelementproperty_cast<QUmlRegion *>(this)->subvertices())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlRegionObject::transitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTransition *element, qmodelingobjectproperty_cast<QUmlRegion *>(this)->transitions())
-        set.insert(element->asQObject());
+    foreach (QUmlTransition *element, qmodelingelementproperty_cast<QUmlRegion *>(this)->transitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -261,14 +264,14 @@ const QSet<QObject *> QUmlRegionObject::transitions() const
 QSet<QObject *> QUmlRegionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlRegion *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlRegion *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlRegionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlRegion *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlRegion *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -276,27 +279,27 @@ bool QUmlRegionObject::mustBeOwned() const
 QList<QObject *> QUmlRegionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlRegion *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlRegion *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlRegionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlRegion *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlRegion *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlRegionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlRegion *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlRegion *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlRegionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlRegion *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlRegion *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
@@ -306,246 +309,348 @@ QSet<QObject *> QUmlRegionObject::excludeCollisions(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlRegion *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlRegion *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlRegionObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlRegion *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlRegion *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlRegionObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlRegion *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlRegion *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlRegionObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlRegion *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlRegion *>(this)->membersAreDistinguishable();
 }
 
 // OPERATIONS [Region]
 
 bool QUmlRegionObject::belongsToPSM() const
 {
-    return qmodelingobjectproperty_cast<QUmlRegion *>(this)->belongsToPSM();
+    return qmodelingelementproperty_cast<QUmlRegion *>(this)->belongsToPSM();
 }
 
 QObject *QUmlRegionObject::containingStateMachine() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRegion *>(this)->containingStateMachine())
+    if (!qmodelingelementproperty_cast<QUmlRegion *>(this)->containingStateMachine())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRegion *>(this)->containingStateMachine()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRegion *>(this)->containingStateMachine()->asQModelingObject();
 }
 
 bool QUmlRegionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlRegion *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlRegion *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlRegionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlRegion *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRegion *>(redefined));
+    return qmodelingelementproperty_cast<QUmlRegion *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRegion *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlRegionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlRegion *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlRegion *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlRegionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlRegion *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlRegion *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlRegionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlRegion *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlRegion *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlRegionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlRegion *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlRegion *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlRegionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlRegion *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlRegion *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlRegionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlRegion *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlRegion *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlRegionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlRegion *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlRegion *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlRegionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlRegion *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlRegion *>(this)->setName(name);
 }
 
 void QUmlRegionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlRegion *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlRegion *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlRegionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlRegion *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlRegion *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlRegionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlRegion *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlRegion *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlRegionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlRegion *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlRegion *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlRegionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlRegion *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlRegion *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlRegionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlRegion *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlRegionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlRegion *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlRegion *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlRegionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlRegion *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlRegion *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlRegionObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlRegion *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlRegion *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlRegionObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlRegion *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlRegion *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlRegionObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlRegion *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlRegion *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlRegionObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlRegion *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlRegion *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlRegionObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlRegion *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlRegion *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlRegionObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlRegion *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlRegion *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlRegionObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlRegion *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlRegion *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlRegionObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlRegion *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlRegion *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlRegionObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlRegion *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlRegion *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlRegionObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlRegion *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlRegion *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlRegionObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlRegion *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlRegion *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlRegionObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlRegion *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlRegion *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Region]
 
 void QUmlRegionObject::setExtendedRegion(QObject *extendedRegion)
 {
-    qmodelingobjectproperty_cast<QUmlRegion *>(this)->setExtendedRegion(qmodelingobjectproperty_cast<QUmlRegion *>(extendedRegion));
+    qmodelingelementproperty_cast<QUmlRegion *>(this)->setExtendedRegion(qmodelingelementproperty_cast<QUmlRegion *>(extendedRegion));
 }
 
 void QUmlRegionObject::setRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlRegion *>(this)->setRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlRegion *>(this)->setRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlRegionObject::setState(QObject *state)
 {
-    qmodelingobjectproperty_cast<QUmlRegion *>(this)->setState(qmodelingobjectproperty_cast<QUmlState *>(state));
+    qmodelingelementproperty_cast<QUmlRegion *>(this)->setState(qmodelingelementproperty_cast<QUmlState *>(state));
 }
 
 void QUmlRegionObject::setStateMachine(QObject *stateMachine)
 {
-    qmodelingobjectproperty_cast<QUmlRegion *>(this)->setStateMachine(qmodelingobjectproperty_cast<QUmlStateMachine *>(stateMachine));
+    qmodelingelementproperty_cast<QUmlRegion *>(this)->setStateMachine(qmodelingelementproperty_cast<QUmlStateMachine *>(stateMachine));
 }
 
 void QUmlRegionObject::addSubvertex(QObject *subvertex)
 {
-    qmodelingobjectproperty_cast<QUmlRegion *>(this)->addSubvertex(qmodelingobjectproperty_cast<QUmlVertex *>(subvertex));
+    qmodelingelementproperty_cast<QUmlRegion *>(this)->addSubvertex(qmodelingelementproperty_cast<QUmlVertex *>(subvertex));
 }
 
 void QUmlRegionObject::removeSubvertex(QObject *subvertex)
 {
-    qmodelingobjectproperty_cast<QUmlRegion *>(this)->removeSubvertex(qmodelingobjectproperty_cast<QUmlVertex *>(subvertex));
+    qmodelingelementproperty_cast<QUmlRegion *>(this)->removeSubvertex(qmodelingelementproperty_cast<QUmlVertex *>(subvertex));
 }
 
 void QUmlRegionObject::addTransition(QObject *transition)
 {
-    qmodelingobjectproperty_cast<QUmlRegion *>(this)->addTransition(qmodelingobjectproperty_cast<QUmlTransition *>(transition));
+    qmodelingelementproperty_cast<QUmlRegion *>(this)->addTransition(qmodelingelementproperty_cast<QUmlTransition *>(transition));
 }
 
 void QUmlRegionObject::removeTransition(QObject *transition)
 {
-    qmodelingobjectproperty_cast<QUmlRegion *>(this)->removeTransition(qmodelingobjectproperty_cast<QUmlTransition *>(transition));
+    qmodelingelementproperty_cast<QUmlRegion *>(this)->removeTransition(qmodelingelementproperty_cast<QUmlTransition *>(transition));
+}
+
+
+void QUmlRegionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRegion");
+    d->groupProperties.insert(QStringLiteral("QUmlRegion"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extendedRegion"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRegion"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContext"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRegion"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("state"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRegion"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("stateMachine"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRegion"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("subvertices"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRegion"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("transitions"))));
+}
+
+void QUmlRegionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, extendedRegion, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, extendedRegion, PropertyClassRole, QStringLiteral("QUmlRegion"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, extendedRegion, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, extendedRegion, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, extendedRegion, DocumentationRole, QStringLiteral("The region of which this region is an extension."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, extendedRegion, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, extendedRegion, SubsettedPropertiesRole, QStringLiteral("RedefinableElement-redefinedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, extendedRegion, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, redefinitionContext, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, redefinitionContext, PropertyClassRole, QStringLiteral("QUmlRegion"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, redefinitionContext, IsDerivedRole, true);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, redefinitionContext, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, redefinitionContext, DocumentationRole, QStringLiteral("References the classifier in which context this element may be redefined."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, redefinitionContext, RedefinedPropertiesRole, QStringLiteral("RedefinableElement-redefinitionContext"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, redefinitionContext, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, redefinitionContext, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, state, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, state, PropertyClassRole, QStringLiteral("QUmlRegion"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, state, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, state, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, state, DocumentationRole, QStringLiteral("The State that owns the Region. If a Region is owned by a State, then it cannot also be owned by a StateMachine."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, state, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, state, SubsettedPropertiesRole, QStringLiteral("NamedElement-namespace"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, state, OppositeEndRole, QStringLiteral("State-region"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, stateMachine, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, stateMachine, PropertyClassRole, QStringLiteral("QUmlRegion"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, stateMachine, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, stateMachine, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, stateMachine, DocumentationRole, QStringLiteral("The StateMachine that owns the Region. If a Region is owned by a StateMachine, then it cannot also be owned by a State."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, stateMachine, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, stateMachine, SubsettedPropertiesRole, QStringLiteral("NamedElement-namespace"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, stateMachine, OppositeEndRole, QStringLiteral("StateMachine-region"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, subvertices, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, subvertices, PropertyClassRole, QStringLiteral("QUmlRegion"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, subvertices, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, subvertices, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, subvertices, DocumentationRole, QStringLiteral("The set of vertices that are owned by this region."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, subvertices, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, subvertices, SubsettedPropertiesRole, QStringLiteral("Namespace-ownedMember"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, subvertices, OppositeEndRole, QStringLiteral("Vertex-container"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, transitions, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, transitions, PropertyClassRole, QStringLiteral("QUmlRegion"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, transitions, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, transitions, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, transitions, DocumentationRole, QStringLiteral("The set of transitions owned by the region."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, transitions, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, transitions, SubsettedPropertiesRole, QStringLiteral("Namespace-ownedMember"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRegion, transitions, OppositeEndRole, QStringLiteral("Transition-container"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlregionobject_p.h b/src/uml/qobjects/qumlregionobject_p.h
index 547c0670..85353882 100644
--- a/src/uml/qobjects/qumlregionobject_p.h
+++ b/src/uml/qobjects/qumlregionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlRegion;
-class Q_UML_EXPORT QUmlRegionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlRegionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlRegionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -92,7 +95,7 @@ class Q_UML_EXPORT QUmlRegionObject : public QObject
     Q_PROPERTY(QSet<QObject *> transitions READ transitions)
 
 public:
-    Q_INVOKABLE explicit QUmlRegionObject(QUmlRegion *qModelingObject);
+    Q_INVOKABLE explicit QUmlRegionObject(QUmlRegion *qModelingElement);
     virtual ~QUmlRegionObject();
 
     // Owned attributes [Element]
@@ -199,6 +202,10 @@ public Q_SLOTS:
     void removeSubvertex(QObject *subvertex);
     void addTransition(QObject *transition);
     void removeTransition(QObject *transition);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlremovestructuralfeaturevalueactionobject.cpp b/src/uml/qobjects/qumlremovestructuralfeaturevalueactionobject.cpp
index 647a93c1..699124f7 100644
--- a/src/uml/qobjects/qumlremovestructuralfeaturevalueactionobject.cpp
+++ b/src/uml/qobjects/qumlremovestructuralfeaturevalueactionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlremovestructuralfeaturevalueactionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlRemoveStructuralFeatureValueAction>
 #include <QtUml/QUmlActivity>
@@ -65,16 +66,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlRemoveStructuralFeatureValueActionObject::QUmlRemoveStructuralFeatureValueActionObject(QUmlRemoveStructuralFeatureValueAction *qModelingObject)
+QUmlRemoveStructuralFeatureValueActionObject::QUmlRemoveStructuralFeatureValueActionObject(QUmlRemoveStructuralFeatureValueAction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlRemoveStructuralFeatureValueActionObject::~QUmlRemoveStructuralFeatureValueActionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -83,25 +86,25 @@ QUmlRemoveStructuralFeatureValueActionObject::~QUmlRemoveStructuralFeatureValueA
 const QSet<QObject *> QUmlRemoveStructuralFeatureValueActionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlRemoveStructuralFeatureValueActionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlRemoveStructuralFeatureValueActionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -109,62 +112,62 @@ QObject *QUmlRemoveStructuralFeatureValueActionObject::owner() const
 const QSet<QObject *> QUmlRemoveStructuralFeatureValueActionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlRemoveStructuralFeatureValueActionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->name();
 }
 
 QObject *QUmlRemoveStructuralFeatureValueActionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlRemoveStructuralFeatureValueActionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlRemoveStructuralFeatureValueActionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlRemoveStructuralFeatureValueActionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlRemoveStructuralFeatureValueActionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlRemoveStructuralFeatureValueActionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlRemoveStructuralFeatureValueActionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -172,65 +175,65 @@ const QSet<QObject *> QUmlRemoveStructuralFeatureValueActionObject::redefinition
 
 QObject *QUmlRemoveStructuralFeatureValueActionObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlRemoveStructuralFeatureValueActionObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlRemoveStructuralFeatureValueActionObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlRemoveStructuralFeatureValueActionObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlRemoveStructuralFeatureValueActionObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlRemoveStructuralFeatureValueActionObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlRemoveStructuralFeatureValueActionObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlRemoveStructuralFeatureValueActionObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -239,8 +242,8 @@ const QSet<QObject *> QUmlRemoveStructuralFeatureValueActionObject::redefinedNod
 const QSet<QObject *> QUmlRemoveStructuralFeatureValueActionObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -248,46 +251,46 @@ const QSet<QObject *> QUmlRemoveStructuralFeatureValueActionObject::handlers() c
 
 QObject *QUmlRemoveStructuralFeatureValueActionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlRemoveStructuralFeatureValueActionObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlRemoveStructuralFeatureValueActionObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlRemoveStructuralFeatureValueActionObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlRemoveStructuralFeatureValueActionObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlRemoveStructuralFeatureValueActionObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -295,51 +298,51 @@ const QList<QObject *> QUmlRemoveStructuralFeatureValueActionObject::outputs() c
 
 QObject *QUmlRemoveStructuralFeatureValueActionObject::object() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->object())
+    if (!qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->object())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->object()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->object()->asQModelingObject();
 }
 
 QObject *QUmlRemoveStructuralFeatureValueActionObject::structuralFeature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->structuralFeature())
+    if (!qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->structuralFeature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->structuralFeature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->structuralFeature()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [WriteStructuralFeatureAction]
 
 QObject *QUmlRemoveStructuralFeatureValueActionObject::result() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->result())
+    if (!qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->result())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->result()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->result()->asQModelingObject();
 }
 
 QObject *QUmlRemoveStructuralFeatureValueActionObject::value() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->value())
+    if (!qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->value())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->value()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->value()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [RemoveStructuralFeatureValueAction]
 
 bool QUmlRemoveStructuralFeatureValueActionObject::isRemoveDuplicates() const
 {
-    return qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->isRemoveDuplicates();
+    return qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->isRemoveDuplicates();
 }
 
 QObject *QUmlRemoveStructuralFeatureValueActionObject::removeAt() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->removeAt())
+    if (!qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->removeAt())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->removeAt()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->removeAt()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -347,14 +350,14 @@ QObject *QUmlRemoveStructuralFeatureValueActionObject::removeAt() const
 QSet<QObject *> QUmlRemoveStructuralFeatureValueActionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlRemoveStructuralFeatureValueActionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -362,317 +365,403 @@ bool QUmlRemoveStructuralFeatureValueActionObject::mustBeOwned() const
 QList<QObject *> QUmlRemoveStructuralFeatureValueActionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlRemoveStructuralFeatureValueActionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlRemoveStructuralFeatureValueActionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlRemoveStructuralFeatureValueActionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlRemoveStructuralFeatureValueActionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlRemoveStructuralFeatureValueActionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlRemoveStructuralFeatureValueActionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlRemoveStructuralFeatureValueActionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->setName(name);
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlRemoveStructuralFeatureValueActionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlRemoveStructuralFeatureValueActionObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlRemoveStructuralFeatureValueActionObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlRemoveStructuralFeatureValueActionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [StructuralFeatureAction]
 
 void QUmlRemoveStructuralFeatureValueActionObject::setObject(QObject *object)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->setObject(qmodelingobjectproperty_cast<QUmlInputPin *>(object));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->setObject(qmodelingelementproperty_cast<QUmlInputPin *>(object));
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::setStructuralFeature(QObject *structuralFeature)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->setStructuralFeature(qmodelingobjectproperty_cast<QUmlStructuralFeature *>(structuralFeature));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->setStructuralFeature(qmodelingelementproperty_cast<QUmlStructuralFeature *>(structuralFeature));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [WriteStructuralFeatureAction]
 
 void QUmlRemoveStructuralFeatureValueActionObject::setResult(QObject *result)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->setResult(qmodelingobjectproperty_cast<QUmlOutputPin *>(result));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->setResult(qmodelingelementproperty_cast<QUmlOutputPin *>(result));
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::setValue(QObject *value)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->setValue(qmodelingobjectproperty_cast<QUmlInputPin *>(value));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->setValue(qmodelingelementproperty_cast<QUmlInputPin *>(value));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RemoveStructuralFeatureValueAction]
 
 void QUmlRemoveStructuralFeatureValueActionObject::setRemoveDuplicates(bool isRemoveDuplicates)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->setRemoveDuplicates(isRemoveDuplicates);
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->setRemoveDuplicates(isRemoveDuplicates);
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::unsetRemoveDuplicates()
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("removeDuplicates"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("removeDuplicates"));
 }
 
 void QUmlRemoveStructuralFeatureValueActionObject::setRemoveAt(QObject *removeAt)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->setRemoveAt(qmodelingobjectproperty_cast<QUmlInputPin *>(removeAt));
+    qmodelingelementproperty_cast<QUmlRemoveStructuralFeatureValueAction *>(this)->setRemoveAt(qmodelingelementproperty_cast<QUmlInputPin *>(removeAt));
+}
+
+
+void QUmlRemoveStructuralFeatureValueActionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlStructuralFeatureAction");
+    d->groupProperties.insert(QStringLiteral("QUmlStructuralFeatureAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("object"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuralFeatureAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("structuralFeature"))));
+
+    d->propertyGroups << QStringLiteral("QUmlWriteStructuralFeatureAction");
+    d->groupProperties.insert(QStringLiteral("QUmlWriteStructuralFeatureAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("result"))));
+    d->groupProperties.insert(QStringLiteral("QUmlWriteStructuralFeatureAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("value"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRemoveStructuralFeatureValueAction");
+    d->groupProperties.insert(QStringLiteral("QUmlRemoveStructuralFeatureValueAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isRemoveDuplicates"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRemoveStructuralFeatureValueAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("removeAt"))));
+}
+
+void QUmlRemoveStructuralFeatureValueActionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRemoveStructuralFeatureValueAction, isRemoveDuplicates, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRemoveStructuralFeatureValueAction, isRemoveDuplicates, PropertyClassRole, QStringLiteral("QUmlRemoveStructuralFeatureValueAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRemoveStructuralFeatureValueAction, isRemoveDuplicates, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRemoveStructuralFeatureValueAction, isRemoveDuplicates, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRemoveStructuralFeatureValueAction, isRemoveDuplicates, DocumentationRole, QStringLiteral("Specifies whether to remove duplicates of the value in nonunique structural features."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRemoveStructuralFeatureValueAction, isRemoveDuplicates, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRemoveStructuralFeatureValueAction, isRemoveDuplicates, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRemoveStructuralFeatureValueAction, isRemoveDuplicates, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRemoveStructuralFeatureValueAction, removeAt, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRemoveStructuralFeatureValueAction, removeAt, PropertyClassRole, QStringLiteral("QUmlRemoveStructuralFeatureValueAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRemoveStructuralFeatureValueAction, removeAt, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRemoveStructuralFeatureValueAction, removeAt, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRemoveStructuralFeatureValueAction, removeAt, DocumentationRole, QStringLiteral("Specifies the position of an existing value to remove in ordered nonunique structural features. The type of the pin is UnlimitedNatural, but the value cannot be zero or unlimited."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRemoveStructuralFeatureValueAction, removeAt, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRemoveStructuralFeatureValueAction, removeAt, SubsettedPropertiesRole, QStringLiteral("Action-input"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRemoveStructuralFeatureValueAction, removeAt, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlremovestructuralfeaturevalueactionobject_p.h b/src/uml/qobjects/qumlremovestructuralfeaturevalueactionobject_p.h
index d382d773..a98f247a 100644
--- a/src/uml/qobjects/qumlremovestructuralfeaturevalueactionobject_p.h
+++ b/src/uml/qobjects/qumlremovestructuralfeaturevalueactionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlRemoveStructuralFeatureValueAction;
-class Q_UML_EXPORT QUmlRemoveStructuralFeatureValueActionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlRemoveStructuralFeatureValueActionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlRemoveStructuralFeatureValueActionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -110,7 +113,7 @@ class Q_UML_EXPORT QUmlRemoveStructuralFeatureValueActionObject : public QObject
     Q_PROPERTY(QObject * removeAt READ removeAt WRITE setRemoveAt)
 
 public:
-    Q_INVOKABLE explicit QUmlRemoveStructuralFeatureValueActionObject(QUmlRemoveStructuralFeatureValueAction *qModelingObject);
+    Q_INVOKABLE explicit QUmlRemoveStructuralFeatureValueActionObject(QUmlRemoveStructuralFeatureValueAction *qModelingElement);
     virtual ~QUmlRemoveStructuralFeatureValueActionObject();
 
     // Owned attributes [Element]
@@ -249,6 +252,10 @@ public Q_SLOTS:
     void setRemoveDuplicates(bool isRemoveDuplicates);
     void unsetRemoveDuplicates();
     void setRemoveAt(QObject *removeAt = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlremovevariablevalueactionobject.cpp b/src/uml/qobjects/qumlremovevariablevalueactionobject.cpp
index 6b135b19..1e627389 100644
--- a/src/uml/qobjects/qumlremovevariablevalueactionobject.cpp
+++ b/src/uml/qobjects/qumlremovevariablevalueactionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlremovevariablevalueactionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlRemoveVariableValueAction>
 #include <QtUml/QUmlActivity>
@@ -65,16 +66,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlRemoveVariableValueActionObject::QUmlRemoveVariableValueActionObject(QUmlRemoveVariableValueAction *qModelingObject)
+QUmlRemoveVariableValueActionObject::QUmlRemoveVariableValueActionObject(QUmlRemoveVariableValueAction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlRemoveVariableValueActionObject::~QUmlRemoveVariableValueActionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -83,25 +86,25 @@ QUmlRemoveVariableValueActionObject::~QUmlRemoveVariableValueActionObject()
 const QSet<QObject *> QUmlRemoveVariableValueActionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlRemoveVariableValueActionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlRemoveVariableValueActionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -109,62 +112,62 @@ QObject *QUmlRemoveVariableValueActionObject::owner() const
 const QSet<QObject *> QUmlRemoveVariableValueActionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlRemoveVariableValueActionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->name();
 }
 
 QObject *QUmlRemoveVariableValueActionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlRemoveVariableValueActionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlRemoveVariableValueActionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlRemoveVariableValueActionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlRemoveVariableValueActionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlRemoveVariableValueActionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlRemoveVariableValueActionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -172,65 +175,65 @@ const QSet<QObject *> QUmlRemoveVariableValueActionObject::redefinitionContexts(
 
 QObject *QUmlRemoveVariableValueActionObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlRemoveVariableValueActionObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlRemoveVariableValueActionObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlRemoveVariableValueActionObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlRemoveVariableValueActionObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlRemoveVariableValueActionObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlRemoveVariableValueActionObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlRemoveVariableValueActionObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -239,8 +242,8 @@ const QSet<QObject *> QUmlRemoveVariableValueActionObject::redefinedNodes() cons
 const QSet<QObject *> QUmlRemoveVariableValueActionObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -248,46 +251,46 @@ const QSet<QObject *> QUmlRemoveVariableValueActionObject::handlers() const
 
 QObject *QUmlRemoveVariableValueActionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlRemoveVariableValueActionObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlRemoveVariableValueActionObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlRemoveVariableValueActionObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlRemoveVariableValueActionObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlRemoveVariableValueActionObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -295,35 +298,35 @@ const QList<QObject *> QUmlRemoveVariableValueActionObject::outputs() const
 
 QObject *QUmlRemoveVariableValueActionObject::variable() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->variable())
+    if (!qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->variable())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->variable()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->variable()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [WriteVariableAction]
 
 QObject *QUmlRemoveVariableValueActionObject::value() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->value())
+    if (!qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->value())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->value()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->value()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [RemoveVariableValueAction]
 
 bool QUmlRemoveVariableValueActionObject::isRemoveDuplicates() const
 {
-    return qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->isRemoveDuplicates();
+    return qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->isRemoveDuplicates();
 }
 
 QObject *QUmlRemoveVariableValueActionObject::removeAt() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->removeAt())
+    if (!qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->removeAt())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->removeAt()->asQObject();
+        return qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->removeAt()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -331,14 +334,14 @@ QObject *QUmlRemoveVariableValueActionObject::removeAt() const
 QSet<QObject *> QUmlRemoveVariableValueActionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlRemoveVariableValueActionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -346,307 +349,391 @@ bool QUmlRemoveVariableValueActionObject::mustBeOwned() const
 QList<QObject *> QUmlRemoveVariableValueActionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlRemoveVariableValueActionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlRemoveVariableValueActionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlRemoveVariableValueActionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlRemoveVariableValueActionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlRemoveVariableValueActionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlRemoveVariableValueActionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlRemoveVariableValueActionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlRemoveVariableValueActionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlRemoveVariableValueActionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlRemoveVariableValueActionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlRemoveVariableValueActionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlRemoveVariableValueActionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlRemoveVariableValueActionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->setName(name);
 }
 
 void QUmlRemoveVariableValueActionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlRemoveVariableValueActionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlRemoveVariableValueActionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlRemoveVariableValueActionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlRemoveVariableValueActionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlRemoveVariableValueActionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlRemoveVariableValueActionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlRemoveVariableValueActionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlRemoveVariableValueActionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlRemoveVariableValueActionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlRemoveVariableValueActionObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlRemoveVariableValueActionObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlRemoveVariableValueActionObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlRemoveVariableValueActionObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlRemoveVariableValueActionObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlRemoveVariableValueActionObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlRemoveVariableValueActionObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlRemoveVariableValueActionObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlRemoveVariableValueActionObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlRemoveVariableValueActionObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlRemoveVariableValueActionObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlRemoveVariableValueActionObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlRemoveVariableValueActionObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlRemoveVariableValueActionObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlRemoveVariableValueActionObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlRemoveVariableValueActionObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlRemoveVariableValueActionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlRemoveVariableValueActionObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlRemoveVariableValueActionObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlRemoveVariableValueActionObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlRemoveVariableValueActionObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlRemoveVariableValueActionObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlRemoveVariableValueActionObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlRemoveVariableValueActionObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlRemoveVariableValueActionObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlRemoveVariableValueActionObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlRemoveVariableValueActionObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [VariableAction]
 
 void QUmlRemoveVariableValueActionObject::setVariable(QObject *variable)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->setVariable(qmodelingobjectproperty_cast<QUmlVariable *>(variable));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->setVariable(qmodelingelementproperty_cast<QUmlVariable *>(variable));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [WriteVariableAction]
 
 void QUmlRemoveVariableValueActionObject::setValue(QObject *value)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->setValue(qmodelingobjectproperty_cast<QUmlInputPin *>(value));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->setValue(qmodelingelementproperty_cast<QUmlInputPin *>(value));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RemoveVariableValueAction]
 
 void QUmlRemoveVariableValueActionObject::setRemoveDuplicates(bool isRemoveDuplicates)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->setRemoveDuplicates(isRemoveDuplicates);
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->setRemoveDuplicates(isRemoveDuplicates);
 }
 
 void QUmlRemoveVariableValueActionObject::unsetRemoveDuplicates()
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("removeDuplicates"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("removeDuplicates"));
 }
 
 void QUmlRemoveVariableValueActionObject::setRemoveAt(QObject *removeAt)
 {
-    qmodelingobjectproperty_cast<QUmlRemoveVariableValueAction *>(this)->setRemoveAt(qmodelingobjectproperty_cast<QUmlInputPin *>(removeAt));
+    qmodelingelementproperty_cast<QUmlRemoveVariableValueAction *>(this)->setRemoveAt(qmodelingelementproperty_cast<QUmlInputPin *>(removeAt));
+}
+
+
+void QUmlRemoveVariableValueActionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlVariableAction");
+    d->groupProperties.insert(QStringLiteral("QUmlVariableAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("variable"))));
+
+    d->propertyGroups << QStringLiteral("QUmlWriteVariableAction");
+    d->groupProperties.insert(QStringLiteral("QUmlWriteVariableAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("value"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRemoveVariableValueAction");
+    d->groupProperties.insert(QStringLiteral("QUmlRemoveVariableValueAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isRemoveDuplicates"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRemoveVariableValueAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("removeAt"))));
+}
+
+void QUmlRemoveVariableValueActionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRemoveVariableValueAction, isRemoveDuplicates, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRemoveVariableValueAction, isRemoveDuplicates, PropertyClassRole, QStringLiteral("QUmlRemoveVariableValueAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRemoveVariableValueAction, isRemoveDuplicates, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRemoveVariableValueAction, isRemoveDuplicates, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRemoveVariableValueAction, isRemoveDuplicates, DocumentationRole, QStringLiteral("Specifies whether to remove duplicates of the value in nonunique variables."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRemoveVariableValueAction, isRemoveDuplicates, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRemoveVariableValueAction, isRemoveDuplicates, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRemoveVariableValueAction, isRemoveDuplicates, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRemoveVariableValueAction, removeAt, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRemoveVariableValueAction, removeAt, PropertyClassRole, QStringLiteral("QUmlRemoveVariableValueAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRemoveVariableValueAction, removeAt, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRemoveVariableValueAction, removeAt, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRemoveVariableValueAction, removeAt, DocumentationRole, QStringLiteral("Specifies the position of an existing value to remove in ordered nonunique variables. The type of the pin is UnlimitedNatural, but the value cannot be zero or unlimited."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRemoveVariableValueAction, removeAt, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRemoveVariableValueAction, removeAt, SubsettedPropertiesRole, QStringLiteral("Action-input"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlRemoveVariableValueAction, removeAt, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlremovevariablevalueactionobject_p.h b/src/uml/qobjects/qumlremovevariablevalueactionobject_p.h
index 94fb28fa..06ea36bb 100644
--- a/src/uml/qobjects/qumlremovevariablevalueactionobject_p.h
+++ b/src/uml/qobjects/qumlremovevariablevalueactionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlRemoveVariableValueAction;
-class Q_UML_EXPORT QUmlRemoveVariableValueActionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlRemoveVariableValueActionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlRemoveVariableValueActionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -108,7 +111,7 @@ class Q_UML_EXPORT QUmlRemoveVariableValueActionObject : public QObject
     Q_PROPERTY(QObject * removeAt READ removeAt WRITE setRemoveAt)
 
 public:
-    Q_INVOKABLE explicit QUmlRemoveVariableValueActionObject(QUmlRemoveVariableValueAction *qModelingObject);
+    Q_INVOKABLE explicit QUmlRemoveVariableValueActionObject(QUmlRemoveVariableValueAction *qModelingElement);
     virtual ~QUmlRemoveVariableValueActionObject();
 
     // Owned attributes [Element]
@@ -243,6 +246,10 @@ public Q_SLOTS:
     void setRemoveDuplicates(bool isRemoveDuplicates);
     void unsetRemoveDuplicates();
     void setRemoveAt(QObject *removeAt = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlreplyactionobject.cpp b/src/uml/qobjects/qumlreplyactionobject.cpp
index 92a746e1..2fca68a3 100644
--- a/src/uml/qobjects/qumlreplyactionobject.cpp
+++ b/src/uml/qobjects/qumlreplyactionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlreplyactionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlReplyAction>
 #include <QtUml/QUmlActivity>
@@ -65,16 +66,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlReplyActionObject::QUmlReplyActionObject(QUmlReplyAction *qModelingObject)
+QUmlReplyActionObject::QUmlReplyActionObject(QUmlReplyAction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlReplyActionObject::~QUmlReplyActionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlReplyAction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -83,25 +86,25 @@ QUmlReplyActionObject::~QUmlReplyActionObject()
 const QSet<QObject *> QUmlReplyActionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlReplyAction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReplyActionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlReplyAction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlReplyActionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlReplyAction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReplyAction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -109,62 +112,62 @@ QObject *QUmlReplyActionObject::owner() const
 const QSet<QObject *> QUmlReplyActionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlReplyAction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlReplyActionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlReplyAction *>(this)->name();
 }
 
 QObject *QUmlReplyActionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlReplyAction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReplyAction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlReplyActionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlReplyAction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReplyAction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlReplyActionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlReplyAction *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlReplyActionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlReplyAction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlReplyActionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlReplyAction *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlReplyActionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlReplyAction *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReplyActionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlReplyAction *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -172,65 +175,65 @@ const QSet<QObject *> QUmlReplyActionObject::redefinitionContexts() const
 
 QObject *QUmlReplyActionObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlReplyAction *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReplyAction *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlReplyActionObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlReplyAction *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReplyActionObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlReplyAction *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReplyActionObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlReplyAction *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlReplyActionObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlReplyAction *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReplyAction *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlReplyActionObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlReplyAction *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReplyActionObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlReplyAction *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReplyActionObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlReplyAction *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -239,8 +242,8 @@ const QSet<QObject *> QUmlReplyActionObject::redefinedNodes() const
 const QSet<QObject *> QUmlReplyActionObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlReplyAction *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -248,46 +251,46 @@ const QSet<QObject *> QUmlReplyActionObject::handlers() const
 
 QObject *QUmlReplyActionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlReplyAction *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReplyAction *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlReplyActionObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlReplyAction *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlReplyActionObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlReplyAction *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlReplyActionObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlReplyAction *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlReplyActionObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlReplyAction *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlReplyActionObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlReplyAction *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -295,26 +298,26 @@ const QList<QObject *> QUmlReplyActionObject::outputs() const
 
 QObject *QUmlReplyActionObject::replyToCall() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->replyToCall())
+    if (!qmodelingelementproperty_cast<QUmlReplyAction *>(this)->replyToCall())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->replyToCall()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReplyAction *>(this)->replyToCall()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlReplyActionObject::replyValues() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->replyValues())
-        set.insert(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlReplyAction *>(this)->replyValues())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlReplyActionObject::returnInformation() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->returnInformation())
+    if (!qmodelingelementproperty_cast<QUmlReplyAction *>(this)->returnInformation())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->returnInformation()->asQObject();
+        return qmodelingelementproperty_cast<QUmlReplyAction *>(this)->returnInformation()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -322,14 +325,14 @@ QObject *QUmlReplyActionObject::returnInformation() const
 QSet<QObject *> QUmlReplyActionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlReplyAction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlReplyActionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlReplyAction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -337,298 +340,385 @@ bool QUmlReplyActionObject::mustBeOwned() const
 QList<QObject *> QUmlReplyActionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlReplyAction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlReplyActionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlReplyAction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlReplyActionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlReplyAction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlReplyActionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlReplyAction *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlReplyActionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlReplyAction *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlReplyActionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlReplyAction *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlReplyActionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlReplyActionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlReplyActionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlReplyActionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlReplyActionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlReplyActionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlReplyActionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlReplyActionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->setName(name);
 }
 
 void QUmlReplyActionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlReplyActionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlReplyActionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlReplyActionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlReplyActionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlReplyActionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlReplyActionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlReplyActionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlReplyActionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlReplyActionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlReplyActionObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlReplyActionObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlReplyActionObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlReplyActionObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlReplyActionObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlReplyActionObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlReplyActionObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlReplyActionObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlReplyActionObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlReplyActionObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlReplyActionObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlReplyActionObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlReplyActionObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlReplyActionObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlReplyActionObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlReplyActionObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlReplyActionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlReplyActionObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlReplyActionObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlReplyActionObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlReplyActionObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlReplyActionObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlReplyActionObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlReplyActionObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlReplyActionObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlReplyActionObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlReplyActionObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ReplyAction]
 
 void QUmlReplyActionObject::setReplyToCall(QObject *replyToCall)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->setReplyToCall(qmodelingobjectproperty_cast<QUmlTrigger *>(replyToCall));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->setReplyToCall(qmodelingelementproperty_cast<QUmlTrigger *>(replyToCall));
 }
 
 void QUmlReplyActionObject::addReplyValue(QObject *replyValue)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->addReplyValue(qmodelingobjectproperty_cast<QUmlInputPin *>(replyValue));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->addReplyValue(qmodelingelementproperty_cast<QUmlInputPin *>(replyValue));
 }
 
 void QUmlReplyActionObject::removeReplyValue(QObject *replyValue)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->removeReplyValue(qmodelingobjectproperty_cast<QUmlInputPin *>(replyValue));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->removeReplyValue(qmodelingelementproperty_cast<QUmlInputPin *>(replyValue));
 }
 
 void QUmlReplyActionObject::setReturnInformation(QObject *returnInformation)
 {
-    qmodelingobjectproperty_cast<QUmlReplyAction *>(this)->setReturnInformation(qmodelingobjectproperty_cast<QUmlInputPin *>(returnInformation));
+    qmodelingelementproperty_cast<QUmlReplyAction *>(this)->setReturnInformation(qmodelingelementproperty_cast<QUmlInputPin *>(returnInformation));
+}
+
+
+void QUmlReplyActionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlReplyAction");
+    d->groupProperties.insert(QStringLiteral("QUmlReplyAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("replyToCall"))));
+    d->groupProperties.insert(QStringLiteral("QUmlReplyAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("replyValues"))));
+    d->groupProperties.insert(QStringLiteral("QUmlReplyAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("returnInformation"))));
+}
+
+void QUmlReplyActionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReplyAction, replyToCall, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReplyAction, replyToCall, PropertyClassRole, QStringLiteral("QUmlReplyAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReplyAction, replyToCall, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReplyAction, replyToCall, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReplyAction, replyToCall, DocumentationRole, QStringLiteral("The trigger specifying the operation whose call is being replied to."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReplyAction, replyToCall, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReplyAction, replyToCall, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReplyAction, replyToCall, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReplyAction, replyValues, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReplyAction, replyValues, PropertyClassRole, QStringLiteral("QUmlReplyAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReplyAction, replyValues, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReplyAction, replyValues, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReplyAction, replyValues, DocumentationRole, QStringLiteral("A list of pins containing the reply values of the operation. These values are returned to the caller."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReplyAction, replyValues, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReplyAction, replyValues, SubsettedPropertiesRole, QStringLiteral("Action-input"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReplyAction, replyValues, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReplyAction, returnInformation, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReplyAction, returnInformation, PropertyClassRole, QStringLiteral("QUmlReplyAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReplyAction, returnInformation, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReplyAction, returnInformation, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReplyAction, returnInformation, DocumentationRole, QStringLiteral("A pin containing the return information value produced by an earlier AcceptCallAction."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReplyAction, returnInformation, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReplyAction, returnInformation, SubsettedPropertiesRole, QStringLiteral("Action-input"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlReplyAction, returnInformation, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlreplyactionobject_p.h b/src/uml/qobjects/qumlreplyactionobject_p.h
index 9d7a69ee..0070facc 100644
--- a/src/uml/qobjects/qumlreplyactionobject_p.h
+++ b/src/uml/qobjects/qumlreplyactionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlReplyAction;
-class Q_UML_EXPORT QUmlReplyActionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlReplyActionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlReplyActionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -103,7 +106,7 @@ class Q_UML_EXPORT QUmlReplyActionObject : public QObject
     Q_PROPERTY(QObject * returnInformation READ returnInformation WRITE setReturnInformation)
 
 public:
-    Q_INVOKABLE explicit QUmlReplyActionObject(QUmlReplyAction *qModelingObject);
+    Q_INVOKABLE explicit QUmlReplyActionObject(QUmlReplyAction *qModelingElement);
     virtual ~QUmlReplyActionObject();
 
     // Owned attributes [Element]
@@ -228,6 +231,10 @@ public Q_SLOTS:
     void addReplyValue(QObject *replyValue);
     void removeReplyValue(QObject *replyValue);
     void setReturnInformation(QObject *returnInformation = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlsendobjectactionobject.cpp b/src/uml/qobjects/qumlsendobjectactionobject.cpp
index 48d990ca..5cb4d4cd 100644
--- a/src/uml/qobjects/qumlsendobjectactionobject.cpp
+++ b/src/uml/qobjects/qumlsendobjectactionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlsendobjectactionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlSendObjectAction>
 #include <QtUml/QUmlActivity>
@@ -65,16 +66,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlSendObjectActionObject::QUmlSendObjectActionObject(QUmlSendObjectAction *qModelingObject)
+QUmlSendObjectActionObject::QUmlSendObjectActionObject(QUmlSendObjectAction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlSendObjectActionObject::~QUmlSendObjectActionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -83,25 +86,25 @@ QUmlSendObjectActionObject::~QUmlSendObjectActionObject()
 const QSet<QObject *> QUmlSendObjectActionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSendObjectActionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlSendObjectActionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -109,62 +112,62 @@ QObject *QUmlSendObjectActionObject::owner() const
 const QSet<QObject *> QUmlSendObjectActionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlSendObjectActionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->name();
 }
 
 QObject *QUmlSendObjectActionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlSendObjectActionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlSendObjectActionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlSendObjectActionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlSendObjectActionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlSendObjectActionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSendObjectActionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -172,65 +175,65 @@ const QSet<QObject *> QUmlSendObjectActionObject::redefinitionContexts() const
 
 QObject *QUmlSendObjectActionObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlSendObjectActionObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSendObjectActionObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSendObjectActionObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlSendObjectActionObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlSendObjectActionObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSendObjectActionObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSendObjectActionObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -239,8 +242,8 @@ const QSet<QObject *> QUmlSendObjectActionObject::redefinedNodes() const
 const QSet<QObject *> QUmlSendObjectActionObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -248,46 +251,46 @@ const QSet<QObject *> QUmlSendObjectActionObject::handlers() const
 
 QObject *QUmlSendObjectActionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlSendObjectActionObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlSendObjectActionObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlSendObjectActionObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSendObjectActionObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlSendObjectActionObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -295,28 +298,28 @@ const QList<QObject *> QUmlSendObjectActionObject::outputs() const
 
 QObject *QUmlSendObjectActionObject::onPort() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->onPort())
+    if (!qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->onPort())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->onPort()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->onPort()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [SendObjectAction]
 
 QObject *QUmlSendObjectActionObject::request() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->request())
+    if (!qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->request())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->request()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->request()->asQModelingObject();
 }
 
 QObject *QUmlSendObjectActionObject::target() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->target())
+    if (!qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->target())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->target()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->target()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -324,14 +327,14 @@ QObject *QUmlSendObjectActionObject::target() const
 QSet<QObject *> QUmlSendObjectActionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlSendObjectActionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -339,295 +342,375 @@ bool QUmlSendObjectActionObject::mustBeOwned() const
 QList<QObject *> QUmlSendObjectActionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlSendObjectActionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlSendObjectActionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlSendObjectActionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlSendObjectActionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlSendObjectActionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlSendObjectActionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlSendObjectActionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlSendObjectActionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlSendObjectActionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlSendObjectActionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlSendObjectActionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlSendObjectActionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlSendObjectActionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->setName(name);
 }
 
 void QUmlSendObjectActionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlSendObjectActionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlSendObjectActionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlSendObjectActionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlSendObjectActionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlSendObjectActionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlSendObjectActionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlSendObjectActionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlSendObjectActionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlSendObjectActionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlSendObjectActionObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlSendObjectActionObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlSendObjectActionObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlSendObjectActionObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlSendObjectActionObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlSendObjectActionObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlSendObjectActionObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlSendObjectActionObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlSendObjectActionObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlSendObjectActionObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlSendObjectActionObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlSendObjectActionObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlSendObjectActionObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlSendObjectActionObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlSendObjectActionObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlSendObjectActionObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlSendObjectActionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlSendObjectActionObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlSendObjectActionObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlSendObjectActionObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlSendObjectActionObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlSendObjectActionObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlSendObjectActionObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlSendObjectActionObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlSendObjectActionObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlSendObjectActionObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlSendObjectActionObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [InvocationAction]
 
 void QUmlSendObjectActionObject::setOnPort(QObject *onPort)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->setOnPort(qmodelingobjectproperty_cast<QUmlPort *>(onPort));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->setOnPort(qmodelingelementproperty_cast<QUmlPort *>(onPort));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [SendObjectAction]
 
 void QUmlSendObjectActionObject::setRequest(QObject *request)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->setRequest(qmodelingobjectproperty_cast<QUmlInputPin *>(request));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->setRequest(qmodelingelementproperty_cast<QUmlInputPin *>(request));
 }
 
 void QUmlSendObjectActionObject::setTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlSendObjectAction *>(this)->setTarget(qmodelingobjectproperty_cast<QUmlInputPin *>(target));
+    qmodelingelementproperty_cast<QUmlSendObjectAction *>(this)->setTarget(qmodelingelementproperty_cast<QUmlInputPin *>(target));
+}
+
+
+void QUmlSendObjectActionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlInvocationAction");
+    d->groupProperties.insert(QStringLiteral("QUmlInvocationAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("onPort"))));
+
+    d->propertyGroups << QStringLiteral("QUmlSendObjectAction");
+    d->groupProperties.insert(QStringLiteral("QUmlSendObjectAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("request"))));
+    d->groupProperties.insert(QStringLiteral("QUmlSendObjectAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("target"))));
+}
+
+void QUmlSendObjectActionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSendObjectAction, request, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSendObjectAction, request, PropertyClassRole, QStringLiteral("QUmlSendObjectAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSendObjectAction, request, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSendObjectAction, request, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSendObjectAction, request, DocumentationRole, QStringLiteral("The request object, which is transmitted to the target object. The object may be copied in transmission, so identity might not be preserved."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSendObjectAction, request, RedefinedPropertiesRole, QStringLiteral("InvocationAction-argument"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSendObjectAction, request, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSendObjectAction, request, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSendObjectAction, target, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSendObjectAction, target, PropertyClassRole, QStringLiteral("QUmlSendObjectAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSendObjectAction, target, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSendObjectAction, target, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSendObjectAction, target, DocumentationRole, QStringLiteral("The target object to which the object is sent."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSendObjectAction, target, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSendObjectAction, target, SubsettedPropertiesRole, QStringLiteral("Action-input"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSendObjectAction, target, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlsendobjectactionobject_p.h b/src/uml/qobjects/qumlsendobjectactionobject_p.h
index 0cf1ee94..6f9cd93a 100644
--- a/src/uml/qobjects/qumlsendobjectactionobject_p.h
+++ b/src/uml/qobjects/qumlsendobjectactionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlSendObjectAction;
-class Q_UML_EXPORT QUmlSendObjectActionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlSendObjectActionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlSendObjectActionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -105,7 +108,7 @@ class Q_UML_EXPORT QUmlSendObjectActionObject : public QObject
     Q_PROPERTY(QObject * target READ target WRITE setTarget)
 
 public:
-    Q_INVOKABLE explicit QUmlSendObjectActionObject(QUmlSendObjectAction *qModelingObject);
+    Q_INVOKABLE explicit QUmlSendObjectActionObject(QUmlSendObjectAction *qModelingElement);
     virtual ~QUmlSendObjectActionObject();
 
     // Owned attributes [Element]
@@ -233,6 +236,10 @@ public Q_SLOTS:
     // Slots for owned attributes [SendObjectAction]
     void setRequest(QObject *request = 0);
     void setTarget(QObject *target = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlsendsignalactionobject.cpp b/src/uml/qobjects/qumlsendsignalactionobject.cpp
index 6a2108a7..8d9b1e1e 100644
--- a/src/uml/qobjects/qumlsendsignalactionobject.cpp
+++ b/src/uml/qobjects/qumlsendsignalactionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlsendsignalactionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlSendSignalAction>
 #include <QtUml/QUmlActivity>
@@ -66,16 +67,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlSendSignalActionObject::QUmlSendSignalActionObject(QUmlSendSignalAction *qModelingObject)
+QUmlSendSignalActionObject::QUmlSendSignalActionObject(QUmlSendSignalAction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlSendSignalActionObject::~QUmlSendSignalActionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -84,25 +87,25 @@ QUmlSendSignalActionObject::~QUmlSendSignalActionObject()
 const QSet<QObject *> QUmlSendSignalActionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSendSignalActionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlSendSignalActionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -110,62 +113,62 @@ QObject *QUmlSendSignalActionObject::owner() const
 const QSet<QObject *> QUmlSendSignalActionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlSendSignalActionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->name();
 }
 
 QObject *QUmlSendSignalActionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlSendSignalActionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlSendSignalActionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlSendSignalActionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlSendSignalActionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlSendSignalActionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSendSignalActionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -173,65 +176,65 @@ const QSet<QObject *> QUmlSendSignalActionObject::redefinitionContexts() const
 
 QObject *QUmlSendSignalActionObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlSendSignalActionObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSendSignalActionObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSendSignalActionObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlSendSignalActionObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlSendSignalActionObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSendSignalActionObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSendSignalActionObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -240,8 +243,8 @@ const QSet<QObject *> QUmlSendSignalActionObject::redefinedNodes() const
 const QSet<QObject *> QUmlSendSignalActionObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -249,46 +252,46 @@ const QSet<QObject *> QUmlSendSignalActionObject::handlers() const
 
 QObject *QUmlSendSignalActionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlSendSignalActionObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlSendSignalActionObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlSendSignalActionObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSendSignalActionObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlSendSignalActionObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -297,35 +300,35 @@ const QList<QObject *> QUmlSendSignalActionObject::outputs() const
 const QList<QObject *> QUmlSendSignalActionObject::arguments() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->arguments())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->arguments())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 QObject *QUmlSendSignalActionObject::onPort() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->onPort())
+    if (!qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->onPort())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->onPort()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->onPort()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [SendSignalAction]
 
 QObject *QUmlSendSignalActionObject::signal() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->signal())
+    if (!qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->signal())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->signal()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->signal()->asQModelingObject();
 }
 
 QObject *QUmlSendSignalActionObject::target() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->target())
+    if (!qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->target())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->target()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->target()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -333,14 +336,14 @@ QObject *QUmlSendSignalActionObject::target() const
 QSet<QObject *> QUmlSendSignalActionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlSendSignalActionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -348,305 +351,386 @@ bool QUmlSendSignalActionObject::mustBeOwned() const
 QList<QObject *> QUmlSendSignalActionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlSendSignalActionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlSendSignalActionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlSendSignalActionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlSendSignalActionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlSendSignalActionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlSendSignalActionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlSendSignalActionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlSendSignalActionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlSendSignalActionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlSendSignalActionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlSendSignalActionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlSendSignalActionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlSendSignalActionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->setName(name);
 }
 
 void QUmlSendSignalActionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlSendSignalActionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlSendSignalActionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlSendSignalActionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlSendSignalActionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlSendSignalActionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlSendSignalActionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlSendSignalActionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlSendSignalActionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlSendSignalActionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlSendSignalActionObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlSendSignalActionObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlSendSignalActionObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlSendSignalActionObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlSendSignalActionObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlSendSignalActionObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlSendSignalActionObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlSendSignalActionObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlSendSignalActionObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlSendSignalActionObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlSendSignalActionObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlSendSignalActionObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlSendSignalActionObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlSendSignalActionObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlSendSignalActionObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlSendSignalActionObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlSendSignalActionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlSendSignalActionObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlSendSignalActionObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlSendSignalActionObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlSendSignalActionObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlSendSignalActionObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlSendSignalActionObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlSendSignalActionObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlSendSignalActionObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlSendSignalActionObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlSendSignalActionObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [InvocationAction]
 
 void QUmlSendSignalActionObject::addArgument(QObject *argument)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->addArgument(qmodelingobjectproperty_cast<QUmlInputPin *>(argument));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->addArgument(qmodelingelementproperty_cast<QUmlInputPin *>(argument));
 }
 
 void QUmlSendSignalActionObject::removeArgument(QObject *argument)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->removeArgument(qmodelingobjectproperty_cast<QUmlInputPin *>(argument));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->removeArgument(qmodelingelementproperty_cast<QUmlInputPin *>(argument));
 }
 
 void QUmlSendSignalActionObject::setOnPort(QObject *onPort)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->setOnPort(qmodelingobjectproperty_cast<QUmlPort *>(onPort));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->setOnPort(qmodelingelementproperty_cast<QUmlPort *>(onPort));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [SendSignalAction]
 
 void QUmlSendSignalActionObject::setSignal(QObject *signal)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->setSignal(qmodelingobjectproperty_cast<QUmlSignal *>(signal));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->setSignal(qmodelingelementproperty_cast<QUmlSignal *>(signal));
 }
 
 void QUmlSendSignalActionObject::setTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlSendSignalAction *>(this)->setTarget(qmodelingobjectproperty_cast<QUmlInputPin *>(target));
+    qmodelingelementproperty_cast<QUmlSendSignalAction *>(this)->setTarget(qmodelingelementproperty_cast<QUmlInputPin *>(target));
+}
+
+
+void QUmlSendSignalActionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlInvocationAction");
+    d->groupProperties.insert(QStringLiteral("QUmlInvocationAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("arguments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInvocationAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("onPort"))));
+
+    d->propertyGroups << QStringLiteral("QUmlSendSignalAction");
+    d->groupProperties.insert(QStringLiteral("QUmlSendSignalAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("signal"))));
+    d->groupProperties.insert(QStringLiteral("QUmlSendSignalAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("target"))));
+}
+
+void QUmlSendSignalActionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSendSignalAction, signal, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSendSignalAction, signal, PropertyClassRole, QStringLiteral("QUmlSendSignalAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSendSignalAction, signal, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSendSignalAction, signal, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSendSignalAction, signal, DocumentationRole, QStringLiteral("The type of signal transmitted to the target object."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSendSignalAction, signal, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSendSignalAction, signal, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSendSignalAction, signal, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSendSignalAction, target, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSendSignalAction, target, PropertyClassRole, QStringLiteral("QUmlSendSignalAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSendSignalAction, target, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSendSignalAction, target, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSendSignalAction, target, DocumentationRole, QStringLiteral("The target object to which the signal is sent."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSendSignalAction, target, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSendSignalAction, target, SubsettedPropertiesRole, QStringLiteral("Action-input"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSendSignalAction, target, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlsendsignalactionobject_p.h b/src/uml/qobjects/qumlsendsignalactionobject_p.h
index f946032c..30df7c81 100644
--- a/src/uml/qobjects/qumlsendsignalactionobject_p.h
+++ b/src/uml/qobjects/qumlsendsignalactionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlSendSignalAction;
-class Q_UML_EXPORT QUmlSendSignalActionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlSendSignalActionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlSendSignalActionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -106,7 +109,7 @@ class Q_UML_EXPORT QUmlSendSignalActionObject : public QObject
     Q_PROPERTY(QObject * target READ target WRITE setTarget)
 
 public:
-    Q_INVOKABLE explicit QUmlSendSignalActionObject(QUmlSendSignalAction *qModelingObject);
+    Q_INVOKABLE explicit QUmlSendSignalActionObject(QUmlSendSignalAction *qModelingElement);
     virtual ~QUmlSendSignalActionObject();
 
     // Owned attributes [Element]
@@ -237,6 +240,10 @@ public Q_SLOTS:
     // Slots for owned attributes [SendSignalAction]
     void setSignal(QObject *signal = 0);
     void setTarget(QObject *target = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlsequencenodeobject.cpp b/src/uml/qobjects/qumlsequencenodeobject.cpp
index 5fb970d9..37bc9b67 100644
--- a/src/uml/qobjects/qumlsequencenodeobject.cpp
+++ b/src/uml/qobjects/qumlsequencenodeobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlsequencenodeobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlSequenceNode>
 #include <QtUml/QUmlActivity>
@@ -69,16 +70,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlSequenceNodeObject::QUmlSequenceNodeObject(QUmlSequenceNode *qModelingObject)
+QUmlSequenceNodeObject::QUmlSequenceNodeObject(QUmlSequenceNode *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlSequenceNodeObject::~QUmlSequenceNodeObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -87,25 +90,25 @@ QUmlSequenceNodeObject::~QUmlSequenceNodeObject()
 const QSet<QObject *> QUmlSequenceNodeObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSequenceNodeObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlSequenceNodeObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -113,62 +116,62 @@ QObject *QUmlSequenceNodeObject::owner() const
 const QSet<QObject *> QUmlSequenceNodeObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlSequenceNodeObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->name();
 }
 
 QObject *QUmlSequenceNodeObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlSequenceNodeObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlSequenceNodeObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlSequenceNodeObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlSequenceNodeObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlSequenceNodeObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSequenceNodeObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -177,56 +180,56 @@ const QSet<QObject *> QUmlSequenceNodeObject::redefinitionContexts() const
 const QSet<QObject *> QUmlSequenceNodeObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSequenceNodeObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSequenceNodeObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlSequenceNodeObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlSequenceNodeObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSequenceNodeObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSequenceNodeObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -235,8 +238,8 @@ const QSet<QObject *> QUmlSequenceNodeObject::redefinedNodes() const
 const QSet<QObject *> QUmlSequenceNodeObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -244,46 +247,46 @@ const QSet<QObject *> QUmlSequenceNodeObject::handlers() const
 
 QObject *QUmlSequenceNodeObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlSequenceNodeObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlSequenceNodeObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlSequenceNodeObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSequenceNodeObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlSequenceNodeObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -292,48 +295,48 @@ const QList<QObject *> QUmlSequenceNodeObject::outputs() const
 const QSet<QObject *> QUmlSequenceNodeObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSequenceNodeObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSequenceNodeObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSequenceNodeObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSequenceNodeObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSequenceNodeObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -342,79 +345,79 @@ const QSet<QObject *> QUmlSequenceNodeObject::packageImports() const
 const QSet<QObject *> QUmlSequenceNodeObject::containedEdges() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->containedEdges())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->containedEdges())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSequenceNodeObject::containedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->containedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->containedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSequenceNodeObject::subgroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->subgroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->subgroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlSequenceNodeObject::superGroup() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->superGroup())
+    if (!qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->superGroup())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->superGroup()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->superGroup()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [StructuredActivityNode]
 
 QObject *QUmlSequenceNodeObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlSequenceNodeObject::edges() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->edges())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->edges())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlSequenceNodeObject::mustIsolate() const
 {
-    return qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->mustIsolate();
+    return qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->mustIsolate();
 }
 
 const QSet<QObject *> QUmlSequenceNodeObject::structuredNodeInputs() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->structuredNodeInputs())
-        set.insert(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->structuredNodeInputs())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSequenceNodeObject::structuredNodeOutputs() const
 {
     QSet<QObject *> set;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->structuredNodeOutputs())
-        set.insert(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->structuredNodeOutputs())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSequenceNodeObject::variables() const
 {
     QSet<QObject *> set;
-    foreach (QUmlVariable *element, qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->variables())
-        set.insert(element->asQObject());
+    foreach (QUmlVariable *element, qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->variables())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -423,8 +426,8 @@ const QSet<QObject *> QUmlSequenceNodeObject::variables() const
 const QList<QObject *> QUmlSequenceNodeObject::executableNodes() const
 {
     QList<QObject *> list;
-    foreach (QUmlExecutableNode *element, qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->executableNodes())
-        list.append(element->asQObject());
+    foreach (QUmlExecutableNode *element, qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->executableNodes())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -433,14 +436,14 @@ const QList<QObject *> QUmlSequenceNodeObject::executableNodes() const
 QSet<QObject *> QUmlSequenceNodeObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlSequenceNodeObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -448,39 +451,39 @@ bool QUmlSequenceNodeObject::mustBeOwned() const
 QList<QObject *> QUmlSequenceNodeObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlSequenceNodeObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlSequenceNodeObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlSequenceNodeObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlSequenceNodeObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlSequenceNodeObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [Namespace]
@@ -489,432 +492,521 @@ QSet<QObject *> QUmlSequenceNodeObject::excludeCollisions(QSet<QObject *> imps)
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlSequenceNodeObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlSequenceNodeObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlSequenceNodeObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->membersAreDistinguishable();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlSequenceNodeObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlSequenceNodeObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlSequenceNodeObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlSequenceNodeObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlSequenceNodeObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlSequenceNodeObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlSequenceNodeObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlSequenceNodeObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->setName(name);
 }
 
 void QUmlSequenceNodeObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlSequenceNodeObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlSequenceNodeObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlSequenceNodeObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlSequenceNodeObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlSequenceNodeObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlSequenceNodeObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlSequenceNodeObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlSequenceNodeObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlSequenceNodeObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlSequenceNodeObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlSequenceNodeObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlSequenceNodeObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlSequenceNodeObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlSequenceNodeObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlSequenceNodeObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlSequenceNodeObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlSequenceNodeObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlSequenceNodeObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlSequenceNodeObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlSequenceNodeObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlSequenceNodeObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlSequenceNodeObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlSequenceNodeObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlSequenceNodeObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlSequenceNodeObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlSequenceNodeObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlSequenceNodeObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlSequenceNodeObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlSequenceNodeObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlSequenceNodeObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlSequenceNodeObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlSequenceNodeObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlSequenceNodeObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlSequenceNodeObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlSequenceNodeObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlSequenceNodeObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlSequenceNodeObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlSequenceNodeObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlSequenceNodeObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlSequenceNodeObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlSequenceNodeObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlSequenceNodeObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlSequenceNodeObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlSequenceNodeObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlSequenceNodeObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlSequenceNodeObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlSequenceNodeObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityGroup]
 
 void QUmlSequenceNodeObject::addContainedEdge(QObject *containedEdge)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->addContainedEdge(qmodelingobjectproperty_cast<QUmlActivityEdge *>(containedEdge));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->addContainedEdge(qmodelingelementproperty_cast<QUmlActivityEdge *>(containedEdge));
 }
 
 void QUmlSequenceNodeObject::removeContainedEdge(QObject *containedEdge)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->removeContainedEdge(qmodelingobjectproperty_cast<QUmlActivityEdge *>(containedEdge));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->removeContainedEdge(qmodelingelementproperty_cast<QUmlActivityEdge *>(containedEdge));
 }
 
 void QUmlSequenceNodeObject::addContainedNode(QObject *containedNode)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->addContainedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(containedNode));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->addContainedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(containedNode));
 }
 
 void QUmlSequenceNodeObject::removeContainedNode(QObject *containedNode)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->removeContainedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(containedNode));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->removeContainedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(containedNode));
 }
 
 void QUmlSequenceNodeObject::addSubgroup(QObject *subgroup)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->addSubgroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(subgroup));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->addSubgroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(subgroup));
 }
 
 void QUmlSequenceNodeObject::removeSubgroup(QObject *subgroup)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->removeSubgroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(subgroup));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->removeSubgroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(subgroup));
 }
 
 void QUmlSequenceNodeObject::setSuperGroup(QObject *superGroup)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->setSuperGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(superGroup));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->setSuperGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(superGroup));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [StructuredActivityNode]
 
 void QUmlSequenceNodeObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlSequenceNodeObject::addEdge(QObject *edge)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->addEdge(qmodelingobjectproperty_cast<QUmlActivityEdge *>(edge));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->addEdge(qmodelingelementproperty_cast<QUmlActivityEdge *>(edge));
 }
 
 void QUmlSequenceNodeObject::removeEdge(QObject *edge)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->removeEdge(qmodelingobjectproperty_cast<QUmlActivityEdge *>(edge));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->removeEdge(qmodelingelementproperty_cast<QUmlActivityEdge *>(edge));
 }
 
 void QUmlSequenceNodeObject::setMustIsolate(bool mustIsolate)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->setMustIsolate(mustIsolate);
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->setMustIsolate(mustIsolate);
 }
 
 void QUmlSequenceNodeObject::unsetMustIsolate()
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("mustIsolate"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("mustIsolate"));
 }
 
 void QUmlSequenceNodeObject::addStructuredNodeInput(QObject *structuredNodeInput)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->addStructuredNodeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(structuredNodeInput));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->addStructuredNodeInput(qmodelingelementproperty_cast<QUmlInputPin *>(structuredNodeInput));
 }
 
 void QUmlSequenceNodeObject::removeStructuredNodeInput(QObject *structuredNodeInput)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->removeStructuredNodeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(structuredNodeInput));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->removeStructuredNodeInput(qmodelingelementproperty_cast<QUmlInputPin *>(structuredNodeInput));
 }
 
 void QUmlSequenceNodeObject::addStructuredNodeOutput(QObject *structuredNodeOutput)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->addStructuredNodeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(structuredNodeOutput));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->addStructuredNodeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(structuredNodeOutput));
 }
 
 void QUmlSequenceNodeObject::removeStructuredNodeOutput(QObject *structuredNodeOutput)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->removeStructuredNodeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(structuredNodeOutput));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->removeStructuredNodeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(structuredNodeOutput));
 }
 
 void QUmlSequenceNodeObject::addVariable(QObject *variable)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->addVariable(qmodelingobjectproperty_cast<QUmlVariable *>(variable));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->addVariable(qmodelingelementproperty_cast<QUmlVariable *>(variable));
 }
 
 void QUmlSequenceNodeObject::removeVariable(QObject *variable)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->removeVariable(qmodelingobjectproperty_cast<QUmlVariable *>(variable));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->removeVariable(qmodelingelementproperty_cast<QUmlVariable *>(variable));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [SequenceNode]
 
 void QUmlSequenceNodeObject::addExecutableNode(QObject *executableNode)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->addExecutableNode(qmodelingobjectproperty_cast<QUmlExecutableNode *>(executableNode));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->addExecutableNode(qmodelingelementproperty_cast<QUmlExecutableNode *>(executableNode));
 }
 
 void QUmlSequenceNodeObject::removeExecutableNode(QObject *executableNode)
 {
-    qmodelingobjectproperty_cast<QUmlSequenceNode *>(this)->removeExecutableNode(qmodelingobjectproperty_cast<QUmlExecutableNode *>(executableNode));
+    qmodelingelementproperty_cast<QUmlSequenceNode *>(this)->removeExecutableNode(qmodelingelementproperty_cast<QUmlExecutableNode *>(executableNode));
+}
+
+
+void QUmlSequenceNodeObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityGroup");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("containedEdges"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("containedNodes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("subgroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superGroup"))));
+
+    d->propertyGroups << QStringLiteral("QUmlStructuredActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("edges"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("mustIsolate"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("structuredNodeInputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("structuredNodeOutputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("variables"))));
+
+    d->propertyGroups << QStringLiteral("QUmlSequenceNode");
+    d->groupProperties.insert(QStringLiteral("QUmlSequenceNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("executableNodes"))));
+}
+
+void QUmlSequenceNodeObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSequenceNode, executableNodes, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSequenceNode, executableNodes, PropertyClassRole, QStringLiteral("QUmlSequenceNode"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSequenceNode, executableNodes, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSequenceNode, executableNodes, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSequenceNode, executableNodes, DocumentationRole, QStringLiteral("An ordered set of executable nodes."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSequenceNode, executableNodes, RedefinedPropertiesRole, QStringLiteral("StructuredActivityNode-node"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSequenceNode, executableNodes, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSequenceNode, executableNodes, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlsequencenodeobject_p.h b/src/uml/qobjects/qumlsequencenodeobject_p.h
index 6e10c5fb..a4113d51 100644
--- a/src/uml/qobjects/qumlsequencenodeobject_p.h
+++ b/src/uml/qobjects/qumlsequencenodeobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlSequenceNode;
-class Q_UML_EXPORT QUmlSequenceNodeObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlSequenceNodeObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlSequenceNodeObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -122,7 +125,7 @@ class Q_UML_EXPORT QUmlSequenceNodeObject : public QObject
     Q_PROPERTY(QList<QObject *> executableNodes READ executableNodes)
 
 public:
-    Q_INVOKABLE explicit QUmlSequenceNodeObject(QUmlSequenceNode *qModelingObject);
+    Q_INVOKABLE explicit QUmlSequenceNodeObject(QUmlSequenceNode *qModelingElement);
     virtual ~QUmlSequenceNodeObject();
 
     // Owned attributes [Element]
@@ -305,6 +308,10 @@ public Q_SLOTS:
     // Slots for owned attributes [SequenceNode]
     void addExecutableNode(QObject *executableNode);
     void removeExecutableNode(QObject *executableNode);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlsignaleventobject.cpp b/src/uml/qobjects/qumlsignaleventobject.cpp
index f29189c0..3ba32b82 100644
--- a/src/uml/qobjects/qumlsignaleventobject.cpp
+++ b/src/uml/qobjects/qumlsignaleventobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlsignaleventobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlSignalEvent>
 #include <QtUml/QUmlComment>
@@ -54,16 +55,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlSignalEventObject::QUmlSignalEventObject(QUmlSignalEvent *qModelingObject)
+QUmlSignalEventObject::QUmlSignalEventObject(QUmlSignalEvent *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlSignalEventObject::~QUmlSignalEventObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -72,43 +75,43 @@ QUmlSignalEventObject::~QUmlSignalEventObject()
 const QSet<QObject *> QUmlSignalEventObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSignalEventObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlSignalEventObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlSignalEventObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlSignalEventObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -116,52 +119,52 @@ QObject *QUmlSignalEventObject::templateParameter() const
 const QSet<QObject *> QUmlSignalEventObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlSignalEventObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->name();
 }
 
 QObject *QUmlSignalEventObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlSignalEventObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlSignalEventObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlSignalEventObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [SignalEvent]
 
 QObject *QUmlSignalEventObject::signal() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->signal())
+    if (!qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->signal())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->signal()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->signal()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -169,26 +172,26 @@ QObject *QUmlSignalEventObject::signal() const
 QSet<QObject *> QUmlSignalEventObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlSignalEventObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlSignalEventObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlSignalEventObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [NamedElement]
@@ -196,116 +199,166 @@ bool QUmlSignalEventObject::isTemplateParameter() const
 QList<QObject *> QUmlSignalEventObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlSignalEventObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlSignalEventObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlSignalEventObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlSignalEventObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlSignalEventObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlSignalEventObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlSignalEventObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlSignalEventObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlSignalEventObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlSignalEventObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlSignalEventObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlSignalEventObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlSignalEventObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->setName(name);
 }
 
 void QUmlSignalEventObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlSignalEventObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlSignalEventObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlSignalEventObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->setVisibility(visibility);
 }
 
 void QUmlSignalEventObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [SignalEvent]
 
 void QUmlSignalEventObject::setSignal(QObject *signal)
 {
-    qmodelingobjectproperty_cast<QUmlSignalEvent *>(this)->setSignal(qmodelingobjectproperty_cast<QUmlSignal *>(signal));
+    qmodelingelementproperty_cast<QUmlSignalEvent *>(this)->setSignal(qmodelingelementproperty_cast<QUmlSignal *>(signal));
+}
+
+
+void QUmlSignalEventObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlEvent");
+
+    d->propertyGroups << QStringLiteral("QUmlMessageEvent");
+
+    d->propertyGroups << QStringLiteral("QUmlSignalEvent");
+    d->groupProperties.insert(QStringLiteral("QUmlSignalEvent"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("signal"))));
+}
+
+void QUmlSignalEventObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSignalEvent, signal, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSignalEvent, signal, PropertyClassRole, QStringLiteral("QUmlSignalEvent"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSignalEvent, signal, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSignalEvent, signal, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSignalEvent, signal, DocumentationRole, QStringLiteral("The specific signal that is associated with this event."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSignalEvent, signal, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSignalEvent, signal, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSignalEvent, signal, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlsignaleventobject_p.h b/src/uml/qobjects/qumlsignaleventobject_p.h
index bfe97390..adedd575 100644
--- a/src/uml/qobjects/qumlsignaleventobject_p.h
+++ b/src/uml/qobjects/qumlsignaleventobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlSignalEvent;
-class Q_UML_EXPORT QUmlSignalEventObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlSignalEventObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlSignalEventObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -81,7 +84,7 @@ class Q_UML_EXPORT QUmlSignalEventObject : public QObject
     Q_PROPERTY(QObject * signal READ signal WRITE setSignal)
 
 public:
-    Q_INVOKABLE explicit QUmlSignalEventObject(QUmlSignalEvent *qModelingObject);
+    Q_INVOKABLE explicit QUmlSignalEventObject(QUmlSignalEvent *qModelingElement);
     virtual ~QUmlSignalEventObject();
 
     // Owned attributes [Element]
@@ -147,6 +150,10 @@ public Q_SLOTS:
 
     // Slots for owned attributes [SignalEvent]
     void setSignal(QObject *signal = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlsignalobject.cpp b/src/uml/qobjects/qumlsignalobject.cpp
index 37366aac..316e29d9 100644
--- a/src/uml/qobjects/qumlsignalobject.cpp
+++ b/src/uml/qobjects/qumlsignalobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlsignalobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlSignal>
 #include <QtUml/QUmlClassifier>
@@ -71,16 +72,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlSignalObject::QUmlSignalObject(QUmlSignal *qModelingObject)
+QUmlSignalObject::QUmlSignalObject(QUmlSignal *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlSignalObject::~QUmlSignalObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlSignal *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlSignal *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -89,25 +92,25 @@ QUmlSignalObject::~QUmlSignalObject()
 const QSet<QObject *> QUmlSignalObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlSignal *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlSignal *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSignalObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlSignal *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlSignal *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlSignalObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSignal *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlSignal *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSignal *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSignal *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -115,35 +118,35 @@ QObject *QUmlSignalObject::owner() const
 const QSet<QObject *> QUmlSignalObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlSignal *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlSignal *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlSignalObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlSignal *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlSignal *>(this)->name();
 }
 
 QObject *QUmlSignalObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSignal *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlSignal *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSignal *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSignal *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlSignalObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSignal *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlSignal *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSignal *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSignal *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlSignalObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlSignal *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlSignal *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [Namespace]
@@ -151,48 +154,48 @@ QString QUmlSignalObject::qualifiedName() const
 const QSet<QObject *> QUmlSignalObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlSignal *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlSignal *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSignalObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlSignal *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlSignal *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSignalObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlSignal *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlSignal *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSignalObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlSignal *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlSignal *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSignalObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlSignal *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlSignal *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSignalObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlSignal *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlSignal *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -200,49 +203,49 @@ const QSet<QObject *> QUmlSignalObject::packageImports() const
 
 QObject *QUmlSignalObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSignal *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlSignal *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSignal *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSignal *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlSignalObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlSignal *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlSignal *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Type]
 
 QObject *QUmlSignalObject::package() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSignal *>(this)->package())
+    if (!qmodelingelementproperty_cast<QUmlSignal *>(this)->package())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSignal *>(this)->package()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSignal *>(this)->package()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlSignalObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlSignal *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlSignal *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlSignalObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlSignal *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlSignal *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSignalObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlSignal *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlSignal *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -251,8 +254,8 @@ const QSet<QObject *> QUmlSignalObject::redefinitionContexts() const
 const QSet<QObject *> QUmlSignalObject::templateBindings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTemplateBinding *element, qmodelingobjectproperty_cast<QUmlSignal *>(this)->templateBindings())
-        set.insert(element->asQObject());
+    foreach (QUmlTemplateBinding *element, qmodelingelementproperty_cast<QUmlSignal *>(this)->templateBindings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -261,122 +264,122 @@ const QSet<QObject *> QUmlSignalObject::templateBindings() const
 const QSet<QObject *> QUmlSignalObject::attributes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlSignal *>(this)->attributes())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlSignal *>(this)->attributes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSignalObject::collaborationUses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlCollaborationUse *element, qmodelingobjectproperty_cast<QUmlSignal *>(this)->collaborationUses())
-        set.insert(element->asQObject());
+    foreach (QUmlCollaborationUse *element, qmodelingelementproperty_cast<QUmlSignal *>(this)->collaborationUses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSignalObject::features() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlSignal *>(this)->features())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlSignal *>(this)->features())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSignalObject::generals() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlSignal *>(this)->generals())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlSignal *>(this)->generals())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSignalObject::generalizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralization *element, qmodelingobjectproperty_cast<QUmlSignal *>(this)->generalizations())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralization *element, qmodelingelementproperty_cast<QUmlSignal *>(this)->generalizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSignalObject::inheritedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlSignal *>(this)->inheritedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlSignal *>(this)->inheritedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlSignalObject::isAbstract() const
 {
-    return qmodelingobjectproperty_cast<QUmlSignal *>(this)->isAbstract();
+    return qmodelingelementproperty_cast<QUmlSignal *>(this)->isAbstract();
 }
 
 bool QUmlSignalObject::isFinalSpecialization() const
 {
-    return qmodelingobjectproperty_cast<QUmlSignal *>(this)->isFinalSpecialization();
+    return qmodelingelementproperty_cast<QUmlSignal *>(this)->isFinalSpecialization();
 }
 
 QObject *QUmlSignalObject::ownedTemplateSignature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSignal *>(this)->ownedTemplateSignature())
+    if (!qmodelingelementproperty_cast<QUmlSignal *>(this)->ownedTemplateSignature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSignal *>(this)->ownedTemplateSignature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSignal *>(this)->ownedTemplateSignature()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlSignalObject::ownedUseCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlSignal *>(this)->ownedUseCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlSignal *>(this)->ownedUseCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSignalObject::powertypeExtents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralizationSet *element, qmodelingobjectproperty_cast<QUmlSignal *>(this)->powertypeExtents())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralizationSet *element, qmodelingelementproperty_cast<QUmlSignal *>(this)->powertypeExtents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSignalObject::redefinedClassifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlSignal *>(this)->redefinedClassifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlSignal *>(this)->redefinedClassifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlSignalObject::representation() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSignal *>(this)->representation())
+    if (!qmodelingelementproperty_cast<QUmlSignal *>(this)->representation())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSignal *>(this)->representation()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSignal *>(this)->representation()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlSignalObject::substitutions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlSubstitution *element, qmodelingobjectproperty_cast<QUmlSignal *>(this)->substitutions())
-        set.insert(element->asQObject());
+    foreach (QUmlSubstitution *element, qmodelingelementproperty_cast<QUmlSignal *>(this)->substitutions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlSignalObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSignal *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlSignal *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSignal *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSignal *>(this)->templateParameter()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlSignalObject::useCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlSignal *>(this)->useCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlSignal *>(this)->useCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -385,8 +388,8 @@ const QSet<QObject *> QUmlSignalObject::useCases() const
 const QList<QObject *> QUmlSignalObject::ownedAttributes() const
 {
     QList<QObject *> list;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlSignal *>(this)->ownedAttributes())
-        list.append(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlSignal *>(this)->ownedAttributes())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -395,14 +398,14 @@ const QList<QObject *> QUmlSignalObject::ownedAttributes() const
 QSet<QObject *> QUmlSignalObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlSignal *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlSignal *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlSignalObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlSignal *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlSignal *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -410,27 +413,27 @@ bool QUmlSignalObject::mustBeOwned() const
 QList<QObject *> QUmlSignalObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlSignal *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlSignal *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlSignalObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlSignal *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlSignal *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlSignalObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlSignal *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlSignal *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlSignalObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlSignal *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlSignal *>(this)->separator();
 }
 
 // OPERATIONS [Namespace]
@@ -439,44 +442,44 @@ QSet<QObject *> QUmlSignalObject::excludeCollisions(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlSignal *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlSignal *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlSignalObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlSignal *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlSignal *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlSignalObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlSignal *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlSignal *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlSignalObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlSignal *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlSignal *>(this)->membersAreDistinguishable();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlSignalObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlSignal *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlSignal *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlSignalObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlSignal *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlSignal *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [Type]
@@ -484,12 +487,12 @@ bool QUmlSignalObject::isTemplateParameter() const
 
 bool QUmlSignalObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlSignal *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlSignal *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlSignalObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlSignal *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlSignal *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [TemplateableElement]
@@ -497,8 +500,8 @@ bool QUmlSignalObject::isRedefinitionContextValid(QObject *redefined) const
 QSet<QObject *> QUmlSignalObject::parameterableElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterableElement *element, qmodelingobjectproperty_cast<QUmlSignal *>(this)->parameterableElements())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterableElement *element, qmodelingelementproperty_cast<QUmlSignal *>(this)->parameterableElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -507,63 +510,63 @@ QSet<QObject *> QUmlSignalObject::parameterableElements() const
 QSet<QObject *> QUmlSignalObject::allFeatures() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlSignal *>(this)->allFeatures())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlSignal *>(this)->allFeatures())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlSignalObject::allParents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlSignal *>(this)->allParents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlSignal *>(this)->allParents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlSignalObject::conformsTo(QObject *other) const
 {
-    return qmodelingobjectproperty_cast<QUmlSignal *>(this)->conformsTo(qmodelingobjectproperty_cast<QUmlClassifier *>(other));
+    return qmodelingelementproperty_cast<QUmlSignal *>(this)->conformsTo(qmodelingelementproperty_cast<QUmlClassifier *>(other));
 }
 
 bool QUmlSignalObject::hasVisibilityOf(QObject *n) const
 {
-    return qmodelingobjectproperty_cast<QUmlSignal *>(this)->hasVisibilityOf(qmodelingobjectproperty_cast<QUmlNamedElement *>(n));
+    return qmodelingelementproperty_cast<QUmlSignal *>(this)->hasVisibilityOf(qmodelingelementproperty_cast<QUmlNamedElement *>(n));
 }
 
 QSet<QObject *> QUmlSignalObject::inherit(QSet<QObject *> inhs) const
 {
     QSet<QUmlNamedElement *> inhsConverted;
     foreach (QObject *object, inhs)
-        inhsConverted.insert(qmodelingobjectproperty_cast<QUmlNamedElement *>(object));
+        inhsConverted.insert(qmodelingelementproperty_cast<QUmlNamedElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlSignal *>(this)->inherit(inhsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlSignal *>(this)->inherit(inhsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlSignalObject::inheritableMembers(QObject *c) const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlSignal *>(this)->inheritableMembers(qmodelingobjectproperty_cast<QUmlClassifier *>(c)))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlSignal *>(this)->inheritableMembers(qmodelingelementproperty_cast<QUmlClassifier *>(c)))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlSignalObject::isTemplate() const
 {
-    return qmodelingobjectproperty_cast<QUmlSignal *>(this)->isTemplate();
+    return qmodelingelementproperty_cast<QUmlSignal *>(this)->isTemplate();
 }
 
 bool QUmlSignalObject::maySpecializeType(QObject *c) const
 {
-    return qmodelingobjectproperty_cast<QUmlSignal *>(this)->maySpecializeType(qmodelingobjectproperty_cast<QUmlClassifier *>(c));
+    return qmodelingelementproperty_cast<QUmlSignal *>(this)->maySpecializeType(qmodelingelementproperty_cast<QUmlClassifier *>(c));
 }
 
 QSet<QObject *> QUmlSignalObject::parents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlSignal *>(this)->parents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlSignal *>(this)->parents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -571,348 +574,433 @@ QSet<QObject *> QUmlSignalObject::parents() const
 
 void QUmlSignalObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlSignalObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlSignalObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlSignalObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlSignalObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlSignalObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlSignalObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlSignalObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->setName(name);
 }
 
 void QUmlSignalObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlSignalObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlSignalObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlSignalObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlSignalObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlSignalObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlSignalObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlSignalObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlSignalObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlSignalObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlSignalObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlSignalObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlSignalObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlSignalObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlSignalObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlSignalObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlSignalObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->setVisibility(visibility);
 }
 
 void QUmlSignalObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Type]
 
 void QUmlSignalObject::setPackage(QObject *package)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->setPackage(qmodelingobjectproperty_cast<QUmlPackage *>(package));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->setPackage(qmodelingelementproperty_cast<QUmlPackage *>(package));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlSignalObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlSignalObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlSignalObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlSignalObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlSignalObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlSignalObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateableElement]
 
 void QUmlSignalObject::addTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->addTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->addTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 void QUmlSignalObject::removeTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->removeTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->removeTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Classifier]
 
 void QUmlSignalObject::addAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->addAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->addAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlSignalObject::removeAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->removeAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->removeAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlSignalObject::addCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->addCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->addCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlSignalObject::removeCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->removeCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->removeCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlSignalObject::addFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->addFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->addFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlSignalObject::removeFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->removeFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->removeFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlSignalObject::addGeneral(QObject *general)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->addGeneral(qmodelingobjectproperty_cast<QUmlClassifier *>(general));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->addGeneral(qmodelingelementproperty_cast<QUmlClassifier *>(general));
 }
 
 void QUmlSignalObject::removeGeneral(QObject *general)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->removeGeneral(qmodelingobjectproperty_cast<QUmlClassifier *>(general));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->removeGeneral(qmodelingelementproperty_cast<QUmlClassifier *>(general));
 }
 
 void QUmlSignalObject::addGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->addGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->addGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlSignalObject::removeGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->removeGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->removeGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlSignalObject::addInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->addInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->addInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlSignalObject::removeInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->removeInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->removeInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlSignalObject::setAbstract(bool isAbstract)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->setAbstract(isAbstract);
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->setAbstract(isAbstract);
 }
 
 void QUmlSignalObject::unsetAbstract()
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("abstract"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
 void QUmlSignalObject::setFinalSpecialization(bool isFinalSpecialization)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->setFinalSpecialization(isFinalSpecialization);
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->setFinalSpecialization(isFinalSpecialization);
 }
 
 void QUmlSignalObject::unsetFinalSpecialization()
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("finalSpecialization"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
 void QUmlSignalObject::setOwnedTemplateSignature(QObject *ownedTemplateSignature)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->setOwnedTemplateSignature(qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->setOwnedTemplateSignature(qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
 }
 
 void QUmlSignalObject::addOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->addOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->addOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlSignalObject::removeOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->removeOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->removeOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlSignalObject::addPowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->addPowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->addPowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlSignalObject::removePowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->removePowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->removePowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlSignalObject::addRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->addRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->addRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlSignalObject::removeRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->removeRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->removeRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlSignalObject::setRepresentation(QObject *representation)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->setRepresentation(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(representation));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->setRepresentation(qmodelingelementproperty_cast<QUmlCollaborationUse *>(representation));
 }
 
 void QUmlSignalObject::addSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->addSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->addSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlSignalObject::removeSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->removeSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->removeSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlSignalObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
 }
 
 void QUmlSignalObject::addUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->addUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->addUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 void QUmlSignalObject::removeUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->removeUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->removeUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Signal]
 
 void QUmlSignalObject::addOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->addOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->addOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlSignalObject::removeOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlSignal *>(this)->removeOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlSignal *>(this)->removeOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
+}
+
+
+void QUmlSignalObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlType");
+    d->groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generals"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
+
+    d->propertyGroups << QStringLiteral("QUmlSignal");
+    d->groupProperties.insert(QStringLiteral("QUmlSignal"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
+}
+
+void QUmlSignalObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSignal, ownedAttributes, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSignal, ownedAttributes, PropertyClassRole, QStringLiteral("QUmlSignal"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSignal, ownedAttributes, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSignal, ownedAttributes, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSignal, ownedAttributes, DocumentationRole, QStringLiteral("The attributes owned by the signal."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSignal, ownedAttributes, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSignal, ownedAttributes, SubsettedPropertiesRole, QStringLiteral("Namespace-ownedMember Classifier-attribute"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSignal, ownedAttributes, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlsignalobject_p.h b/src/uml/qobjects/qumlsignalobject_p.h
index d426a551..53de0259 100644
--- a/src/uml/qobjects/qumlsignalobject_p.h
+++ b/src/uml/qobjects/qumlsignalobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlSignal;
-class Q_UML_EXPORT QUmlSignalObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlSignalObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlSignalObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -117,7 +120,7 @@ class Q_UML_EXPORT QUmlSignalObject : public QObject
     Q_PROPERTY(QList<QObject *> ownedAttributes READ ownedAttributes)
 
 public:
-    Q_INVOKABLE explicit QUmlSignalObject(QUmlSignal *qModelingObject);
+    Q_INVOKABLE explicit QUmlSignalObject(QUmlSignal *qModelingElement);
     virtual ~QUmlSignalObject();
 
     // Owned attributes [Element]
@@ -305,6 +308,10 @@ public Q_SLOTS:
     // Slots for owned attributes [Signal]
     void addOwnedAttribute(QObject *ownedAttribute);
     void removeOwnedAttribute(QObject *ownedAttribute);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlslotobject.cpp b/src/uml/qobjects/qumlslotobject.cpp
index 23bdcf4b..2120c663 100644
--- a/src/uml/qobjects/qumlslotobject.cpp
+++ b/src/uml/qobjects/qumlslotobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlslotobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlSlot>
 #include <QtUml/QUmlComment>
@@ -49,16 +50,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlSlotObject::QUmlSlotObject(QUmlSlot *qModelingObject)
+QUmlSlotObject::QUmlSlotObject(QUmlSlot *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlSlotObject::~QUmlSlotObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlSlot *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlSlot *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -67,50 +70,50 @@ QUmlSlotObject::~QUmlSlotObject()
 const QSet<QObject *> QUmlSlotObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlSlot *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlSlot *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSlotObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlSlot *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlSlot *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlSlotObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSlot *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlSlot *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSlot *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSlot *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [Slot]
 
 QObject *QUmlSlotObject::definingFeature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSlot *>(this)->definingFeature())
+    if (!qmodelingelementproperty_cast<QUmlSlot *>(this)->definingFeature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSlot *>(this)->definingFeature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSlot *>(this)->definingFeature()->asQModelingObject();
 }
 
 QObject *QUmlSlotObject::owningInstance() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSlot *>(this)->owningInstance())
+    if (!qmodelingelementproperty_cast<QUmlSlot *>(this)->owningInstance())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSlot *>(this)->owningInstance()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSlot *>(this)->owningInstance()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlSlotObject::values() const
 {
     QList<QObject *> list;
-    foreach (QUmlValueSpecification *element, qmodelingobjectproperty_cast<QUmlSlot *>(this)->values())
-        list.append(element->asQObject());
+    foreach (QUmlValueSpecification *element, qmodelingelementproperty_cast<QUmlSlot *>(this)->values())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -119,63 +122,114 @@ const QList<QObject *> QUmlSlotObject::values() const
 QSet<QObject *> QUmlSlotObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlSlot *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlSlot *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlSlotObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlSlot *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlSlot *>(this)->mustBeOwned();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlSlotObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlSlot *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlSlot *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlSlotObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlSlot *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlSlot *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlSlotObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlSlot *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlSlot *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlSlotObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlSlot *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlSlot *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlSlotObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlSlot *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlSlot *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Slot]
 
 void QUmlSlotObject::setDefiningFeature(QObject *definingFeature)
 {
-    qmodelingobjectproperty_cast<QUmlSlot *>(this)->setDefiningFeature(qmodelingobjectproperty_cast<QUmlStructuralFeature *>(definingFeature));
+    qmodelingelementproperty_cast<QUmlSlot *>(this)->setDefiningFeature(qmodelingelementproperty_cast<QUmlStructuralFeature *>(definingFeature));
 }
 
 void QUmlSlotObject::setOwningInstance(QObject *owningInstance)
 {
-    qmodelingobjectproperty_cast<QUmlSlot *>(this)->setOwningInstance(qmodelingobjectproperty_cast<QUmlInstanceSpecification *>(owningInstance));
+    qmodelingelementproperty_cast<QUmlSlot *>(this)->setOwningInstance(qmodelingelementproperty_cast<QUmlInstanceSpecification *>(owningInstance));
 }
 
 void QUmlSlotObject::addValue(QObject *value)
 {
-    qmodelingobjectproperty_cast<QUmlSlot *>(this)->addValue(qmodelingobjectproperty_cast<QUmlValueSpecification *>(value));
+    qmodelingelementproperty_cast<QUmlSlot *>(this)->addValue(qmodelingelementproperty_cast<QUmlValueSpecification *>(value));
 }
 
 void QUmlSlotObject::removeValue(QObject *value)
 {
-    qmodelingobjectproperty_cast<QUmlSlot *>(this)->removeValue(qmodelingobjectproperty_cast<QUmlValueSpecification *>(value));
+    qmodelingelementproperty_cast<QUmlSlot *>(this)->removeValue(qmodelingelementproperty_cast<QUmlValueSpecification *>(value));
+}
+
+
+void QUmlSlotObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlSlot");
+    d->groupProperties.insert(QStringLiteral("QUmlSlot"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("definingFeature"))));
+    d->groupProperties.insert(QStringLiteral("QUmlSlot"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningInstance"))));
+    d->groupProperties.insert(QStringLiteral("QUmlSlot"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("values"))));
+}
+
+void QUmlSlotObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSlot, definingFeature, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSlot, definingFeature, PropertyClassRole, QStringLiteral("QUmlSlot"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSlot, definingFeature, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSlot, definingFeature, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSlot, definingFeature, DocumentationRole, QStringLiteral("The structural feature that specifies the values that may be held by the slot."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSlot, definingFeature, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSlot, definingFeature, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSlot, definingFeature, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSlot, owningInstance, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSlot, owningInstance, PropertyClassRole, QStringLiteral("QUmlSlot"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSlot, owningInstance, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSlot, owningInstance, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSlot, owningInstance, DocumentationRole, QStringLiteral("The instance specification that owns this slot."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSlot, owningInstance, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSlot, owningInstance, SubsettedPropertiesRole, QStringLiteral("Element-owner"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSlot, owningInstance, OppositeEndRole, QStringLiteral("InstanceSpecification-slot"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSlot, values, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSlot, values, PropertyClassRole, QStringLiteral("QUmlSlot"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSlot, values, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSlot, values, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSlot, values, DocumentationRole, QStringLiteral("The value or values corresponding to the defining feature for the owning instance specification."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSlot, values, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSlot, values, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSlot, values, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlslotobject_p.h b/src/uml/qobjects/qumlslotobject_p.h
index 28555d21..424e616c 100644
--- a/src/uml/qobjects/qumlslotobject_p.h
+++ b/src/uml/qobjects/qumlslotobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 QT_BEGIN_HEADER
 
@@ -52,9 +52,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlSlot;
-class Q_UML_EXPORT QUmlSlotObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlSlotObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlSlotObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -67,7 +70,7 @@ class Q_UML_EXPORT QUmlSlotObject : public QObject
     Q_PROPERTY(QList<QObject *> values READ values)
 
 public:
-    Q_INVOKABLE explicit QUmlSlotObject(QUmlSlot *qModelingObject);
+    Q_INVOKABLE explicit QUmlSlotObject(QUmlSlot *qModelingElement);
     virtual ~QUmlSlotObject();
 
     // Owned attributes [Element]
@@ -98,6 +101,10 @@ public Q_SLOTS:
     void setOwningInstance(QObject *owningInstance = 0);
     void addValue(QObject *value);
     void removeValue(QObject *value);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlstartclassifierbehavioractionobject.cpp b/src/uml/qobjects/qumlstartclassifierbehavioractionobject.cpp
index 5af3e458..4eb86393 100644
--- a/src/uml/qobjects/qumlstartclassifierbehavioractionobject.cpp
+++ b/src/uml/qobjects/qumlstartclassifierbehavioractionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlstartclassifierbehavioractionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlStartClassifierBehaviorAction>
 #include <QtUml/QUmlActivity>
@@ -64,16 +65,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlStartClassifierBehaviorActionObject::QUmlStartClassifierBehaviorActionObject(QUmlStartClassifierBehaviorAction *qModelingObject)
+QUmlStartClassifierBehaviorActionObject::QUmlStartClassifierBehaviorActionObject(QUmlStartClassifierBehaviorAction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlStartClassifierBehaviorActionObject::~QUmlStartClassifierBehaviorActionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -82,25 +85,25 @@ QUmlStartClassifierBehaviorActionObject::~QUmlStartClassifierBehaviorActionObjec
 const QSet<QObject *> QUmlStartClassifierBehaviorActionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStartClassifierBehaviorActionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlStartClassifierBehaviorActionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -108,62 +111,62 @@ QObject *QUmlStartClassifierBehaviorActionObject::owner() const
 const QSet<QObject *> QUmlStartClassifierBehaviorActionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlStartClassifierBehaviorActionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->name();
 }
 
 QObject *QUmlStartClassifierBehaviorActionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlStartClassifierBehaviorActionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlStartClassifierBehaviorActionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlStartClassifierBehaviorActionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlStartClassifierBehaviorActionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlStartClassifierBehaviorActionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStartClassifierBehaviorActionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -171,65 +174,65 @@ const QSet<QObject *> QUmlStartClassifierBehaviorActionObject::redefinitionConte
 
 QObject *QUmlStartClassifierBehaviorActionObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlStartClassifierBehaviorActionObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStartClassifierBehaviorActionObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStartClassifierBehaviorActionObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlStartClassifierBehaviorActionObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlStartClassifierBehaviorActionObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStartClassifierBehaviorActionObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStartClassifierBehaviorActionObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -238,8 +241,8 @@ const QSet<QObject *> QUmlStartClassifierBehaviorActionObject::redefinedNodes()
 const QSet<QObject *> QUmlStartClassifierBehaviorActionObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -247,46 +250,46 @@ const QSet<QObject *> QUmlStartClassifierBehaviorActionObject::handlers() const
 
 QObject *QUmlStartClassifierBehaviorActionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlStartClassifierBehaviorActionObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlStartClassifierBehaviorActionObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlStartClassifierBehaviorActionObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStartClassifierBehaviorActionObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlStartClassifierBehaviorActionObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -294,10 +297,10 @@ const QList<QObject *> QUmlStartClassifierBehaviorActionObject::outputs() const
 
 QObject *QUmlStartClassifierBehaviorActionObject::object() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->object())
+    if (!qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->object())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->object()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->object()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -305,14 +308,14 @@ QObject *QUmlStartClassifierBehaviorActionObject::object() const
 QSet<QObject *> QUmlStartClassifierBehaviorActionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlStartClassifierBehaviorActionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -320,283 +323,350 @@ bool QUmlStartClassifierBehaviorActionObject::mustBeOwned() const
 QList<QObject *> QUmlStartClassifierBehaviorActionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlStartClassifierBehaviorActionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlStartClassifierBehaviorActionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlStartClassifierBehaviorActionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlStartClassifierBehaviorActionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlStartClassifierBehaviorActionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlStartClassifierBehaviorActionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlStartClassifierBehaviorActionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlStartClassifierBehaviorActionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlStartClassifierBehaviorActionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlStartClassifierBehaviorActionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlStartClassifierBehaviorActionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlStartClassifierBehaviorActionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlStartClassifierBehaviorActionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->setName(name);
 }
 
 void QUmlStartClassifierBehaviorActionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlStartClassifierBehaviorActionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlStartClassifierBehaviorActionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlStartClassifierBehaviorActionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlStartClassifierBehaviorActionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlStartClassifierBehaviorActionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlStartClassifierBehaviorActionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlStartClassifierBehaviorActionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlStartClassifierBehaviorActionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlStartClassifierBehaviorActionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlStartClassifierBehaviorActionObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlStartClassifierBehaviorActionObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlStartClassifierBehaviorActionObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlStartClassifierBehaviorActionObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlStartClassifierBehaviorActionObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlStartClassifierBehaviorActionObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlStartClassifierBehaviorActionObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlStartClassifierBehaviorActionObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlStartClassifierBehaviorActionObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlStartClassifierBehaviorActionObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlStartClassifierBehaviorActionObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlStartClassifierBehaviorActionObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlStartClassifierBehaviorActionObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlStartClassifierBehaviorActionObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlStartClassifierBehaviorActionObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlStartClassifierBehaviorActionObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlStartClassifierBehaviorActionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlStartClassifierBehaviorActionObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlStartClassifierBehaviorActionObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlStartClassifierBehaviorActionObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlStartClassifierBehaviorActionObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlStartClassifierBehaviorActionObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlStartClassifierBehaviorActionObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlStartClassifierBehaviorActionObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlStartClassifierBehaviorActionObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlStartClassifierBehaviorActionObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlStartClassifierBehaviorActionObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [StartClassifierBehaviorAction]
 
 void QUmlStartClassifierBehaviorActionObject::setObject(QObject *object)
 {
-    qmodelingobjectproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->setObject(qmodelingobjectproperty_cast<QUmlInputPin *>(object));
+    qmodelingelementproperty_cast<QUmlStartClassifierBehaviorAction *>(this)->setObject(qmodelingelementproperty_cast<QUmlInputPin *>(object));
+}
+
+
+void QUmlStartClassifierBehaviorActionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlStartClassifierBehaviorAction");
+    d->groupProperties.insert(QStringLiteral("QUmlStartClassifierBehaviorAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("object"))));
+}
+
+void QUmlStartClassifierBehaviorActionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStartClassifierBehaviorAction, object, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStartClassifierBehaviorAction, object, PropertyClassRole, QStringLiteral("QUmlStartClassifierBehaviorAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStartClassifierBehaviorAction, object, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStartClassifierBehaviorAction, object, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStartClassifierBehaviorAction, object, DocumentationRole, QStringLiteral("Holds the object on which to start the owned behavior."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStartClassifierBehaviorAction, object, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStartClassifierBehaviorAction, object, SubsettedPropertiesRole, QStringLiteral("Action-input"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStartClassifierBehaviorAction, object, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlstartclassifierbehavioractionobject_p.h b/src/uml/qobjects/qumlstartclassifierbehavioractionobject_p.h
index 9a3991ce..95eddc3e 100644
--- a/src/uml/qobjects/qumlstartclassifierbehavioractionobject_p.h
+++ b/src/uml/qobjects/qumlstartclassifierbehavioractionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlStartClassifierBehaviorAction;
-class Q_UML_EXPORT QUmlStartClassifierBehaviorActionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlStartClassifierBehaviorActionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlStartClassifierBehaviorActionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -101,7 +104,7 @@ class Q_UML_EXPORT QUmlStartClassifierBehaviorActionObject : public QObject
     Q_PROPERTY(QObject * object READ object WRITE setObject)
 
 public:
-    Q_INVOKABLE explicit QUmlStartClassifierBehaviorActionObject(QUmlStartClassifierBehaviorAction *qModelingObject);
+    Q_INVOKABLE explicit QUmlStartClassifierBehaviorActionObject(QUmlStartClassifierBehaviorAction *qModelingElement);
     virtual ~QUmlStartClassifierBehaviorActionObject();
 
     // Owned attributes [Element]
@@ -221,6 +224,10 @@ public Q_SLOTS:
 
     // Slots for owned attributes [StartClassifierBehaviorAction]
     void setObject(QObject *object = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlstartobjectbehavioractionobject.cpp b/src/uml/qobjects/qumlstartobjectbehavioractionobject.cpp
index 741dd4c2..da543292 100644
--- a/src/uml/qobjects/qumlstartobjectbehavioractionobject.cpp
+++ b/src/uml/qobjects/qumlstartobjectbehavioractionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlstartobjectbehavioractionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlStartObjectBehaviorAction>
 #include <QtUml/QUmlActivity>
@@ -65,16 +66,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlStartObjectBehaviorActionObject::QUmlStartObjectBehaviorActionObject(QUmlStartObjectBehaviorAction *qModelingObject)
+QUmlStartObjectBehaviorActionObject::QUmlStartObjectBehaviorActionObject(QUmlStartObjectBehaviorAction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlStartObjectBehaviorActionObject::~QUmlStartObjectBehaviorActionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -83,25 +86,25 @@ QUmlStartObjectBehaviorActionObject::~QUmlStartObjectBehaviorActionObject()
 const QSet<QObject *> QUmlStartObjectBehaviorActionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStartObjectBehaviorActionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlStartObjectBehaviorActionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -109,62 +112,62 @@ QObject *QUmlStartObjectBehaviorActionObject::owner() const
 const QSet<QObject *> QUmlStartObjectBehaviorActionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlStartObjectBehaviorActionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->name();
 }
 
 QObject *QUmlStartObjectBehaviorActionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlStartObjectBehaviorActionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlStartObjectBehaviorActionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlStartObjectBehaviorActionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlStartObjectBehaviorActionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlStartObjectBehaviorActionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStartObjectBehaviorActionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -172,65 +175,65 @@ const QSet<QObject *> QUmlStartObjectBehaviorActionObject::redefinitionContexts(
 
 QObject *QUmlStartObjectBehaviorActionObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlStartObjectBehaviorActionObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStartObjectBehaviorActionObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStartObjectBehaviorActionObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlStartObjectBehaviorActionObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlStartObjectBehaviorActionObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStartObjectBehaviorActionObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStartObjectBehaviorActionObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -239,8 +242,8 @@ const QSet<QObject *> QUmlStartObjectBehaviorActionObject::redefinedNodes() cons
 const QSet<QObject *> QUmlStartObjectBehaviorActionObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -248,46 +251,46 @@ const QSet<QObject *> QUmlStartObjectBehaviorActionObject::handlers() const
 
 QObject *QUmlStartObjectBehaviorActionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlStartObjectBehaviorActionObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlStartObjectBehaviorActionObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlStartObjectBehaviorActionObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStartObjectBehaviorActionObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlStartObjectBehaviorActionObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -296,31 +299,31 @@ const QList<QObject *> QUmlStartObjectBehaviorActionObject::outputs() const
 const QList<QObject *> QUmlStartObjectBehaviorActionObject::arguments() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->arguments())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->arguments())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 QObject *QUmlStartObjectBehaviorActionObject::onPort() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->onPort())
+    if (!qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->onPort())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->onPort()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->onPort()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [CallAction]
 
 bool QUmlStartObjectBehaviorActionObject::isSynchronous() const
 {
-    return qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->isSynchronous();
+    return qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->isSynchronous();
 }
 
 const QList<QObject *> QUmlStartObjectBehaviorActionObject::results() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->results())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->results())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -328,10 +331,10 @@ const QList<QObject *> QUmlStartObjectBehaviorActionObject::results() const
 
 QObject *QUmlStartObjectBehaviorActionObject::object() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->object())
+    if (!qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->object())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->object()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->object()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -339,14 +342,14 @@ QObject *QUmlStartObjectBehaviorActionObject::object() const
 QSet<QObject *> QUmlStartObjectBehaviorActionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlStartObjectBehaviorActionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -354,322 +357,398 @@ bool QUmlStartObjectBehaviorActionObject::mustBeOwned() const
 QList<QObject *> QUmlStartObjectBehaviorActionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlStartObjectBehaviorActionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlStartObjectBehaviorActionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlStartObjectBehaviorActionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlStartObjectBehaviorActionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlStartObjectBehaviorActionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlStartObjectBehaviorActionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlStartObjectBehaviorActionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlStartObjectBehaviorActionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlStartObjectBehaviorActionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlStartObjectBehaviorActionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlStartObjectBehaviorActionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlStartObjectBehaviorActionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlStartObjectBehaviorActionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->setName(name);
 }
 
 void QUmlStartObjectBehaviorActionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlStartObjectBehaviorActionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlStartObjectBehaviorActionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlStartObjectBehaviorActionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlStartObjectBehaviorActionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlStartObjectBehaviorActionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlStartObjectBehaviorActionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlStartObjectBehaviorActionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlStartObjectBehaviorActionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlStartObjectBehaviorActionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlStartObjectBehaviorActionObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlStartObjectBehaviorActionObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlStartObjectBehaviorActionObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlStartObjectBehaviorActionObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlStartObjectBehaviorActionObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlStartObjectBehaviorActionObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlStartObjectBehaviorActionObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlStartObjectBehaviorActionObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlStartObjectBehaviorActionObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlStartObjectBehaviorActionObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlStartObjectBehaviorActionObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlStartObjectBehaviorActionObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlStartObjectBehaviorActionObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlStartObjectBehaviorActionObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlStartObjectBehaviorActionObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlStartObjectBehaviorActionObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlStartObjectBehaviorActionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlStartObjectBehaviorActionObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlStartObjectBehaviorActionObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlStartObjectBehaviorActionObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlStartObjectBehaviorActionObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlStartObjectBehaviorActionObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlStartObjectBehaviorActionObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlStartObjectBehaviorActionObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlStartObjectBehaviorActionObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlStartObjectBehaviorActionObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlStartObjectBehaviorActionObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [InvocationAction]
 
 void QUmlStartObjectBehaviorActionObject::addArgument(QObject *argument)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->addArgument(qmodelingobjectproperty_cast<QUmlInputPin *>(argument));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->addArgument(qmodelingelementproperty_cast<QUmlInputPin *>(argument));
 }
 
 void QUmlStartObjectBehaviorActionObject::removeArgument(QObject *argument)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->removeArgument(qmodelingobjectproperty_cast<QUmlInputPin *>(argument));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->removeArgument(qmodelingelementproperty_cast<QUmlInputPin *>(argument));
 }
 
 void QUmlStartObjectBehaviorActionObject::setOnPort(QObject *onPort)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->setOnPort(qmodelingobjectproperty_cast<QUmlPort *>(onPort));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->setOnPort(qmodelingelementproperty_cast<QUmlPort *>(onPort));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [CallAction]
 
 void QUmlStartObjectBehaviorActionObject::setSynchronous(bool isSynchronous)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->setSynchronous(isSynchronous);
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->setSynchronous(isSynchronous);
 }
 
 void QUmlStartObjectBehaviorActionObject::unsetSynchronous()
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("synchronous"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("synchronous"));
 }
 
 void QUmlStartObjectBehaviorActionObject::addResult(QObject *result)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->addResult(qmodelingobjectproperty_cast<QUmlOutputPin *>(result));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->addResult(qmodelingelementproperty_cast<QUmlOutputPin *>(result));
 }
 
 void QUmlStartObjectBehaviorActionObject::removeResult(QObject *result)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->removeResult(qmodelingobjectproperty_cast<QUmlOutputPin *>(result));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->removeResult(qmodelingelementproperty_cast<QUmlOutputPin *>(result));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [StartObjectBehaviorAction]
 
 void QUmlStartObjectBehaviorActionObject::setObject(QObject *object)
 {
-    qmodelingobjectproperty_cast<QUmlStartObjectBehaviorAction *>(this)->setObject(qmodelingobjectproperty_cast<QUmlInputPin *>(object));
+    qmodelingelementproperty_cast<QUmlStartObjectBehaviorAction *>(this)->setObject(qmodelingelementproperty_cast<QUmlInputPin *>(object));
+}
+
+
+void QUmlStartObjectBehaviorActionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlInvocationAction");
+    d->groupProperties.insert(QStringLiteral("QUmlInvocationAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("arguments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInvocationAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("onPort"))));
+
+    d->propertyGroups << QStringLiteral("QUmlCallAction");
+    d->groupProperties.insert(QStringLiteral("QUmlCallAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isSynchronous"))));
+    d->groupProperties.insert(QStringLiteral("QUmlCallAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("results"))));
+
+    d->propertyGroups << QStringLiteral("QUmlStartObjectBehaviorAction");
+    d->groupProperties.insert(QStringLiteral("QUmlStartObjectBehaviorAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("object"))));
+}
+
+void QUmlStartObjectBehaviorActionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStartObjectBehaviorAction, object, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStartObjectBehaviorAction, object, PropertyClassRole, QStringLiteral("QUmlStartObjectBehaviorAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStartObjectBehaviorAction, object, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStartObjectBehaviorAction, object, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStartObjectBehaviorAction, object, DocumentationRole, QStringLiteral("Holds the object which is either a behavior to be started or has a classifier behavior to be started."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStartObjectBehaviorAction, object, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStartObjectBehaviorAction, object, SubsettedPropertiesRole, QStringLiteral("Action-input"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStartObjectBehaviorAction, object, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlstartobjectbehavioractionobject_p.h b/src/uml/qobjects/qumlstartobjectbehavioractionobject_p.h
index b6f24399..b6fc44b0 100644
--- a/src/uml/qobjects/qumlstartobjectbehavioractionobject_p.h
+++ b/src/uml/qobjects/qumlstartobjectbehavioractionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlStartObjectBehaviorAction;
-class Q_UML_EXPORT QUmlStartObjectBehaviorActionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlStartObjectBehaviorActionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlStartObjectBehaviorActionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -109,7 +112,7 @@ class Q_UML_EXPORT QUmlStartObjectBehaviorActionObject : public QObject
     Q_PROPERTY(QObject * object READ object WRITE setObject)
 
 public:
-    Q_INVOKABLE explicit QUmlStartObjectBehaviorActionObject(QUmlStartObjectBehaviorAction *qModelingObject);
+    Q_INVOKABLE explicit QUmlStartObjectBehaviorActionObject(QUmlStartObjectBehaviorAction *qModelingElement);
     virtual ~QUmlStartObjectBehaviorActionObject();
 
     // Owned attributes [Element]
@@ -248,6 +251,10 @@ public Q_SLOTS:
 
     // Slots for owned attributes [StartObjectBehaviorAction]
     void setObject(QObject *object = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlstateinvariantobject.cpp b/src/uml/qobjects/qumlstateinvariantobject.cpp
index 74a883ae..74ff124e 100644
--- a/src/uml/qobjects/qumlstateinvariantobject.cpp
+++ b/src/uml/qobjects/qumlstateinvariantobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlstateinvariantobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlStateInvariant>
 #include <QtUml/QUmlComment>
@@ -56,16 +57,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlStateInvariantObject::QUmlStateInvariantObject(QUmlStateInvariant *qModelingObject)
+QUmlStateInvariantObject::QUmlStateInvariantObject(QUmlStateInvariant *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlStateInvariantObject::~QUmlStateInvariantObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -74,25 +77,25 @@ QUmlStateInvariantObject::~QUmlStateInvariantObject()
 const QSet<QObject *> QUmlStateInvariantObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStateInvariantObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlStateInvariantObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -100,65 +103,65 @@ QObject *QUmlStateInvariantObject::owner() const
 const QSet<QObject *> QUmlStateInvariantObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlStateInvariantObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->name();
 }
 
 QObject *QUmlStateInvariantObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlStateInvariantObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlStateInvariantObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlStateInvariantObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [InteractionFragment]
 
 QObject *QUmlStateInvariantObject::enclosingInteraction() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->enclosingInteraction())
+    if (!qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->enclosingInteraction())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->enclosingInteraction()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->enclosingInteraction()->asQModelingObject();
 }
 
 QObject *QUmlStateInvariantObject::enclosingOperand() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->enclosingOperand())
+    if (!qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->enclosingOperand())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->enclosingOperand()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->enclosingOperand()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlStateInvariantObject::generalOrderings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralOrdering *element, qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->generalOrderings())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralOrdering *element, qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->generalOrderings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -166,18 +169,18 @@ const QSet<QObject *> QUmlStateInvariantObject::generalOrderings() const
 
 QObject *QUmlStateInvariantObject::covered() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->covered())
+    if (!qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->covered())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->covered()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->covered()->asQModelingObject();
 }
 
 QObject *QUmlStateInvariantObject::invariant() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->invariant())
+    if (!qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->invariant())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->invariant()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->invariant()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -185,14 +188,14 @@ QObject *QUmlStateInvariantObject::invariant() const
 QSet<QObject *> QUmlStateInvariantObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlStateInvariantObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -200,125 +203,179 @@ bool QUmlStateInvariantObject::mustBeOwned() const
 QList<QObject *> QUmlStateInvariantObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlStateInvariantObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlStateInvariantObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlStateInvariantObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlStateInvariantObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlStateInvariantObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlStateInvariantObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlStateInvariantObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlStateInvariantObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlStateInvariantObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlStateInvariantObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlStateInvariantObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->setName(name);
 }
 
 void QUmlStateInvariantObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlStateInvariantObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlStateInvariantObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlStateInvariantObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [InteractionFragment]
 
 void QUmlStateInvariantObject::setEnclosingInteraction(QObject *enclosingInteraction)
 {
-    qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->setEnclosingInteraction(qmodelingobjectproperty_cast<QUmlInteraction *>(enclosingInteraction));
+    qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->setEnclosingInteraction(qmodelingelementproperty_cast<QUmlInteraction *>(enclosingInteraction));
 }
 
 void QUmlStateInvariantObject::setEnclosingOperand(QObject *enclosingOperand)
 {
-    qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->setEnclosingOperand(qmodelingobjectproperty_cast<QUmlInteractionOperand *>(enclosingOperand));
+    qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->setEnclosingOperand(qmodelingelementproperty_cast<QUmlInteractionOperand *>(enclosingOperand));
 }
 
 void QUmlStateInvariantObject::addGeneralOrdering(QObject *generalOrdering)
 {
-    qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->addGeneralOrdering(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
+    qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->addGeneralOrdering(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
 }
 
 void QUmlStateInvariantObject::removeGeneralOrdering(QObject *generalOrdering)
 {
-    qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->removeGeneralOrdering(qmodelingobjectproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
+    qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->removeGeneralOrdering(qmodelingelementproperty_cast<QUmlGeneralOrdering *>(generalOrdering));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [StateInvariant]
 
 void QUmlStateInvariantObject::setCovered(QObject *covered)
 {
-    qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->setCovered(qmodelingobjectproperty_cast<QUmlLifeline *>(covered));
+    qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->setCovered(qmodelingelementproperty_cast<QUmlLifeline *>(covered));
 }
 
 void QUmlStateInvariantObject::setInvariant(QObject *invariant)
 {
-    qmodelingobjectproperty_cast<QUmlStateInvariant *>(this)->setInvariant(qmodelingobjectproperty_cast<QUmlConstraint *>(invariant));
+    qmodelingelementproperty_cast<QUmlStateInvariant *>(this)->setInvariant(qmodelingelementproperty_cast<QUmlConstraint *>(invariant));
+}
+
+
+void QUmlStateInvariantObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlInteractionFragment");
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingInteraction"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingOperand"))));
+    d->groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalOrderings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlStateInvariant");
+    d->groupProperties.insert(QStringLiteral("QUmlStateInvariant"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("covered"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStateInvariant"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("invariant"))));
+}
+
+void QUmlStateInvariantObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateInvariant, covered, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateInvariant, covered, PropertyClassRole, QStringLiteral("QUmlStateInvariant"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateInvariant, covered, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateInvariant, covered, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateInvariant, covered, DocumentationRole, QStringLiteral("References the Lifeline on which the StateInvariant appears."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateInvariant, covered, RedefinedPropertiesRole, QStringLiteral("InteractionFragment-covered"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateInvariant, covered, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateInvariant, covered, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateInvariant, invariant, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateInvariant, invariant, PropertyClassRole, QStringLiteral("QUmlStateInvariant"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateInvariant, invariant, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateInvariant, invariant, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateInvariant, invariant, DocumentationRole, QStringLiteral("A Constraint that should hold at runtime for this StateInvariant"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateInvariant, invariant, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateInvariant, invariant, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateInvariant, invariant, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlstateinvariantobject_p.h b/src/uml/qobjects/qumlstateinvariantobject_p.h
index 66c3affd..c33f2042 100644
--- a/src/uml/qobjects/qumlstateinvariantobject_p.h
+++ b/src/uml/qobjects/qumlstateinvariantobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlStateInvariant;
-class Q_UML_EXPORT QUmlStateInvariantObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlStateInvariantObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlStateInvariantObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -81,7 +84,7 @@ class Q_UML_EXPORT QUmlStateInvariantObject : public QObject
     Q_PROPERTY(QObject * invariant READ invariant WRITE setInvariant)
 
 public:
-    Q_INVOKABLE explicit QUmlStateInvariantObject(QUmlStateInvariant *qModelingObject);
+    Q_INVOKABLE explicit QUmlStateInvariantObject(QUmlStateInvariant *qModelingElement);
     virtual ~QUmlStateInvariantObject();
 
     // Owned attributes [Element]
@@ -143,6 +146,10 @@ public Q_SLOTS:
     // Slots for owned attributes [StateInvariant]
     void setCovered(QObject *covered = 0);
     void setInvariant(QObject *invariant = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlstatemachineobject.cpp b/src/uml/qobjects/qumlstatemachineobject.cpp
index 64db541d..a4b1ae47 100644
--- a/src/uml/qobjects/qumlstatemachineobject.cpp
+++ b/src/uml/qobjects/qumlstatemachineobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlstatemachineobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlStateMachine>
 #include <QtUml/QUmlBehavior>
@@ -87,16 +88,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlStateMachineObject::QUmlStateMachineObject(QUmlStateMachine *qModelingObject)
+QUmlStateMachineObject::QUmlStateMachineObject(QUmlStateMachine *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlStateMachineObject::~QUmlStateMachineObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlStateMachine *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -105,25 +108,25 @@ QUmlStateMachineObject::~QUmlStateMachineObject()
 const QSet<QObject *> QUmlStateMachineObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStateMachineObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlStateMachineObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlStateMachine *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStateMachine *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -131,35 +134,35 @@ QObject *QUmlStateMachineObject::owner() const
 const QSet<QObject *> QUmlStateMachineObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlStateMachineObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlStateMachine *>(this)->name();
 }
 
 QObject *QUmlStateMachineObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlStateMachine *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStateMachine *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlStateMachineObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlStateMachine *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStateMachine *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlStateMachineObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlStateMachine *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [Namespace]
@@ -167,48 +170,48 @@ QString QUmlStateMachineObject::qualifiedName() const
 const QSet<QObject *> QUmlStateMachineObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStateMachineObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStateMachineObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStateMachineObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStateMachineObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStateMachineObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -216,49 +219,49 @@ const QSet<QObject *> QUmlStateMachineObject::packageImports() const
 
 QObject *QUmlStateMachineObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlStateMachine *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStateMachine *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlStateMachineObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlStateMachine *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Type]
 
 QObject *QUmlStateMachineObject::package() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->package())
+    if (!qmodelingelementproperty_cast<QUmlStateMachine *>(this)->package())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->package()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStateMachine *>(this)->package()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlStateMachineObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlStateMachine *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlStateMachineObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStateMachineObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -267,8 +270,8 @@ const QSet<QObject *> QUmlStateMachineObject::redefinitionContexts() const
 const QSet<QObject *> QUmlStateMachineObject::templateBindings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTemplateBinding *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->templateBindings())
-        set.insert(element->asQObject());
+    foreach (QUmlTemplateBinding *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->templateBindings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -277,109 +280,109 @@ const QSet<QObject *> QUmlStateMachineObject::templateBindings() const
 const QSet<QObject *> QUmlStateMachineObject::attributes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->attributes())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->attributes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStateMachineObject::collaborationUses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlCollaborationUse *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->collaborationUses())
-        set.insert(element->asQObject());
+    foreach (QUmlCollaborationUse *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->collaborationUses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStateMachineObject::features() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->features())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->features())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStateMachineObject::generalizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralization *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->generalizations())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralization *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->generalizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStateMachineObject::inheritedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->inheritedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->inheritedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlStateMachineObject::isFinalSpecialization() const
 {
-    return qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->isFinalSpecialization();
+    return qmodelingelementproperty_cast<QUmlStateMachine *>(this)->isFinalSpecialization();
 }
 
 QObject *QUmlStateMachineObject::ownedTemplateSignature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->ownedTemplateSignature())
+    if (!qmodelingelementproperty_cast<QUmlStateMachine *>(this)->ownedTemplateSignature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->ownedTemplateSignature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStateMachine *>(this)->ownedTemplateSignature()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlStateMachineObject::ownedUseCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->ownedUseCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->ownedUseCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStateMachineObject::powertypeExtents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralizationSet *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->powertypeExtents())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralizationSet *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->powertypeExtents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStateMachineObject::redefinedClassifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->redefinedClassifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->redefinedClassifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlStateMachineObject::representation() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->representation())
+    if (!qmodelingelementproperty_cast<QUmlStateMachine *>(this)->representation())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->representation()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStateMachine *>(this)->representation()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlStateMachineObject::substitutions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlSubstitution *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->substitutions())
-        set.insert(element->asQObject());
+    foreach (QUmlSubstitution *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->substitutions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlStateMachineObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlStateMachine *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStateMachine *>(this)->templateParameter()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlStateMachineObject::useCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->useCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->useCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -388,24 +391,24 @@ const QSet<QObject *> QUmlStateMachineObject::useCases() const
 const QSet<QObject *> QUmlStateMachineObject::ownedConnectors() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConnector *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->ownedConnectors())
-        set.insert(element->asQObject());
+    foreach (QUmlConnector *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->ownedConnectors())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStateMachineObject::parts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->parts())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->parts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStateMachineObject::roles() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConnectableElement *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->roles())
-        set.insert(element->asQObject());
+    foreach (QUmlConnectableElement *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->roles())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -414,8 +417,8 @@ const QSet<QObject *> QUmlStateMachineObject::roles() const
 const QSet<QObject *> QUmlStateMachineObject::ownedPorts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPort *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->ownedPorts())
-        set.insert(element->asQObject());
+    foreach (QUmlPort *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->ownedPorts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -423,25 +426,25 @@ const QSet<QObject *> QUmlStateMachineObject::ownedPorts() const
 
 QObject *QUmlStateMachineObject::classifierBehavior() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->classifierBehavior())
+    if (!qmodelingelementproperty_cast<QUmlStateMachine *>(this)->classifierBehavior())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->classifierBehavior()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStateMachine *>(this)->classifierBehavior()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlStateMachineObject::interfaceRealizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterfaceRealization *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->interfaceRealizations())
-        set.insert(element->asQObject());
+    foreach (QUmlInterfaceRealization *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->interfaceRealizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStateMachineObject::ownedBehaviors() const
 {
     QSet<QObject *> set;
-    foreach (QUmlBehavior *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->ownedBehaviors())
-        set.insert(element->asQObject());
+    foreach (QUmlBehavior *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->ownedBehaviors())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -450,58 +453,58 @@ const QSet<QObject *> QUmlStateMachineObject::ownedBehaviors() const
 const QSet<QObject *> QUmlStateMachineObject::extensions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExtension *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->extensions())
-        set.insert(element->asQObject());
+    foreach (QUmlExtension *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->extensions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlStateMachineObject::isAbstract() const
 {
-    return qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->isAbstract();
+    return qmodelingelementproperty_cast<QUmlStateMachine *>(this)->isAbstract();
 }
 
 bool QUmlStateMachineObject::isActive() const
 {
-    return qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->isActive();
+    return qmodelingelementproperty_cast<QUmlStateMachine *>(this)->isActive();
 }
 
 const QList<QObject *> QUmlStateMachineObject::nestedClassifiers() const
 {
     QList<QObject *> list;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->nestedClassifiers())
-        list.append(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->nestedClassifiers())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QList<QObject *> QUmlStateMachineObject::ownedAttributes() const
 {
     QList<QObject *> list;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->ownedAttributes())
-        list.append(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->ownedAttributes())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QList<QObject *> QUmlStateMachineObject::ownedOperations() const
 {
     QList<QObject *> list;
-    foreach (QUmlOperation *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->ownedOperations())
-        list.append(element->asQObject());
+    foreach (QUmlOperation *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->ownedOperations())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QSet<QObject *> QUmlStateMachineObject::ownedReceptions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlReception *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->ownedReceptions())
-        set.insert(element->asQObject());
+    foreach (QUmlReception *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->ownedReceptions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStateMachineObject::superClasses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClass *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->superClasses())
-        set.insert(element->asQObject());
+    foreach (QUmlClass *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->superClasses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -509,55 +512,55 @@ const QSet<QObject *> QUmlStateMachineObject::superClasses() const
 
 QObject *QUmlStateMachineObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlStateMachine *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStateMachine *>(this)->context()->asQModelingObject();
 }
 
 bool QUmlStateMachineObject::isReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->isReentrant();
+    return qmodelingelementproperty_cast<QUmlStateMachine *>(this)->isReentrant();
 }
 
 const QList<QObject *> QUmlStateMachineObject::ownedParameters() const
 {
     QList<QObject *> list;
-    foreach (QUmlParameter *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->ownedParameters())
-        list.append(element->asQObject());
+    foreach (QUmlParameter *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->ownedParameters())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QSet<QObject *> QUmlStateMachineObject::ownedParameterSets() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterSet *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->ownedParameterSets())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterSet *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->ownedParameterSets())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStateMachineObject::postconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->postconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->postconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStateMachineObject::preconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->preconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->preconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlStateMachineObject::specification() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->specification())
+    if (!qmodelingelementproperty_cast<QUmlStateMachine *>(this)->specification())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->specification()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStateMachine *>(this)->specification()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [StateMachine]
@@ -565,32 +568,32 @@ QObject *QUmlStateMachineObject::specification() const
 const QSet<QObject *> QUmlStateMachineObject::connectionPoints() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPseudostate *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->connectionPoints())
-        set.insert(element->asQObject());
+    foreach (QUmlPseudostate *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->connectionPoints())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStateMachineObject::extendedStateMachines() const
 {
     QSet<QObject *> set;
-    foreach (QUmlStateMachine *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->extendedStateMachines())
-        set.insert(element->asQObject());
+    foreach (QUmlStateMachine *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->extendedStateMachines())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStateMachineObject::regions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRegion *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->regions())
-        set.insert(element->asQObject());
+    foreach (QUmlRegion *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->regions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStateMachineObject::submachineStates() const
 {
     QSet<QObject *> set;
-    foreach (QUmlState *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->submachineStates())
-        set.insert(element->asQObject());
+    foreach (QUmlState *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->submachineStates())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -599,14 +602,14 @@ const QSet<QObject *> QUmlStateMachineObject::submachineStates() const
 QSet<QObject *> QUmlStateMachineObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlStateMachineObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlStateMachine *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -614,27 +617,27 @@ bool QUmlStateMachineObject::mustBeOwned() const
 QList<QObject *> QUmlStateMachineObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlStateMachineObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlStateMachineObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlStateMachine *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlStateMachineObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlStateMachine *>(this)->separator();
 }
 
 // OPERATIONS [Namespace]
@@ -643,44 +646,44 @@ QSet<QObject *> QUmlStateMachineObject::excludeCollisions(QSet<QObject *> imps)
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlStateMachineObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlStateMachine *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlStateMachineObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlStateMachineObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlStateMachine *>(this)->membersAreDistinguishable();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlStateMachineObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlStateMachine *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlStateMachineObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlStateMachine *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [Type]
@@ -690,8 +693,8 @@ bool QUmlStateMachineObject::isTemplateParameter() const
 QSet<QObject *> QUmlStateMachineObject::parameterableElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterableElement *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->parameterableElements())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterableElement *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->parameterableElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -700,52 +703,52 @@ QSet<QObject *> QUmlStateMachineObject::parameterableElements() const
 QSet<QObject *> QUmlStateMachineObject::allFeatures() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->allFeatures())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->allFeatures())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlStateMachineObject::allParents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->allParents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->allParents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlStateMachineObject::conformsTo(QObject *other) const
 {
-    return qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->conformsTo(qmodelingobjectproperty_cast<QUmlClassifier *>(other));
+    return qmodelingelementproperty_cast<QUmlStateMachine *>(this)->conformsTo(qmodelingelementproperty_cast<QUmlClassifier *>(other));
 }
 
 bool QUmlStateMachineObject::hasVisibilityOf(QObject *n) const
 {
-    return qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->hasVisibilityOf(qmodelingobjectproperty_cast<QUmlNamedElement *>(n));
+    return qmodelingelementproperty_cast<QUmlStateMachine *>(this)->hasVisibilityOf(qmodelingelementproperty_cast<QUmlNamedElement *>(n));
 }
 
 QSet<QObject *> QUmlStateMachineObject::inheritableMembers(QObject *c) const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->inheritableMembers(qmodelingobjectproperty_cast<QUmlClassifier *>(c)))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->inheritableMembers(qmodelingelementproperty_cast<QUmlClassifier *>(c)))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlStateMachineObject::isTemplate() const
 {
-    return qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->isTemplate();
+    return qmodelingelementproperty_cast<QUmlStateMachine *>(this)->isTemplate();
 }
 
 bool QUmlStateMachineObject::maySpecializeType(QObject *c) const
 {
-    return qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->maySpecializeType(qmodelingobjectproperty_cast<QUmlClassifier *>(c));
+    return qmodelingelementproperty_cast<QUmlStateMachine *>(this)->maySpecializeType(qmodelingelementproperty_cast<QUmlClassifier *>(c));
 }
 
 QSet<QObject *> QUmlStateMachineObject::parents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->parents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->parents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -755,10 +758,10 @@ QSet<QObject *> QUmlStateMachineObject::inherit(QSet<QObject *> inhs) const
 {
     QSet<QUmlNamedElement *> inhsConverted;
     foreach (QObject *object, inhs)
-        inhsConverted.insert(qmodelingobjectproperty_cast<QUmlNamedElement *>(object));
+        inhsConverted.insert(qmodelingelementproperty_cast<QUmlNamedElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->inherit(inhsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlStateMachine *>(this)->inherit(inhsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -766,598 +769,745 @@ QSet<QObject *> QUmlStateMachineObject::inherit(QSet<QObject *> inhs) const
 
 QObject *QUmlStateMachineObject::LCA(QObject *s1, QObject *s2) const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->LCA(qmodelingobjectproperty_cast<QUmlState *>(s1), qmodelingobjectproperty_cast<QUmlState *>(s2)))
+    if (!qmodelingelementproperty_cast<QUmlStateMachine *>(this)->LCA(qmodelingelementproperty_cast<QUmlState *>(s1), qmodelingelementproperty_cast<QUmlState *>(s2)))
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->LCA(qmodelingobjectproperty_cast<QUmlState *>(s1), qmodelingobjectproperty_cast<QUmlState *>(s2))->asQObject();
+        return qmodelingelementproperty_cast<QUmlStateMachine *>(this)->LCA(qmodelingelementproperty_cast<QUmlState *>(s1), qmodelingelementproperty_cast<QUmlState *>(s2))->asQModelingObject();
 }
 
 bool QUmlStateMachineObject::ancestor(QObject *s1, QObject *s2) const
 {
-    return qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->ancestor(qmodelingobjectproperty_cast<QUmlState *>(s1), qmodelingobjectproperty_cast<QUmlState *>(s2));
+    return qmodelingelementproperty_cast<QUmlStateMachine *>(this)->ancestor(qmodelingelementproperty_cast<QUmlState *>(s1), qmodelingelementproperty_cast<QUmlState *>(s2));
 }
 
 bool QUmlStateMachineObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlStateMachine *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlStateMachineObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlStateMachine *>(redefined));
+    return qmodelingelementproperty_cast<QUmlStateMachine *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlStateMachine *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlStateMachineObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlStateMachineObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlStateMachineObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlStateMachineObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlStateMachineObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlStateMachineObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlStateMachineObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlStateMachineObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->setName(name);
 }
 
 void QUmlStateMachineObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlStateMachineObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlStateMachineObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlStateMachineObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlStateMachineObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlStateMachineObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlStateMachineObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlStateMachineObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlStateMachineObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlStateMachineObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlStateMachineObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlStateMachineObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlStateMachineObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlStateMachineObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlStateMachineObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlStateMachineObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlStateMachineObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->setVisibility(visibility);
 }
 
 void QUmlStateMachineObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Type]
 
 void QUmlStateMachineObject::setPackage(QObject *package)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->setPackage(qmodelingobjectproperty_cast<QUmlPackage *>(package));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->setPackage(qmodelingelementproperty_cast<QUmlPackage *>(package));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlStateMachineObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlStateMachineObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlStateMachineObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlStateMachineObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlStateMachineObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlStateMachineObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateableElement]
 
 void QUmlStateMachineObject::addTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 void QUmlStateMachineObject::removeTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removeTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removeTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Classifier]
 
 void QUmlStateMachineObject::addAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlStateMachineObject::removeAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removeAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removeAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlStateMachineObject::addCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlStateMachineObject::removeCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removeCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removeCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlStateMachineObject::addFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlStateMachineObject::removeFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removeFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removeFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlStateMachineObject::addGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlStateMachineObject::removeGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removeGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removeGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlStateMachineObject::addInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlStateMachineObject::removeInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removeInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removeInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlStateMachineObject::setFinalSpecialization(bool isFinalSpecialization)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->setFinalSpecialization(isFinalSpecialization);
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->setFinalSpecialization(isFinalSpecialization);
 }
 
 void QUmlStateMachineObject::unsetFinalSpecialization()
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("finalSpecialization"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
 void QUmlStateMachineObject::setOwnedTemplateSignature(QObject *ownedTemplateSignature)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->setOwnedTemplateSignature(qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->setOwnedTemplateSignature(qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
 }
 
 void QUmlStateMachineObject::addOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlStateMachineObject::removeOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removeOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removeOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlStateMachineObject::addPowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addPowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addPowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlStateMachineObject::removePowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removePowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removePowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlStateMachineObject::addRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlStateMachineObject::removeRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removeRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removeRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlStateMachineObject::setRepresentation(QObject *representation)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->setRepresentation(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(representation));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->setRepresentation(qmodelingelementproperty_cast<QUmlCollaborationUse *>(representation));
 }
 
 void QUmlStateMachineObject::addSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlStateMachineObject::removeSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removeSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removeSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlStateMachineObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
 }
 
 void QUmlStateMachineObject::addUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 void QUmlStateMachineObject::removeUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removeUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removeUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [StructuredClassifier]
 
 void QUmlStateMachineObject::addOwnedConnector(QObject *ownedConnector)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addOwnedConnector(qmodelingobjectproperty_cast<QUmlConnector *>(ownedConnector));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addOwnedConnector(qmodelingelementproperty_cast<QUmlConnector *>(ownedConnector));
 }
 
 void QUmlStateMachineObject::removeOwnedConnector(QObject *ownedConnector)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removeOwnedConnector(qmodelingobjectproperty_cast<QUmlConnector *>(ownedConnector));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removeOwnedConnector(qmodelingelementproperty_cast<QUmlConnector *>(ownedConnector));
 }
 
 void QUmlStateMachineObject::addPart(QObject *part)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addPart(qmodelingobjectproperty_cast<QUmlProperty *>(part));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addPart(qmodelingelementproperty_cast<QUmlProperty *>(part));
 }
 
 void QUmlStateMachineObject::removePart(QObject *part)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removePart(qmodelingobjectproperty_cast<QUmlProperty *>(part));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removePart(qmodelingelementproperty_cast<QUmlProperty *>(part));
 }
 
 void QUmlStateMachineObject::addRole(QObject *role)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addRole(qmodelingobjectproperty_cast<QUmlConnectableElement *>(role));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addRole(qmodelingelementproperty_cast<QUmlConnectableElement *>(role));
 }
 
 void QUmlStateMachineObject::removeRole(QObject *role)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removeRole(qmodelingobjectproperty_cast<QUmlConnectableElement *>(role));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removeRole(qmodelingelementproperty_cast<QUmlConnectableElement *>(role));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [EncapsulatedClassifier]
 
 void QUmlStateMachineObject::addOwnedPort(QObject *ownedPort)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addOwnedPort(qmodelingobjectproperty_cast<QUmlPort *>(ownedPort));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addOwnedPort(qmodelingelementproperty_cast<QUmlPort *>(ownedPort));
 }
 
 void QUmlStateMachineObject::removeOwnedPort(QObject *ownedPort)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removeOwnedPort(qmodelingobjectproperty_cast<QUmlPort *>(ownedPort));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removeOwnedPort(qmodelingelementproperty_cast<QUmlPort *>(ownedPort));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [BehavioredClassifier]
 
 void QUmlStateMachineObject::setClassifierBehavior(QObject *classifierBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->setClassifierBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(classifierBehavior));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->setClassifierBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(classifierBehavior));
 }
 
 void QUmlStateMachineObject::addInterfaceRealization(QObject *interfaceRealization)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addInterfaceRealization(qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addInterfaceRealization(qmodelingelementproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
 }
 
 void QUmlStateMachineObject::removeInterfaceRealization(QObject *interfaceRealization)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removeInterfaceRealization(qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removeInterfaceRealization(qmodelingelementproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
 }
 
 void QUmlStateMachineObject::addOwnedBehavior(QObject *ownedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addOwnedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(ownedBehavior));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addOwnedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(ownedBehavior));
 }
 
 void QUmlStateMachineObject::removeOwnedBehavior(QObject *ownedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removeOwnedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(ownedBehavior));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removeOwnedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(ownedBehavior));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Class]
 
 void QUmlStateMachineObject::addExtension(QObject *extension)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addExtension(qmodelingobjectproperty_cast<QUmlExtension *>(extension));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addExtension(qmodelingelementproperty_cast<QUmlExtension *>(extension));
 }
 
 void QUmlStateMachineObject::removeExtension(QObject *extension)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removeExtension(qmodelingobjectproperty_cast<QUmlExtension *>(extension));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removeExtension(qmodelingelementproperty_cast<QUmlExtension *>(extension));
 }
 
 void QUmlStateMachineObject::setAbstract(bool isAbstract)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->setAbstract(isAbstract);
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->setAbstract(isAbstract);
 }
 
 void QUmlStateMachineObject::unsetAbstract()
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("abstract"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
 void QUmlStateMachineObject::setActive(bool isActive)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->setActive(isActive);
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->setActive(isActive);
 }
 
 void QUmlStateMachineObject::unsetActive()
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("active"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("active"));
 }
 
 void QUmlStateMachineObject::addNestedClassifier(QObject *nestedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addNestedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(nestedClassifier));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addNestedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(nestedClassifier));
 }
 
 void QUmlStateMachineObject::removeNestedClassifier(QObject *nestedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removeNestedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(nestedClassifier));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removeNestedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(nestedClassifier));
 }
 
 void QUmlStateMachineObject::addOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlStateMachineObject::removeOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removeOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removeOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlStateMachineObject::addOwnedOperation(QObject *ownedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addOwnedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(ownedOperation));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addOwnedOperation(qmodelingelementproperty_cast<QUmlOperation *>(ownedOperation));
 }
 
 void QUmlStateMachineObject::removeOwnedOperation(QObject *ownedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removeOwnedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(ownedOperation));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removeOwnedOperation(qmodelingelementproperty_cast<QUmlOperation *>(ownedOperation));
 }
 
 void QUmlStateMachineObject::addOwnedReception(QObject *ownedReception)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addOwnedReception(qmodelingobjectproperty_cast<QUmlReception *>(ownedReception));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addOwnedReception(qmodelingelementproperty_cast<QUmlReception *>(ownedReception));
 }
 
 void QUmlStateMachineObject::removeOwnedReception(QObject *ownedReception)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removeOwnedReception(qmodelingobjectproperty_cast<QUmlReception *>(ownedReception));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removeOwnedReception(qmodelingelementproperty_cast<QUmlReception *>(ownedReception));
 }
 
 void QUmlStateMachineObject::addSuperClass(QObject *superClass)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addSuperClass(qmodelingobjectproperty_cast<QUmlClass *>(superClass));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addSuperClass(qmodelingelementproperty_cast<QUmlClass *>(superClass));
 }
 
 void QUmlStateMachineObject::removeSuperClass(QObject *superClass)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removeSuperClass(qmodelingobjectproperty_cast<QUmlClass *>(superClass));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removeSuperClass(qmodelingelementproperty_cast<QUmlClass *>(superClass));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Behavior]
 
 void QUmlStateMachineObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->setContext(qmodelingobjectproperty_cast<QUmlBehavioredClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->setContext(qmodelingelementproperty_cast<QUmlBehavioredClassifier *>(context));
 }
 
 void QUmlStateMachineObject::setReentrant(bool isReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->setReentrant(isReentrant);
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->setReentrant(isReentrant);
 }
 
 void QUmlStateMachineObject::unsetReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("reentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("reentrant"));
 }
 
 void QUmlStateMachineObject::addOwnedParameter(QObject *ownedParameter)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addOwnedParameter(qmodelingobjectproperty_cast<QUmlParameter *>(ownedParameter));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addOwnedParameter(qmodelingelementproperty_cast<QUmlParameter *>(ownedParameter));
 }
 
 void QUmlStateMachineObject::removeOwnedParameter(QObject *ownedParameter)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removeOwnedParameter(qmodelingobjectproperty_cast<QUmlParameter *>(ownedParameter));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removeOwnedParameter(qmodelingelementproperty_cast<QUmlParameter *>(ownedParameter));
 }
 
 void QUmlStateMachineObject::addOwnedParameterSet(QObject *ownedParameterSet)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addOwnedParameterSet(qmodelingobjectproperty_cast<QUmlParameterSet *>(ownedParameterSet));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addOwnedParameterSet(qmodelingelementproperty_cast<QUmlParameterSet *>(ownedParameterSet));
 }
 
 void QUmlStateMachineObject::removeOwnedParameterSet(QObject *ownedParameterSet)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removeOwnedParameterSet(qmodelingobjectproperty_cast<QUmlParameterSet *>(ownedParameterSet));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removeOwnedParameterSet(qmodelingelementproperty_cast<QUmlParameterSet *>(ownedParameterSet));
 }
 
 void QUmlStateMachineObject::addPostcondition(QObject *postcondition)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(postcondition));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(postcondition));
 }
 
 void QUmlStateMachineObject::removePostcondition(QObject *postcondition)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removePostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(postcondition));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removePostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(postcondition));
 }
 
 void QUmlStateMachineObject::addPrecondition(QObject *precondition)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(precondition));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(precondition));
 }
 
 void QUmlStateMachineObject::removePrecondition(QObject *precondition)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removePrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(precondition));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removePrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(precondition));
 }
 
 void QUmlStateMachineObject::setSpecification(QObject *specification)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->setSpecification(qmodelingobjectproperty_cast<QUmlBehavioralFeature *>(specification));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->setSpecification(qmodelingelementproperty_cast<QUmlBehavioralFeature *>(specification));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [StateMachine]
 
 void QUmlStateMachineObject::addConnectionPoint(QObject *connectionPoint)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addConnectionPoint(qmodelingobjectproperty_cast<QUmlPseudostate *>(connectionPoint));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addConnectionPoint(qmodelingelementproperty_cast<QUmlPseudostate *>(connectionPoint));
 }
 
 void QUmlStateMachineObject::removeConnectionPoint(QObject *connectionPoint)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removeConnectionPoint(qmodelingobjectproperty_cast<QUmlPseudostate *>(connectionPoint));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removeConnectionPoint(qmodelingelementproperty_cast<QUmlPseudostate *>(connectionPoint));
 }
 
 void QUmlStateMachineObject::addExtendedStateMachine(QObject *extendedStateMachine)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addExtendedStateMachine(qmodelingobjectproperty_cast<QUmlStateMachine *>(extendedStateMachine));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addExtendedStateMachine(qmodelingelementproperty_cast<QUmlStateMachine *>(extendedStateMachine));
 }
 
 void QUmlStateMachineObject::removeExtendedStateMachine(QObject *extendedStateMachine)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removeExtendedStateMachine(qmodelingobjectproperty_cast<QUmlStateMachine *>(extendedStateMachine));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removeExtendedStateMachine(qmodelingelementproperty_cast<QUmlStateMachine *>(extendedStateMachine));
 }
 
 void QUmlStateMachineObject::addRegion(QObject *region)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addRegion(qmodelingobjectproperty_cast<QUmlRegion *>(region));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addRegion(qmodelingelementproperty_cast<QUmlRegion *>(region));
 }
 
 void QUmlStateMachineObject::removeRegion(QObject *region)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removeRegion(qmodelingobjectproperty_cast<QUmlRegion *>(region));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removeRegion(qmodelingelementproperty_cast<QUmlRegion *>(region));
 }
 
 void QUmlStateMachineObject::addSubmachineState(QObject *submachineState)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->addSubmachineState(qmodelingobjectproperty_cast<QUmlState *>(submachineState));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->addSubmachineState(qmodelingelementproperty_cast<QUmlState *>(submachineState));
 }
 
 void QUmlStateMachineObject::removeSubmachineState(QObject *submachineState)
 {
-    qmodelingobjectproperty_cast<QUmlStateMachine *>(this)->removeSubmachineState(qmodelingobjectproperty_cast<QUmlState *>(submachineState));
+    qmodelingelementproperty_cast<QUmlStateMachine *>(this)->removeSubmachineState(qmodelingelementproperty_cast<QUmlState *>(submachineState));
+}
+
+
+void QUmlStateMachineObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlType");
+    d->groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
+
+    d->propertyGroups << QStringLiteral("QUmlStructuredClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedConnectors"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parts"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("roles"))));
+
+    d->propertyGroups << QStringLiteral("QUmlEncapsulatedClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlEncapsulatedClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedPorts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlBehavioredClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifierBehavior"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interfaceRealizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedBehaviors"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClass");
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extensions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isActive"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedReceptions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superClasses"))));
+
+    d->propertyGroups << QStringLiteral("QUmlBehavior");
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameters"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameterSets"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("postconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("preconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("specification"))));
+
+    d->propertyGroups << QStringLiteral("QUmlStateMachine");
+    d->groupProperties.insert(QStringLiteral("QUmlStateMachine"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("connectionPoints"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStateMachine"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extendedStateMachines"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStateMachine"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("regions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStateMachine"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("submachineStates"))));
+}
+
+void QUmlStateMachineObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateMachine, connectionPoints, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateMachine, connectionPoints, PropertyClassRole, QStringLiteral("QUmlStateMachine"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateMachine, connectionPoints, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateMachine, connectionPoints, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateMachine, connectionPoints, DocumentationRole, QStringLiteral("The connection points defined for this state machine. They represent the interface of the state machine when used as part of submachine state."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateMachine, connectionPoints, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateMachine, connectionPoints, SubsettedPropertiesRole, QStringLiteral("Namespace-ownedMember"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateMachine, connectionPoints, OppositeEndRole, QStringLiteral("Pseudostate-stateMachine"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateMachine, extendedStateMachines, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateMachine, extendedStateMachines, PropertyClassRole, QStringLiteral("QUmlStateMachine"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateMachine, extendedStateMachines, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateMachine, extendedStateMachines, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateMachine, extendedStateMachines, DocumentationRole, QStringLiteral("The state machines of which this is an extension."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateMachine, extendedStateMachines, RedefinedPropertiesRole, QStringLiteral("Behavior-redefinedBehavior"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateMachine, extendedStateMachines, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateMachine, extendedStateMachines, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateMachine, regions, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateMachine, regions, PropertyClassRole, QStringLiteral("QUmlStateMachine"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateMachine, regions, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateMachine, regions, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateMachine, regions, DocumentationRole, QStringLiteral("The regions owned directly by the state machine."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateMachine, regions, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateMachine, regions, SubsettedPropertiesRole, QStringLiteral("Namespace-ownedMember"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateMachine, regions, OppositeEndRole, QStringLiteral("Region-stateMachine"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateMachine, submachineStates, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateMachine, submachineStates, PropertyClassRole, QStringLiteral("QUmlStateMachine"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateMachine, submachineStates, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateMachine, submachineStates, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateMachine, submachineStates, DocumentationRole, QStringLiteral("References the submachine(s) in case of a submachine state. Multiple machines are referenced in case of a concurrent state."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateMachine, submachineStates, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateMachine, submachineStates, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStateMachine, submachineStates, OppositeEndRole, QStringLiteral("State-submachine"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlstatemachineobject_p.h b/src/uml/qobjects/qumlstatemachineobject_p.h
index 04a04987..36cc81e8 100644
--- a/src/uml/qobjects/qumlstatemachineobject_p.h
+++ b/src/uml/qobjects/qumlstatemachineobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlStateMachine;
-class Q_UML_EXPORT QUmlStateMachineObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlStateMachineObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlStateMachineObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -150,7 +153,7 @@ class Q_UML_EXPORT QUmlStateMachineObject : public QObject
     Q_PROPERTY(QSet<QObject *> submachineStates READ submachineStates)
 
 public:
-    Q_INVOKABLE explicit QUmlStateMachineObject(QUmlStateMachine *qModelingObject);
+    Q_INVOKABLE explicit QUmlStateMachineObject(QUmlStateMachine *qModelingElement);
     virtual ~QUmlStateMachineObject();
 
     // Owned attributes [Element]
@@ -430,6 +433,10 @@ public Q_SLOTS:
     void removeRegion(QObject *region);
     void addSubmachineState(QObject *submachineState);
     void removeSubmachineState(QObject *submachineState);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlstateobject.cpp b/src/uml/qobjects/qumlstateobject.cpp
index 9c168325..78f308a1 100644
--- a/src/uml/qobjects/qumlstateobject.cpp
+++ b/src/uml/qobjects/qumlstateobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlstateobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlState>
 #include <QtUml/QUmlBehavior>
@@ -64,16 +65,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlStateObject::QUmlStateObject(QUmlState *qModelingObject)
+QUmlStateObject::QUmlStateObject(QUmlState *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlStateObject::~QUmlStateObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlState *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlState *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -82,25 +85,25 @@ QUmlStateObject::~QUmlStateObject()
 const QSet<QObject *> QUmlStateObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlState *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlState *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStateObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlState *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlState *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlStateObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlState *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlState *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlState *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlState *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -108,40 +111,40 @@ QObject *QUmlStateObject::owner() const
 const QSet<QObject *> QUmlStateObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlState *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlState *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlStateObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlState *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlState *>(this)->name();
 }
 
 QObject *QUmlStateObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlState *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlState *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlState *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlState *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlStateObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlState *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlState *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlState *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlState *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlStateObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlState *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlState *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlStateObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlState *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlState *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Namespace]
@@ -149,48 +152,48 @@ QtUml::VisibilityKind QUmlStateObject::visibility() const
 const QSet<QObject *> QUmlStateObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlState *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlState *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStateObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlState *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlState *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStateObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlState *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlState *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStateObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlState *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlState *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStateObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlState *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlState *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStateObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlState *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlState *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -198,14 +201,14 @@ const QSet<QObject *> QUmlStateObject::packageImports() const
 
 bool QUmlStateObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlState *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlState *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlStateObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlState *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlState *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -213,25 +216,25 @@ const QSet<QObject *> QUmlStateObject::redefinedElements() const
 
 QObject *QUmlStateObject::container() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlState *>(this)->container())
+    if (!qmodelingelementproperty_cast<QUmlState *>(this)->container())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlState *>(this)->container()->asQObject();
+        return qmodelingelementproperty_cast<QUmlState *>(this)->container()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlStateObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTransition *element, qmodelingobjectproperty_cast<QUmlState *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlTransition *element, qmodelingelementproperty_cast<QUmlState *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStateObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTransition *element, qmodelingobjectproperty_cast<QUmlState *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlTransition *element, qmodelingelementproperty_cast<QUmlState *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -240,109 +243,109 @@ const QSet<QObject *> QUmlStateObject::outgoings() const
 const QSet<QObject *> QUmlStateObject::connections() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConnectionPointReference *element, qmodelingobjectproperty_cast<QUmlState *>(this)->connections())
-        set.insert(element->asQObject());
+    foreach (QUmlConnectionPointReference *element, qmodelingelementproperty_cast<QUmlState *>(this)->connections())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStateObject::connectionPoints() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPseudostate *element, qmodelingobjectproperty_cast<QUmlState *>(this)->connectionPoints())
-        set.insert(element->asQObject());
+    foreach (QUmlPseudostate *element, qmodelingelementproperty_cast<QUmlState *>(this)->connectionPoints())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStateObject::deferrableTriggers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTrigger *element, qmodelingobjectproperty_cast<QUmlState *>(this)->deferrableTriggers())
-        set.insert(element->asQObject());
+    foreach (QUmlTrigger *element, qmodelingelementproperty_cast<QUmlState *>(this)->deferrableTriggers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlStateObject::doActivity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlState *>(this)->doActivity())
+    if (!qmodelingelementproperty_cast<QUmlState *>(this)->doActivity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlState *>(this)->doActivity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlState *>(this)->doActivity()->asQModelingObject();
 }
 
 QObject *QUmlStateObject::entry() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlState *>(this)->entry())
+    if (!qmodelingelementproperty_cast<QUmlState *>(this)->entry())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlState *>(this)->entry()->asQObject();
+        return qmodelingelementproperty_cast<QUmlState *>(this)->entry()->asQModelingObject();
 }
 
 QObject *QUmlStateObject::exit() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlState *>(this)->exit())
+    if (!qmodelingelementproperty_cast<QUmlState *>(this)->exit())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlState *>(this)->exit()->asQObject();
+        return qmodelingelementproperty_cast<QUmlState *>(this)->exit()->asQModelingObject();
 }
 
 bool QUmlStateObject::isComposite() const
 {
-    return qmodelingobjectproperty_cast<QUmlState *>(this)->isComposite();
+    return qmodelingelementproperty_cast<QUmlState *>(this)->isComposite();
 }
 
 bool QUmlStateObject::isOrthogonal() const
 {
-    return qmodelingobjectproperty_cast<QUmlState *>(this)->isOrthogonal();
+    return qmodelingelementproperty_cast<QUmlState *>(this)->isOrthogonal();
 }
 
 bool QUmlStateObject::isSimple() const
 {
-    return qmodelingobjectproperty_cast<QUmlState *>(this)->isSimple();
+    return qmodelingelementproperty_cast<QUmlState *>(this)->isSimple();
 }
 
 bool QUmlStateObject::isSubmachineState() const
 {
-    return qmodelingobjectproperty_cast<QUmlState *>(this)->isSubmachineState();
+    return qmodelingelementproperty_cast<QUmlState *>(this)->isSubmachineState();
 }
 
 QObject *QUmlStateObject::redefinedState() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlState *>(this)->redefinedState())
+    if (!qmodelingelementproperty_cast<QUmlState *>(this)->redefinedState())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlState *>(this)->redefinedState()->asQObject();
+        return qmodelingelementproperty_cast<QUmlState *>(this)->redefinedState()->asQModelingObject();
 }
 
 QObject *QUmlStateObject::redefinitionContext() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlState *>(this)->redefinitionContext())
+    if (!qmodelingelementproperty_cast<QUmlState *>(this)->redefinitionContext())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlState *>(this)->redefinitionContext()->asQObject();
+        return qmodelingelementproperty_cast<QUmlState *>(this)->redefinitionContext()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlStateObject::regions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRegion *element, qmodelingobjectproperty_cast<QUmlState *>(this)->regions())
-        set.insert(element->asQObject());
+    foreach (QUmlRegion *element, qmodelingelementproperty_cast<QUmlState *>(this)->regions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlStateObject::stateInvariant() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlState *>(this)->stateInvariant())
+    if (!qmodelingelementproperty_cast<QUmlState *>(this)->stateInvariant())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlState *>(this)->stateInvariant()->asQObject();
+        return qmodelingelementproperty_cast<QUmlState *>(this)->stateInvariant()->asQModelingObject();
 }
 
 QObject *QUmlStateObject::submachine() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlState *>(this)->submachine())
+    if (!qmodelingelementproperty_cast<QUmlState *>(this)->submachine())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlState *>(this)->submachine()->asQObject();
+        return qmodelingelementproperty_cast<QUmlState *>(this)->submachine()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -350,14 +353,14 @@ QObject *QUmlStateObject::submachine() const
 QSet<QObject *> QUmlStateObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlState *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlState *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlStateObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlState *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlState *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -365,27 +368,27 @@ bool QUmlStateObject::mustBeOwned() const
 QList<QObject *> QUmlStateObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlState *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlState *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlStateObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlState *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlState *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlStateObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlState *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlState *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlStateObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlState *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlState *>(this)->separator();
 }
 
 // OPERATIONS [Namespace]
@@ -394,32 +397,32 @@ QSet<QObject *> QUmlStateObject::excludeCollisions(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlState *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlState *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlStateObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlState *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlState *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlStateObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlState *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlState *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlStateObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlState *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlState *>(this)->membersAreDistinguishable();
 }
 
 // OPERATIONS [RedefinableElement]
@@ -428,311 +431,512 @@ bool QUmlStateObject::membersAreDistinguishable() const
 
 QObject *QUmlStateObject::containingStateMachine() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlState *>(this)->containingStateMachine())
+    if (!qmodelingelementproperty_cast<QUmlState *>(this)->containingStateMachine())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlState *>(this)->containingStateMachine()->asQObject();
+        return qmodelingelementproperty_cast<QUmlState *>(this)->containingStateMachine()->asQModelingObject();
 }
 
 bool QUmlStateObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlState *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlState *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlStateObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlState *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlState *>(redefined));
+    return qmodelingelementproperty_cast<QUmlState *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlState *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlStateObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlState *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlStateObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlState *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlStateObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlState *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlStateObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlState *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlStateObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlState *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlStateObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlState *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlStateObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlState *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlStateObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlState *>(this)->setName(name);
 }
 
 void QUmlStateObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlState *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlStateObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlState *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlStateObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlState *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlStateObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlState *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlStateObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlState *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlStateObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlState *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlStateObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlState *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlStateObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlState *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlStateObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlState *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlStateObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlState *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlStateObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlState *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlStateObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlState *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlStateObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlState *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlStateObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlState *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlStateObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlState *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlStateObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlState *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlStateObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlState *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlStateObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlStateObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlState *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlStateObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlState *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 // SLOTS FOR OWNED ATTRIBUTES [Vertex]
 
 void QUmlStateObject::setContainer(QObject *container)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->setContainer(qmodelingobjectproperty_cast<QUmlRegion *>(container));
+    qmodelingelementproperty_cast<QUmlState *>(this)->setContainer(qmodelingelementproperty_cast<QUmlRegion *>(container));
 }
 
 void QUmlStateObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlTransition *>(incoming));
+    qmodelingelementproperty_cast<QUmlState *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlTransition *>(incoming));
 }
 
 void QUmlStateObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlTransition *>(incoming));
+    qmodelingelementproperty_cast<QUmlState *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlTransition *>(incoming));
 }
 
 void QUmlStateObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlTransition *>(outgoing));
+    qmodelingelementproperty_cast<QUmlState *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlTransition *>(outgoing));
 }
 
 void QUmlStateObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlTransition *>(outgoing));
+    qmodelingelementproperty_cast<QUmlState *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlTransition *>(outgoing));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [State]
 
 void QUmlStateObject::addConnection(QObject *connection)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->addConnection(qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(connection));
+    qmodelingelementproperty_cast<QUmlState *>(this)->addConnection(qmodelingelementproperty_cast<QUmlConnectionPointReference *>(connection));
 }
 
 void QUmlStateObject::removeConnection(QObject *connection)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->removeConnection(qmodelingobjectproperty_cast<QUmlConnectionPointReference *>(connection));
+    qmodelingelementproperty_cast<QUmlState *>(this)->removeConnection(qmodelingelementproperty_cast<QUmlConnectionPointReference *>(connection));
 }
 
 void QUmlStateObject::addConnectionPoint(QObject *connectionPoint)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->addConnectionPoint(qmodelingobjectproperty_cast<QUmlPseudostate *>(connectionPoint));
+    qmodelingelementproperty_cast<QUmlState *>(this)->addConnectionPoint(qmodelingelementproperty_cast<QUmlPseudostate *>(connectionPoint));
 }
 
 void QUmlStateObject::removeConnectionPoint(QObject *connectionPoint)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->removeConnectionPoint(qmodelingobjectproperty_cast<QUmlPseudostate *>(connectionPoint));
+    qmodelingelementproperty_cast<QUmlState *>(this)->removeConnectionPoint(qmodelingelementproperty_cast<QUmlPseudostate *>(connectionPoint));
 }
 
 void QUmlStateObject::addDeferrableTrigger(QObject *deferrableTrigger)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->addDeferrableTrigger(qmodelingobjectproperty_cast<QUmlTrigger *>(deferrableTrigger));
+    qmodelingelementproperty_cast<QUmlState *>(this)->addDeferrableTrigger(qmodelingelementproperty_cast<QUmlTrigger *>(deferrableTrigger));
 }
 
 void QUmlStateObject::removeDeferrableTrigger(QObject *deferrableTrigger)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->removeDeferrableTrigger(qmodelingobjectproperty_cast<QUmlTrigger *>(deferrableTrigger));
+    qmodelingelementproperty_cast<QUmlState *>(this)->removeDeferrableTrigger(qmodelingelementproperty_cast<QUmlTrigger *>(deferrableTrigger));
 }
 
 void QUmlStateObject::setDoActivity(QObject *doActivity)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->setDoActivity(qmodelingobjectproperty_cast<QUmlBehavior *>(doActivity));
+    qmodelingelementproperty_cast<QUmlState *>(this)->setDoActivity(qmodelingelementproperty_cast<QUmlBehavior *>(doActivity));
 }
 
 void QUmlStateObject::setEntry(QObject *entry)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->setEntry(qmodelingobjectproperty_cast<QUmlBehavior *>(entry));
+    qmodelingelementproperty_cast<QUmlState *>(this)->setEntry(qmodelingelementproperty_cast<QUmlBehavior *>(entry));
 }
 
 void QUmlStateObject::setExit(QObject *exit)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->setExit(qmodelingobjectproperty_cast<QUmlBehavior *>(exit));
+    qmodelingelementproperty_cast<QUmlState *>(this)->setExit(qmodelingelementproperty_cast<QUmlBehavior *>(exit));
 }
 
 void QUmlStateObject::setComposite(bool isComposite)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->setComposite(isComposite);
+    qmodelingelementproperty_cast<QUmlState *>(this)->setComposite(isComposite);
 }
 
 void QUmlStateObject::unsetComposite()
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("composite"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("composite"));
 }
 
 void QUmlStateObject::setOrthogonal(bool isOrthogonal)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->setOrthogonal(isOrthogonal);
+    qmodelingelementproperty_cast<QUmlState *>(this)->setOrthogonal(isOrthogonal);
 }
 
 void QUmlStateObject::unsetOrthogonal()
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("orthogonal"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("orthogonal"));
 }
 
 void QUmlStateObject::setSimple(bool isSimple)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->setSimple(isSimple);
+    qmodelingelementproperty_cast<QUmlState *>(this)->setSimple(isSimple);
 }
 
 void QUmlStateObject::unsetSimple()
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("simple"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("simple"));
 }
 
 void QUmlStateObject::setSubmachineState(bool isSubmachineState)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->setSubmachineState(isSubmachineState);
+    qmodelingelementproperty_cast<QUmlState *>(this)->setSubmachineState(isSubmachineState);
 }
 
 void QUmlStateObject::unsetSubmachineState()
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("submachineState"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("submachineState"));
 }
 
 void QUmlStateObject::setRedefinedState(QObject *redefinedState)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->setRedefinedState(qmodelingobjectproperty_cast<QUmlState *>(redefinedState));
+    qmodelingelementproperty_cast<QUmlState *>(this)->setRedefinedState(qmodelingelementproperty_cast<QUmlState *>(redefinedState));
 }
 
 void QUmlStateObject::setRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->setRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlState *>(this)->setRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlStateObject::addRegion(QObject *region)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->addRegion(qmodelingobjectproperty_cast<QUmlRegion *>(region));
+    qmodelingelementproperty_cast<QUmlState *>(this)->addRegion(qmodelingelementproperty_cast<QUmlRegion *>(region));
 }
 
 void QUmlStateObject::removeRegion(QObject *region)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->removeRegion(qmodelingobjectproperty_cast<QUmlRegion *>(region));
+    qmodelingelementproperty_cast<QUmlState *>(this)->removeRegion(qmodelingelementproperty_cast<QUmlRegion *>(region));
 }
 
 void QUmlStateObject::setStateInvariant(QObject *stateInvariant)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->setStateInvariant(qmodelingobjectproperty_cast<QUmlConstraint *>(stateInvariant));
+    qmodelingelementproperty_cast<QUmlState *>(this)->setStateInvariant(qmodelingelementproperty_cast<QUmlConstraint *>(stateInvariant));
 }
 
 void QUmlStateObject::setSubmachine(QObject *submachine)
 {
-    qmodelingobjectproperty_cast<QUmlState *>(this)->setSubmachine(qmodelingobjectproperty_cast<QUmlStateMachine *>(submachine));
+    qmodelingelementproperty_cast<QUmlState *>(this)->setSubmachine(qmodelingelementproperty_cast<QUmlStateMachine *>(submachine));
+}
+
+
+void QUmlStateObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+
+    d->propertyGroups << QStringLiteral("QUmlVertex");
+    d->groupProperties.insert(QStringLiteral("QUmlVertex"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("container"))));
+    d->groupProperties.insert(QStringLiteral("QUmlVertex"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlVertex"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlState");
+    d->groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("connections"))));
+    d->groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("connectionPoints"))));
+    d->groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deferrableTriggers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("doActivity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("entry"))));
+    d->groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("exit"))));
+    d->groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isComposite"))));
+    d->groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isOrthogonal"))));
+    d->groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isSimple"))));
+    d->groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isSubmachineState"))));
+    d->groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedState"))));
+    d->groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContext"))));
+    d->groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("regions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("stateInvariant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("submachine"))));
+}
+
+void QUmlStateObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, connections, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, connections, PropertyClassRole, QStringLiteral("QUmlState"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, connections, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, connections, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, connections, DocumentationRole, QStringLiteral("The entry and exit connection points used in conjunction with this (submachine) state, i.e. as targets and sources, respectively, in the region with the submachine state. A connection point reference references the corresponding definition of a connection point pseudostate in the statemachine referenced by the submachinestate."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, connections, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, connections, SubsettedPropertiesRole, QStringLiteral("Namespace-ownedMember"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, connections, OppositeEndRole, QStringLiteral("ConnectionPointReference-state"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, connectionPoints, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, connectionPoints, PropertyClassRole, QStringLiteral("QUmlState"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, connectionPoints, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, connectionPoints, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, connectionPoints, DocumentationRole, QStringLiteral("The entry and exit pseudostates of a composite state. These can only be entry or exit Pseudostates, and they must have different names. They can only be defined for composite states."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, connectionPoints, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, connectionPoints, SubsettedPropertiesRole, QStringLiteral("Namespace-ownedMember"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, connectionPoints, OppositeEndRole, QStringLiteral("Pseudostate-state"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, deferrableTriggers, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, deferrableTriggers, PropertyClassRole, QStringLiteral("QUmlState"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, deferrableTriggers, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, deferrableTriggers, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, deferrableTriggers, DocumentationRole, QStringLiteral("A list of triggers that are candidates to be retained by the state machine if they trigger no transitions out of the state (not consumed). A deferred trigger is retained until the state machine reaches a state configuration where it is no longer deferred."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, deferrableTriggers, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, deferrableTriggers, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, deferrableTriggers, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, doActivity, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, doActivity, PropertyClassRole, QStringLiteral("QUmlState"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, doActivity, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, doActivity, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, doActivity, DocumentationRole, QStringLiteral("An optional behavior that is executed while being in the state. The execution starts when this state is entered, and stops either by itself, or when the state is exited, whichever comes first."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, doActivity, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, doActivity, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, doActivity, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, entry, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, entry, PropertyClassRole, QStringLiteral("QUmlState"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, entry, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, entry, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, entry, DocumentationRole, QStringLiteral("An optional behavior that is executed whenever this state is entered regardless of the transition taken to reach the state. If defined, entry actions are always executed to completion prior to any internal behavior or transitions performed within the state."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, entry, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, entry, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, entry, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, exit, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, exit, PropertyClassRole, QStringLiteral("QUmlState"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, exit, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, exit, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, exit, DocumentationRole, QStringLiteral("An optional behavior that is executed whenever this state is exited regardless of which transition was taken out of the state. If defined, exit actions are always executed to completion only after all internal activities and transition actions have completed execution."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, exit, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, exit, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, exit, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, isComposite, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, isComposite, PropertyClassRole, QStringLiteral("QUmlState"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, isComposite, IsDerivedRole, true);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, isComposite, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, isComposite, DocumentationRole, QStringLiteral("A state with isComposite=true is said to be a composite state. A composite state is a state that contains at least one region."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, isComposite, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, isComposite, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, isComposite, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, isOrthogonal, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, isOrthogonal, PropertyClassRole, QStringLiteral("QUmlState"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, isOrthogonal, IsDerivedRole, true);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, isOrthogonal, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, isOrthogonal, DocumentationRole, QStringLiteral("A state with isOrthogonal=true is said to be an orthogonal composite state. An orthogonal composite state contains two or more regions."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, isOrthogonal, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, isOrthogonal, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, isOrthogonal, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, isSimple, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, isSimple, PropertyClassRole, QStringLiteral("QUmlState"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, isSimple, IsDerivedRole, true);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, isSimple, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, isSimple, DocumentationRole, QStringLiteral("A state with isSimple=true is said to be a simple state. A simple state does not have any regions and it does not refer to any submachine state machine."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, isSimple, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, isSimple, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, isSimple, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, isSubmachineState, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, isSubmachineState, PropertyClassRole, QStringLiteral("QUmlState"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, isSubmachineState, IsDerivedRole, true);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, isSubmachineState, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, isSubmachineState, DocumentationRole, QStringLiteral("A state with isSubmachineState=true is said to be a submachine state. Such a state refers to a state machine (submachine)."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, isSubmachineState, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, isSubmachineState, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, isSubmachineState, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, redefinedState, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, redefinedState, PropertyClassRole, QStringLiteral("QUmlState"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, redefinedState, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, redefinedState, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, redefinedState, DocumentationRole, QStringLiteral("The state of which this state is a redefinition."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, redefinedState, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, redefinedState, SubsettedPropertiesRole, QStringLiteral("RedefinableElement-redefinedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, redefinedState, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, redefinitionContext, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, redefinitionContext, PropertyClassRole, QStringLiteral("QUmlState"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, redefinitionContext, IsDerivedRole, true);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, redefinitionContext, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, redefinitionContext, DocumentationRole, QStringLiteral("References the classifier in which context this element may be redefined."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, redefinitionContext, RedefinedPropertiesRole, QStringLiteral("RedefinableElement-redefinitionContext"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, redefinitionContext, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, redefinitionContext, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, regions, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, regions, PropertyClassRole, QStringLiteral("QUmlState"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, regions, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, regions, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, regions, DocumentationRole, QStringLiteral("The regions owned directly by the state."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, regions, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, regions, SubsettedPropertiesRole, QStringLiteral("Namespace-ownedMember"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, regions, OppositeEndRole, QStringLiteral("Region-state"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, stateInvariant, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, stateInvariant, PropertyClassRole, QStringLiteral("QUmlState"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, stateInvariant, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, stateInvariant, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, stateInvariant, DocumentationRole, QStringLiteral("Specifies conditions that are always true when this state is the current state. In protocol state machines, state invariants are additional conditions to the preconditions of the outgoing transitions, and to the postcondition of the incoming transitions."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, stateInvariant, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, stateInvariant, SubsettedPropertiesRole, QStringLiteral("Namespace-ownedRule"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, stateInvariant, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, submachine, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, submachine, PropertyClassRole, QStringLiteral("QUmlState"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, submachine, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, submachine, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, submachine, DocumentationRole, QStringLiteral("The state machine that is to be inserted in place of the (submachine) state."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, submachine, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, submachine, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlState, submachine, OppositeEndRole, QStringLiteral("StateMachine-submachineState"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlstateobject_p.h b/src/uml/qobjects/qumlstateobject_p.h
index ec7c08a8..e2e2f6c8 100644
--- a/src/uml/qobjects/qumlstateobject_p.h
+++ b/src/uml/qobjects/qumlstateobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlState;
-class Q_UML_EXPORT QUmlStateObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlStateObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlStateObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -106,7 +109,7 @@ class Q_UML_EXPORT QUmlStateObject : public QObject
     Q_PROPERTY(QObject * submachine READ submachine WRITE setSubmachine)
 
 public:
-    Q_INVOKABLE explicit QUmlStateObject(QUmlState *qModelingObject);
+    Q_INVOKABLE explicit QUmlStateObject(QUmlState *qModelingElement);
     virtual ~QUmlStateObject();
 
     // Owned attributes [Element]
@@ -250,6 +253,10 @@ public Q_SLOTS:
     void removeRegion(QObject *region);
     void setStateInvariant(QObject *stateInvariant = 0);
     void setSubmachine(QObject *submachine = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlstereotypeobject.cpp b/src/uml/qobjects/qumlstereotypeobject.cpp
index 5a91f50b..1fd43e33 100644
--- a/src/uml/qobjects/qumlstereotypeobject.cpp
+++ b/src/uml/qobjects/qumlstereotypeobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlstereotypeobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlStereotype>
 #include <QtUml/QUmlBehavior>
@@ -82,16 +83,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlStereotypeObject::QUmlStereotypeObject(QUmlStereotype *qModelingObject)
+QUmlStereotypeObject::QUmlStereotypeObject(QUmlStereotype *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlStereotypeObject::~QUmlStereotypeObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlStereotype *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlStereotype *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -100,25 +103,25 @@ QUmlStereotypeObject::~QUmlStereotypeObject()
 const QSet<QObject *> QUmlStereotypeObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStereotypeObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlStereotypeObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStereotype *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlStereotype *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStereotype *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStereotype *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -126,35 +129,35 @@ QObject *QUmlStereotypeObject::owner() const
 const QSet<QObject *> QUmlStereotypeObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlStereotypeObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlStereotype *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlStereotype *>(this)->name();
 }
 
 QObject *QUmlStereotypeObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStereotype *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlStereotype *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStereotype *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStereotype *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlStereotypeObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStereotype *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlStereotype *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStereotype *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStereotype *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlStereotypeObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlStereotype *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlStereotype *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [Namespace]
@@ -162,48 +165,48 @@ QString QUmlStereotypeObject::qualifiedName() const
 const QSet<QObject *> QUmlStereotypeObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStereotypeObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStereotypeObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStereotypeObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStereotypeObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStereotypeObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -211,49 +214,49 @@ const QSet<QObject *> QUmlStereotypeObject::packageImports() const
 
 QObject *QUmlStereotypeObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStereotype *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlStereotype *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStereotype *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStereotype *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlStereotypeObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlStereotype *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlStereotype *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Type]
 
 QObject *QUmlStereotypeObject::package() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStereotype *>(this)->package())
+    if (!qmodelingelementproperty_cast<QUmlStereotype *>(this)->package())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStereotype *>(this)->package()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStereotype *>(this)->package()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlStereotypeObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlStereotype *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlStereotype *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlStereotypeObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStereotypeObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -262,8 +265,8 @@ const QSet<QObject *> QUmlStereotypeObject::redefinitionContexts() const
 const QSet<QObject *> QUmlStereotypeObject::templateBindings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTemplateBinding *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->templateBindings())
-        set.insert(element->asQObject());
+    foreach (QUmlTemplateBinding *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->templateBindings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -272,109 +275,109 @@ const QSet<QObject *> QUmlStereotypeObject::templateBindings() const
 const QSet<QObject *> QUmlStereotypeObject::attributes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->attributes())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->attributes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStereotypeObject::collaborationUses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlCollaborationUse *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->collaborationUses())
-        set.insert(element->asQObject());
+    foreach (QUmlCollaborationUse *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->collaborationUses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStereotypeObject::features() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->features())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->features())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStereotypeObject::generalizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralization *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->generalizations())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralization *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->generalizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStereotypeObject::inheritedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->inheritedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->inheritedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlStereotypeObject::isFinalSpecialization() const
 {
-    return qmodelingobjectproperty_cast<QUmlStereotype *>(this)->isFinalSpecialization();
+    return qmodelingelementproperty_cast<QUmlStereotype *>(this)->isFinalSpecialization();
 }
 
 QObject *QUmlStereotypeObject::ownedTemplateSignature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStereotype *>(this)->ownedTemplateSignature())
+    if (!qmodelingelementproperty_cast<QUmlStereotype *>(this)->ownedTemplateSignature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStereotype *>(this)->ownedTemplateSignature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStereotype *>(this)->ownedTemplateSignature()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlStereotypeObject::ownedUseCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->ownedUseCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->ownedUseCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStereotypeObject::powertypeExtents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralizationSet *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->powertypeExtents())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralizationSet *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->powertypeExtents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStereotypeObject::redefinedClassifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->redefinedClassifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->redefinedClassifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlStereotypeObject::representation() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStereotype *>(this)->representation())
+    if (!qmodelingelementproperty_cast<QUmlStereotype *>(this)->representation())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStereotype *>(this)->representation()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStereotype *>(this)->representation()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlStereotypeObject::substitutions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlSubstitution *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->substitutions())
-        set.insert(element->asQObject());
+    foreach (QUmlSubstitution *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->substitutions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlStereotypeObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStereotype *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlStereotype *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStereotype *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStereotype *>(this)->templateParameter()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlStereotypeObject::useCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->useCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->useCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -383,24 +386,24 @@ const QSet<QObject *> QUmlStereotypeObject::useCases() const
 const QSet<QObject *> QUmlStereotypeObject::ownedConnectors() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConnector *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->ownedConnectors())
-        set.insert(element->asQObject());
+    foreach (QUmlConnector *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->ownedConnectors())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStereotypeObject::parts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->parts())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->parts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStereotypeObject::roles() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConnectableElement *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->roles())
-        set.insert(element->asQObject());
+    foreach (QUmlConnectableElement *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->roles())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -409,8 +412,8 @@ const QSet<QObject *> QUmlStereotypeObject::roles() const
 const QSet<QObject *> QUmlStereotypeObject::ownedPorts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPort *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->ownedPorts())
-        set.insert(element->asQObject());
+    foreach (QUmlPort *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->ownedPorts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -418,25 +421,25 @@ const QSet<QObject *> QUmlStereotypeObject::ownedPorts() const
 
 QObject *QUmlStereotypeObject::classifierBehavior() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStereotype *>(this)->classifierBehavior())
+    if (!qmodelingelementproperty_cast<QUmlStereotype *>(this)->classifierBehavior())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStereotype *>(this)->classifierBehavior()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStereotype *>(this)->classifierBehavior()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlStereotypeObject::interfaceRealizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterfaceRealization *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->interfaceRealizations())
-        set.insert(element->asQObject());
+    foreach (QUmlInterfaceRealization *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->interfaceRealizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStereotypeObject::ownedBehaviors() const
 {
     QSet<QObject *> set;
-    foreach (QUmlBehavior *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->ownedBehaviors())
-        set.insert(element->asQObject());
+    foreach (QUmlBehavior *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->ownedBehaviors())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -445,58 +448,58 @@ const QSet<QObject *> QUmlStereotypeObject::ownedBehaviors() const
 const QSet<QObject *> QUmlStereotypeObject::extensions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExtension *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->extensions())
-        set.insert(element->asQObject());
+    foreach (QUmlExtension *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->extensions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlStereotypeObject::isAbstract() const
 {
-    return qmodelingobjectproperty_cast<QUmlStereotype *>(this)->isAbstract();
+    return qmodelingelementproperty_cast<QUmlStereotype *>(this)->isAbstract();
 }
 
 bool QUmlStereotypeObject::isActive() const
 {
-    return qmodelingobjectproperty_cast<QUmlStereotype *>(this)->isActive();
+    return qmodelingelementproperty_cast<QUmlStereotype *>(this)->isActive();
 }
 
 const QList<QObject *> QUmlStereotypeObject::nestedClassifiers() const
 {
     QList<QObject *> list;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->nestedClassifiers())
-        list.append(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->nestedClassifiers())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QList<QObject *> QUmlStereotypeObject::ownedAttributes() const
 {
     QList<QObject *> list;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->ownedAttributes())
-        list.append(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->ownedAttributes())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QList<QObject *> QUmlStereotypeObject::ownedOperations() const
 {
     QList<QObject *> list;
-    foreach (QUmlOperation *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->ownedOperations())
-        list.append(element->asQObject());
+    foreach (QUmlOperation *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->ownedOperations())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QSet<QObject *> QUmlStereotypeObject::ownedReceptions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlReception *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->ownedReceptions())
-        set.insert(element->asQObject());
+    foreach (QUmlReception *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->ownedReceptions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStereotypeObject::superClasses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClass *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->superClasses())
-        set.insert(element->asQObject());
+    foreach (QUmlClass *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->superClasses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -505,17 +508,17 @@ const QSet<QObject *> QUmlStereotypeObject::superClasses() const
 const QSet<QObject *> QUmlStereotypeObject::icons() const
 {
     QSet<QObject *> set;
-    foreach (QUmlImage *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->icons())
-        set.insert(element->asQObject());
+    foreach (QUmlImage *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->icons())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlStereotypeObject::profile() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStereotype *>(this)->profile())
+    if (!qmodelingelementproperty_cast<QUmlStereotype *>(this)->profile())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStereotype *>(this)->profile()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStereotype *>(this)->profile()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -523,14 +526,14 @@ QObject *QUmlStereotypeObject::profile() const
 QSet<QObject *> QUmlStereotypeObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlStereotypeObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlStereotype *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlStereotype *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -538,27 +541,27 @@ bool QUmlStereotypeObject::mustBeOwned() const
 QList<QObject *> QUmlStereotypeObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlStereotypeObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlStereotypeObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlStereotype *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlStereotype *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlStereotypeObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlStereotype *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlStereotype *>(this)->separator();
 }
 
 // OPERATIONS [Namespace]
@@ -567,44 +570,44 @@ QSet<QObject *> QUmlStereotypeObject::excludeCollisions(QSet<QObject *> imps) co
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlStereotypeObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlStereotype *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlStereotype *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlStereotypeObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlStereotypeObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlStereotype *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlStereotype *>(this)->membersAreDistinguishable();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlStereotypeObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlStereotype *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlStereotype *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlStereotypeObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlStereotype *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlStereotype *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [Type]
@@ -612,12 +615,12 @@ bool QUmlStereotypeObject::isTemplateParameter() const
 
 bool QUmlStereotypeObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlStereotype *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlStereotype *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlStereotypeObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlStereotype *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlStereotype *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [TemplateableElement]
@@ -625,8 +628,8 @@ bool QUmlStereotypeObject::isRedefinitionContextValid(QObject *redefined) const
 QSet<QObject *> QUmlStereotypeObject::parameterableElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterableElement *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->parameterableElements())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterableElement *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->parameterableElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -635,52 +638,52 @@ QSet<QObject *> QUmlStereotypeObject::parameterableElements() const
 QSet<QObject *> QUmlStereotypeObject::allFeatures() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->allFeatures())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->allFeatures())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlStereotypeObject::allParents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->allParents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->allParents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlStereotypeObject::conformsTo(QObject *other) const
 {
-    return qmodelingobjectproperty_cast<QUmlStereotype *>(this)->conformsTo(qmodelingobjectproperty_cast<QUmlClassifier *>(other));
+    return qmodelingelementproperty_cast<QUmlStereotype *>(this)->conformsTo(qmodelingelementproperty_cast<QUmlClassifier *>(other));
 }
 
 bool QUmlStereotypeObject::hasVisibilityOf(QObject *n) const
 {
-    return qmodelingobjectproperty_cast<QUmlStereotype *>(this)->hasVisibilityOf(qmodelingobjectproperty_cast<QUmlNamedElement *>(n));
+    return qmodelingelementproperty_cast<QUmlStereotype *>(this)->hasVisibilityOf(qmodelingelementproperty_cast<QUmlNamedElement *>(n));
 }
 
 QSet<QObject *> QUmlStereotypeObject::inheritableMembers(QObject *c) const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->inheritableMembers(qmodelingobjectproperty_cast<QUmlClassifier *>(c)))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->inheritableMembers(qmodelingelementproperty_cast<QUmlClassifier *>(c)))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlStereotypeObject::isTemplate() const
 {
-    return qmodelingobjectproperty_cast<QUmlStereotype *>(this)->isTemplate();
+    return qmodelingelementproperty_cast<QUmlStereotype *>(this)->isTemplate();
 }
 
 bool QUmlStereotypeObject::maySpecializeType(QObject *c) const
 {
-    return qmodelingobjectproperty_cast<QUmlStereotype *>(this)->maySpecializeType(qmodelingobjectproperty_cast<QUmlClassifier *>(c));
+    return qmodelingelementproperty_cast<QUmlStereotype *>(this)->maySpecializeType(qmodelingelementproperty_cast<QUmlClassifier *>(c));
 }
 
 QSet<QObject *> QUmlStereotypeObject::parents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->parents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->parents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -690,10 +693,10 @@ QSet<QObject *> QUmlStereotypeObject::inherit(QSet<QObject *> inhs) const
 {
     QSet<QUmlNamedElement *> inhsConverted;
     foreach (QObject *object, inhs)
-        inhsConverted.insert(qmodelingobjectproperty_cast<QUmlNamedElement *>(object));
+        inhsConverted.insert(qmodelingelementproperty_cast<QUmlNamedElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlStereotype *>(this)->inherit(inhsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlStereotype *>(this)->inherit(inhsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -701,496 +704,613 @@ QSet<QObject *> QUmlStereotypeObject::inherit(QSet<QObject *> inhs) const
 
 QObject *QUmlStereotypeObject::containingProfile() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStereotype *>(this)->containingProfile())
+    if (!qmodelingelementproperty_cast<QUmlStereotype *>(this)->containingProfile())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStereotype *>(this)->containingProfile()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStereotype *>(this)->containingProfile()->asQModelingObject();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlStereotypeObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlStereotypeObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlStereotypeObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlStereotypeObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlStereotypeObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlStereotypeObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlStereotypeObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlStereotypeObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->setName(name);
 }
 
 void QUmlStereotypeObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlStereotypeObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlStereotypeObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlStereotypeObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlStereotypeObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlStereotypeObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlStereotypeObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlStereotypeObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlStereotypeObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlStereotypeObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlStereotypeObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlStereotypeObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlStereotypeObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlStereotypeObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlStereotypeObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlStereotypeObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlStereotypeObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->setVisibility(visibility);
 }
 
 void QUmlStereotypeObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Type]
 
 void QUmlStereotypeObject::setPackage(QObject *package)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->setPackage(qmodelingobjectproperty_cast<QUmlPackage *>(package));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->setPackage(qmodelingelementproperty_cast<QUmlPackage *>(package));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlStereotypeObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlStereotypeObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlStereotypeObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlStereotypeObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlStereotypeObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlStereotypeObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateableElement]
 
 void QUmlStereotypeObject::addTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->addTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->addTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 void QUmlStereotypeObject::removeTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->removeTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->removeTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Classifier]
 
 void QUmlStereotypeObject::addAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->addAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->addAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlStereotypeObject::removeAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->removeAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->removeAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlStereotypeObject::addCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->addCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->addCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlStereotypeObject::removeCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->removeCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->removeCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlStereotypeObject::addFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->addFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->addFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlStereotypeObject::removeFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->removeFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->removeFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlStereotypeObject::addGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->addGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->addGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlStereotypeObject::removeGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->removeGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->removeGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlStereotypeObject::addInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->addInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->addInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlStereotypeObject::removeInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->removeInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->removeInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlStereotypeObject::setFinalSpecialization(bool isFinalSpecialization)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->setFinalSpecialization(isFinalSpecialization);
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->setFinalSpecialization(isFinalSpecialization);
 }
 
 void QUmlStereotypeObject::unsetFinalSpecialization()
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("finalSpecialization"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
 void QUmlStereotypeObject::setOwnedTemplateSignature(QObject *ownedTemplateSignature)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->setOwnedTemplateSignature(qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->setOwnedTemplateSignature(qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
 }
 
 void QUmlStereotypeObject::addOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->addOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->addOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlStereotypeObject::removeOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->removeOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->removeOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlStereotypeObject::addPowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->addPowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->addPowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlStereotypeObject::removePowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->removePowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->removePowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlStereotypeObject::addRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->addRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->addRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlStereotypeObject::removeRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->removeRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->removeRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlStereotypeObject::setRepresentation(QObject *representation)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->setRepresentation(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(representation));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->setRepresentation(qmodelingelementproperty_cast<QUmlCollaborationUse *>(representation));
 }
 
 void QUmlStereotypeObject::addSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->addSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->addSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlStereotypeObject::removeSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->removeSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->removeSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlStereotypeObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
 }
 
 void QUmlStereotypeObject::addUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->addUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->addUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 void QUmlStereotypeObject::removeUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->removeUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->removeUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [StructuredClassifier]
 
 void QUmlStereotypeObject::addOwnedConnector(QObject *ownedConnector)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->addOwnedConnector(qmodelingobjectproperty_cast<QUmlConnector *>(ownedConnector));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->addOwnedConnector(qmodelingelementproperty_cast<QUmlConnector *>(ownedConnector));
 }
 
 void QUmlStereotypeObject::removeOwnedConnector(QObject *ownedConnector)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->removeOwnedConnector(qmodelingobjectproperty_cast<QUmlConnector *>(ownedConnector));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->removeOwnedConnector(qmodelingelementproperty_cast<QUmlConnector *>(ownedConnector));
 }
 
 void QUmlStereotypeObject::addPart(QObject *part)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->addPart(qmodelingobjectproperty_cast<QUmlProperty *>(part));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->addPart(qmodelingelementproperty_cast<QUmlProperty *>(part));
 }
 
 void QUmlStereotypeObject::removePart(QObject *part)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->removePart(qmodelingobjectproperty_cast<QUmlProperty *>(part));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->removePart(qmodelingelementproperty_cast<QUmlProperty *>(part));
 }
 
 void QUmlStereotypeObject::addRole(QObject *role)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->addRole(qmodelingobjectproperty_cast<QUmlConnectableElement *>(role));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->addRole(qmodelingelementproperty_cast<QUmlConnectableElement *>(role));
 }
 
 void QUmlStereotypeObject::removeRole(QObject *role)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->removeRole(qmodelingobjectproperty_cast<QUmlConnectableElement *>(role));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->removeRole(qmodelingelementproperty_cast<QUmlConnectableElement *>(role));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [EncapsulatedClassifier]
 
 void QUmlStereotypeObject::addOwnedPort(QObject *ownedPort)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->addOwnedPort(qmodelingobjectproperty_cast<QUmlPort *>(ownedPort));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->addOwnedPort(qmodelingelementproperty_cast<QUmlPort *>(ownedPort));
 }
 
 void QUmlStereotypeObject::removeOwnedPort(QObject *ownedPort)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->removeOwnedPort(qmodelingobjectproperty_cast<QUmlPort *>(ownedPort));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->removeOwnedPort(qmodelingelementproperty_cast<QUmlPort *>(ownedPort));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [BehavioredClassifier]
 
 void QUmlStereotypeObject::setClassifierBehavior(QObject *classifierBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->setClassifierBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(classifierBehavior));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->setClassifierBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(classifierBehavior));
 }
 
 void QUmlStereotypeObject::addInterfaceRealization(QObject *interfaceRealization)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->addInterfaceRealization(qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->addInterfaceRealization(qmodelingelementproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
 }
 
 void QUmlStereotypeObject::removeInterfaceRealization(QObject *interfaceRealization)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->removeInterfaceRealization(qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->removeInterfaceRealization(qmodelingelementproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
 }
 
 void QUmlStereotypeObject::addOwnedBehavior(QObject *ownedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->addOwnedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(ownedBehavior));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->addOwnedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(ownedBehavior));
 }
 
 void QUmlStereotypeObject::removeOwnedBehavior(QObject *ownedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->removeOwnedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(ownedBehavior));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->removeOwnedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(ownedBehavior));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Class]
 
 void QUmlStereotypeObject::addExtension(QObject *extension)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->addExtension(qmodelingobjectproperty_cast<QUmlExtension *>(extension));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->addExtension(qmodelingelementproperty_cast<QUmlExtension *>(extension));
 }
 
 void QUmlStereotypeObject::removeExtension(QObject *extension)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->removeExtension(qmodelingobjectproperty_cast<QUmlExtension *>(extension));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->removeExtension(qmodelingelementproperty_cast<QUmlExtension *>(extension));
 }
 
 void QUmlStereotypeObject::setAbstract(bool isAbstract)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->setAbstract(isAbstract);
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->setAbstract(isAbstract);
 }
 
 void QUmlStereotypeObject::unsetAbstract()
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("abstract"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
 void QUmlStereotypeObject::setActive(bool isActive)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->setActive(isActive);
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->setActive(isActive);
 }
 
 void QUmlStereotypeObject::unsetActive()
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("active"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("active"));
 }
 
 void QUmlStereotypeObject::addNestedClassifier(QObject *nestedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->addNestedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(nestedClassifier));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->addNestedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(nestedClassifier));
 }
 
 void QUmlStereotypeObject::removeNestedClassifier(QObject *nestedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->removeNestedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(nestedClassifier));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->removeNestedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(nestedClassifier));
 }
 
 void QUmlStereotypeObject::addOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->addOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->addOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlStereotypeObject::removeOwnedAttribute(QObject *ownedAttribute)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->removeOwnedAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(ownedAttribute));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->removeOwnedAttribute(qmodelingelementproperty_cast<QUmlProperty *>(ownedAttribute));
 }
 
 void QUmlStereotypeObject::addOwnedOperation(QObject *ownedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->addOwnedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(ownedOperation));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->addOwnedOperation(qmodelingelementproperty_cast<QUmlOperation *>(ownedOperation));
 }
 
 void QUmlStereotypeObject::removeOwnedOperation(QObject *ownedOperation)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->removeOwnedOperation(qmodelingobjectproperty_cast<QUmlOperation *>(ownedOperation));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->removeOwnedOperation(qmodelingelementproperty_cast<QUmlOperation *>(ownedOperation));
 }
 
 void QUmlStereotypeObject::addOwnedReception(QObject *ownedReception)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->addOwnedReception(qmodelingobjectproperty_cast<QUmlReception *>(ownedReception));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->addOwnedReception(qmodelingelementproperty_cast<QUmlReception *>(ownedReception));
 }
 
 void QUmlStereotypeObject::removeOwnedReception(QObject *ownedReception)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->removeOwnedReception(qmodelingobjectproperty_cast<QUmlReception *>(ownedReception));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->removeOwnedReception(qmodelingelementproperty_cast<QUmlReception *>(ownedReception));
 }
 
 void QUmlStereotypeObject::addSuperClass(QObject *superClass)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->addSuperClass(qmodelingobjectproperty_cast<QUmlClass *>(superClass));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->addSuperClass(qmodelingelementproperty_cast<QUmlClass *>(superClass));
 }
 
 void QUmlStereotypeObject::removeSuperClass(QObject *superClass)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->removeSuperClass(qmodelingobjectproperty_cast<QUmlClass *>(superClass));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->removeSuperClass(qmodelingelementproperty_cast<QUmlClass *>(superClass));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Stereotype]
 
 void QUmlStereotypeObject::addIcon(QObject *icon)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->addIcon(qmodelingobjectproperty_cast<QUmlImage *>(icon));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->addIcon(qmodelingelementproperty_cast<QUmlImage *>(icon));
 }
 
 void QUmlStereotypeObject::removeIcon(QObject *icon)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->removeIcon(qmodelingobjectproperty_cast<QUmlImage *>(icon));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->removeIcon(qmodelingelementproperty_cast<QUmlImage *>(icon));
 }
 
 void QUmlStereotypeObject::setProfile(QObject *profile)
 {
-    qmodelingobjectproperty_cast<QUmlStereotype *>(this)->setProfile(qmodelingobjectproperty_cast<QUmlProfile *>(profile));
+    qmodelingelementproperty_cast<QUmlStereotype *>(this)->setProfile(qmodelingelementproperty_cast<QUmlProfile *>(profile));
+}
+
+
+void QUmlStereotypeObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlType");
+    d->groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
+
+    d->propertyGroups << QStringLiteral("QUmlStructuredClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedConnectors"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parts"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("roles"))));
+
+    d->propertyGroups << QStringLiteral("QUmlEncapsulatedClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlEncapsulatedClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedPorts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlBehavioredClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifierBehavior"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interfaceRealizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedBehaviors"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClass");
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extensions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isActive"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedReceptions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superClasses"))));
+
+    d->propertyGroups << QStringLiteral("QUmlStereotype");
+    d->groupProperties.insert(QStringLiteral("QUmlStereotype"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("icons"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStereotype"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("profile"))));
+}
+
+void QUmlStereotypeObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStereotype, icons, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStereotype, icons, PropertyClassRole, QStringLiteral("QUmlStereotype"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStereotype, icons, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStereotype, icons, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStereotype, icons, DocumentationRole, QStringLiteral("Stereotype can change the graphical appearance of the extended model element by using attached icons. When this association is not null, it references the location of the icon content to be displayed within diagrams presenting the extended model elements."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStereotype, icons, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStereotype, icons, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStereotype, icons, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStereotype, profile, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStereotype, profile, PropertyClassRole, QStringLiteral("QUmlStereotype"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStereotype, profile, IsDerivedRole, true);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStereotype, profile, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStereotype, profile, DocumentationRole, QStringLiteral("The profile that directly or indirectly contains this stereotype."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStereotype, profile, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStereotype, profile, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStereotype, profile, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlstereotypeobject_p.h b/src/uml/qobjects/qumlstereotypeobject_p.h
index 3ded4174..d07d84a2 100644
--- a/src/uml/qobjects/qumlstereotypeobject_p.h
+++ b/src/uml/qobjects/qumlstereotypeobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlStereotype;
-class Q_UML_EXPORT QUmlStereotypeObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlStereotypeObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlStereotypeObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -139,7 +142,7 @@ class Q_UML_EXPORT QUmlStereotypeObject : public QObject
     Q_PROPERTY(QObject * profile READ profile STORED false)
 
 public:
-    Q_INVOKABLE explicit QUmlStereotypeObject(QUmlStereotype *qModelingObject);
+    Q_INVOKABLE explicit QUmlStereotypeObject(QUmlStereotype *qModelingElement);
     virtual ~QUmlStereotypeObject();
 
     // Owned attributes [Element]
@@ -388,6 +391,10 @@ public Q_SLOTS:
     void addIcon(QObject *icon);
     void removeIcon(QObject *icon);
     void Q_DECL_HIDDEN setProfile(QObject *profile = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlstringexpressionobject.cpp b/src/uml/qobjects/qumlstringexpressionobject.cpp
index ce6cfafc..e19adcf1 100644
--- a/src/uml/qobjects/qumlstringexpressionobject.cpp
+++ b/src/uml/qobjects/qumlstringexpressionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlstringexpressionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlStringExpression>
 #include <QtUml/QUmlComment>
@@ -56,16 +57,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlStringExpressionObject::QUmlStringExpressionObject(QUmlStringExpression *qModelingObject)
+QUmlStringExpressionObject::QUmlStringExpressionObject(QUmlStringExpression *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlStringExpressionObject::~QUmlStringExpressionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlStringExpression *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -74,25 +77,25 @@ QUmlStringExpressionObject::~QUmlStringExpressionObject()
 const QSet<QObject *> QUmlStringExpressionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlStringExpression *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStringExpressionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlStringExpression *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlStringExpressionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlStringExpression *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStringExpression *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -100,70 +103,70 @@ QObject *QUmlStringExpressionObject::owner() const
 const QSet<QObject *> QUmlStringExpressionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlStringExpression *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlStringExpressionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlStringExpression *>(this)->name();
 }
 
 QObject *QUmlStringExpressionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlStringExpression *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStringExpression *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlStringExpressionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlStringExpression *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStringExpression *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlStringExpressionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlStringExpression *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [TypedElement]
 
 QObject *QUmlStringExpressionObject::type() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->type())
+    if (!qmodelingelementproperty_cast<QUmlStringExpression *>(this)->type())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->type()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStringExpression *>(this)->type()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlStringExpressionObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlStringExpression *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStringExpression *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlStringExpressionObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlStringExpression *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStringExpression *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlStringExpressionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlStringExpression *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Expression]
@@ -171,31 +174,31 @@ QtUml::VisibilityKind QUmlStringExpressionObject::visibility() const
 const QList<QObject *> QUmlStringExpressionObject::operands() const
 {
     QList<QObject *> list;
-    foreach (QUmlValueSpecification *element, qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->operands())
-        list.append(element->asQObject());
+    foreach (QUmlValueSpecification *element, qmodelingelementproperty_cast<QUmlStringExpression *>(this)->operands())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 QString QUmlStringExpressionObject::symbol() const
 {
-    return qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->symbol();
+    return qmodelingelementproperty_cast<QUmlStringExpression *>(this)->symbol();
 }
 
 // OWNED ATTRIBUTES [TemplateableElement]
 
 QObject *QUmlStringExpressionObject::ownedTemplateSignature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->ownedTemplateSignature())
+    if (!qmodelingelementproperty_cast<QUmlStringExpression *>(this)->ownedTemplateSignature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->ownedTemplateSignature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStringExpression *>(this)->ownedTemplateSignature()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlStringExpressionObject::templateBindings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTemplateBinding *element, qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->templateBindings())
-        set.insert(element->asQObject());
+    foreach (QUmlTemplateBinding *element, qmodelingelementproperty_cast<QUmlStringExpression *>(this)->templateBindings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -203,17 +206,17 @@ const QSet<QObject *> QUmlStringExpressionObject::templateBindings() const
 
 QObject *QUmlStringExpressionObject::owningExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->owningExpression())
+    if (!qmodelingelementproperty_cast<QUmlStringExpression *>(this)->owningExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->owningExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStringExpression *>(this)->owningExpression()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlStringExpressionObject::subExpressions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlStringExpression *element, qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->subExpressions())
-        set.insert(element->asQObject());
+    foreach (QUmlStringExpression *element, qmodelingelementproperty_cast<QUmlStringExpression *>(this)->subExpressions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -222,14 +225,14 @@ const QSet<QObject *> QUmlStringExpressionObject::subExpressions() const
 QSet<QObject *> QUmlStringExpressionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlStringExpression *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlStringExpressionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlStringExpression *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -237,85 +240,85 @@ bool QUmlStringExpressionObject::mustBeOwned() const
 QList<QObject *> QUmlStringExpressionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlStringExpression *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlStringExpressionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlStringExpression *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlStringExpressionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlStringExpression *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlStringExpressionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlStringExpression *>(this)->separator();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlStringExpressionObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlStringExpression *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [ValueSpecification]
 
 bool QUmlStringExpressionObject::booleanValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->booleanValue();
+    return qmodelingelementproperty_cast<QUmlStringExpression *>(this)->booleanValue();
 }
 
 int QUmlStringExpressionObject::integerValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->integerValue();
+    return qmodelingelementproperty_cast<QUmlStringExpression *>(this)->integerValue();
 }
 
 bool QUmlStringExpressionObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlStringExpression *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlStringExpressionObject::isComputable() const
 {
-    return qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->isComputable();
+    return qmodelingelementproperty_cast<QUmlStringExpression *>(this)->isComputable();
 }
 
 bool QUmlStringExpressionObject::isNull() const
 {
-    return qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->isNull();
+    return qmodelingelementproperty_cast<QUmlStringExpression *>(this)->isNull();
 }
 
 double QUmlStringExpressionObject::realValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->realValue();
+    return qmodelingelementproperty_cast<QUmlStringExpression *>(this)->realValue();
 }
 
 int QUmlStringExpressionObject::unlimitedValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->unlimitedValue();
+    return qmodelingelementproperty_cast<QUmlStringExpression *>(this)->unlimitedValue();
 }
 
 // OPERATIONS [TemplateableElement]
 
 bool QUmlStringExpressionObject::isTemplate() const
 {
-    return qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->isTemplate();
+    return qmodelingelementproperty_cast<QUmlStringExpression *>(this)->isTemplate();
 }
 
 QSet<QObject *> QUmlStringExpressionObject::parameterableElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterableElement *element, qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->parameterableElements())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterableElement *element, qmodelingelementproperty_cast<QUmlStringExpression *>(this)->parameterableElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -323,147 +326,216 @@ QSet<QObject *> QUmlStringExpressionObject::parameterableElements() const
 
 QString QUmlStringExpressionObject::stringValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->stringValue();
+    return qmodelingelementproperty_cast<QUmlStringExpression *>(this)->stringValue();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlStringExpressionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlStringExpression *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlStringExpressionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlStringExpression *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlStringExpressionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlStringExpression *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlStringExpressionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlStringExpression *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlStringExpressionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlStringExpression *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlStringExpressionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlStringExpression *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlStringExpressionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlStringExpression *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlStringExpressionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlStringExpression *>(this)->setName(name);
 }
 
 void QUmlStringExpressionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlStringExpression *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlStringExpressionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlStringExpression *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlStringExpressionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlStringExpression *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [TypedElement]
 
 void QUmlStringExpressionObject::setType(QObject *type)
 {
-    qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->setType(qmodelingobjectproperty_cast<QUmlType *>(type));
+    qmodelingelementproperty_cast<QUmlStringExpression *>(this)->setType(qmodelingelementproperty_cast<QUmlType *>(type));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlStringExpressionObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlStringExpression *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlStringExpressionObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlStringExpression *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlStringExpressionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlStringExpression *>(this)->setVisibility(visibility);
 }
 
 void QUmlStringExpressionObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Expression]
 
 void QUmlStringExpressionObject::addOperand(QObject *operand)
 {
-    qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->addOperand(qmodelingobjectproperty_cast<QUmlValueSpecification *>(operand));
+    qmodelingelementproperty_cast<QUmlStringExpression *>(this)->addOperand(qmodelingelementproperty_cast<QUmlValueSpecification *>(operand));
 }
 
 void QUmlStringExpressionObject::removeOperand(QObject *operand)
 {
-    qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->removeOperand(qmodelingobjectproperty_cast<QUmlValueSpecification *>(operand));
+    qmodelingelementproperty_cast<QUmlStringExpression *>(this)->removeOperand(qmodelingelementproperty_cast<QUmlValueSpecification *>(operand));
 }
 
 void QUmlStringExpressionObject::setSymbol(QString symbol)
 {
-    qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->setSymbol(symbol);
+    qmodelingelementproperty_cast<QUmlStringExpression *>(this)->setSymbol(symbol);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateableElement]
 
 void QUmlStringExpressionObject::setOwnedTemplateSignature(QObject *ownedTemplateSignature)
 {
-    qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->setOwnedTemplateSignature(qmodelingobjectproperty_cast<QUmlTemplateSignature *>(ownedTemplateSignature));
+    qmodelingelementproperty_cast<QUmlStringExpression *>(this)->setOwnedTemplateSignature(qmodelingelementproperty_cast<QUmlTemplateSignature *>(ownedTemplateSignature));
 }
 
 void QUmlStringExpressionObject::addTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->addTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlStringExpression *>(this)->addTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 void QUmlStringExpressionObject::removeTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->removeTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlStringExpression *>(this)->removeTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [StringExpression]
 
 void QUmlStringExpressionObject::setOwningExpression(QObject *owningExpression)
 {
-    qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->setOwningExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(owningExpression));
+    qmodelingelementproperty_cast<QUmlStringExpression *>(this)->setOwningExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(owningExpression));
 }
 
 void QUmlStringExpressionObject::addSubExpression(QObject *subExpression)
 {
-    qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->addSubExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(subExpression));
+    qmodelingelementproperty_cast<QUmlStringExpression *>(this)->addSubExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(subExpression));
 }
 
 void QUmlStringExpressionObject::removeSubExpression(QObject *subExpression)
 {
-    qmodelingobjectproperty_cast<QUmlStringExpression *>(this)->removeSubExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(subExpression));
+    qmodelingelementproperty_cast<QUmlStringExpression *>(this)->removeSubExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(subExpression));
+}
+
+
+void QUmlStringExpressionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTypedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlValueSpecification");
+
+    d->propertyGroups << QStringLiteral("QUmlExpression");
+    d->groupProperties.insert(QStringLiteral("QUmlExpression"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("operands"))));
+    d->groupProperties.insert(QStringLiteral("QUmlExpression"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("symbol"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlStringExpression");
+    d->groupProperties.insert(QStringLiteral("QUmlStringExpression"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStringExpression"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("subExpressions"))));
+}
+
+void QUmlStringExpressionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStringExpression, owningExpression, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStringExpression, owningExpression, PropertyClassRole, QStringLiteral("QUmlStringExpression"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStringExpression, owningExpression, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStringExpression, owningExpression, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStringExpression, owningExpression, DocumentationRole, QStringLiteral("The string expression of which this expression is a substring."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStringExpression, owningExpression, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStringExpression, owningExpression, SubsettedPropertiesRole, QStringLiteral("Element-owner"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStringExpression, owningExpression, OppositeEndRole, QStringLiteral("StringExpression-subExpression"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStringExpression, subExpressions, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStringExpression, subExpressions, PropertyClassRole, QStringLiteral("QUmlStringExpression"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStringExpression, subExpressions, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStringExpression, subExpressions, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStringExpression, subExpressions, DocumentationRole, QStringLiteral("The StringExpressions that constitute this StringExpression."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStringExpression, subExpressions, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStringExpression, subExpressions, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStringExpression, subExpressions, OppositeEndRole, QStringLiteral("StringExpression-owningExpression"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlstringexpressionobject_p.h b/src/uml/qobjects/qumlstringexpressionobject_p.h
index 97ba1597..ab1e6eb8 100644
--- a/src/uml/qobjects/qumlstringexpressionobject_p.h
+++ b/src/uml/qobjects/qumlstringexpressionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlStringExpression;
-class Q_UML_EXPORT QUmlStringExpressionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlStringExpressionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlStringExpressionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -93,7 +96,7 @@ class Q_UML_EXPORT QUmlStringExpressionObject : public QObject
     Q_PROPERTY(QSet<QObject *> subExpressions READ subExpressions)
 
 public:
-    Q_INVOKABLE explicit QUmlStringExpressionObject(QUmlStringExpression *qModelingObject);
+    Q_INVOKABLE explicit QUmlStringExpressionObject(QUmlStringExpression *qModelingElement);
     virtual ~QUmlStringExpressionObject();
 
     // Owned attributes [Element]
@@ -201,6 +204,10 @@ public Q_SLOTS:
     void setOwningExpression(QObject *owningExpression = 0);
     void addSubExpression(QObject *subExpression);
     void removeSubExpression(QObject *subExpression);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlstructuredactivitynodeobject.cpp b/src/uml/qobjects/qumlstructuredactivitynodeobject.cpp
index efdd69ee..8e01021f 100644
--- a/src/uml/qobjects/qumlstructuredactivitynodeobject.cpp
+++ b/src/uml/qobjects/qumlstructuredactivitynodeobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlstructuredactivitynodeobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlStructuredActivityNode>
 #include <QtUml/QUmlActivity>
@@ -67,16 +68,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlStructuredActivityNodeObject::QUmlStructuredActivityNodeObject(QUmlStructuredActivityNode *qModelingObject)
+QUmlStructuredActivityNodeObject::QUmlStructuredActivityNodeObject(QUmlStructuredActivityNode *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlStructuredActivityNodeObject::~QUmlStructuredActivityNodeObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -85,25 +88,25 @@ QUmlStructuredActivityNodeObject::~QUmlStructuredActivityNodeObject()
 const QSet<QObject *> QUmlStructuredActivityNodeObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStructuredActivityNodeObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlStructuredActivityNodeObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -111,62 +114,62 @@ QObject *QUmlStructuredActivityNodeObject::owner() const
 const QSet<QObject *> QUmlStructuredActivityNodeObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlStructuredActivityNodeObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->name();
 }
 
 QObject *QUmlStructuredActivityNodeObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlStructuredActivityNodeObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlStructuredActivityNodeObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlStructuredActivityNodeObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlStructuredActivityNodeObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlStructuredActivityNodeObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStructuredActivityNodeObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -175,56 +178,56 @@ const QSet<QObject *> QUmlStructuredActivityNodeObject::redefinitionContexts() c
 const QSet<QObject *> QUmlStructuredActivityNodeObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStructuredActivityNodeObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStructuredActivityNodeObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlStructuredActivityNodeObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlStructuredActivityNodeObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStructuredActivityNodeObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStructuredActivityNodeObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -233,8 +236,8 @@ const QSet<QObject *> QUmlStructuredActivityNodeObject::redefinedNodes() const
 const QSet<QObject *> QUmlStructuredActivityNodeObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -242,46 +245,46 @@ const QSet<QObject *> QUmlStructuredActivityNodeObject::handlers() const
 
 QObject *QUmlStructuredActivityNodeObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlStructuredActivityNodeObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlStructuredActivityNodeObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlStructuredActivityNodeObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStructuredActivityNodeObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlStructuredActivityNodeObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -290,48 +293,48 @@ const QList<QObject *> QUmlStructuredActivityNodeObject::outputs() const
 const QSet<QObject *> QUmlStructuredActivityNodeObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStructuredActivityNodeObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStructuredActivityNodeObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStructuredActivityNodeObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStructuredActivityNodeObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStructuredActivityNodeObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -340,87 +343,87 @@ const QSet<QObject *> QUmlStructuredActivityNodeObject::packageImports() const
 const QSet<QObject *> QUmlStructuredActivityNodeObject::containedEdges() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->containedEdges())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->containedEdges())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStructuredActivityNodeObject::containedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->containedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->containedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStructuredActivityNodeObject::subgroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->subgroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->subgroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlStructuredActivityNodeObject::superGroup() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->superGroup())
+    if (!qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->superGroup())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->superGroup()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->superGroup()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [StructuredActivityNode]
 
 QObject *QUmlStructuredActivityNodeObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlStructuredActivityNodeObject::edges() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->edges())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->edges())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlStructuredActivityNodeObject::mustIsolate() const
 {
-    return qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->mustIsolate();
+    return qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->mustIsolate();
 }
 
 const QSet<QObject *> QUmlStructuredActivityNodeObject::nodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->nodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->nodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStructuredActivityNodeObject::structuredNodeInputs() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->structuredNodeInputs())
-        set.insert(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->structuredNodeInputs())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStructuredActivityNodeObject::structuredNodeOutputs() const
 {
     QSet<QObject *> set;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->structuredNodeOutputs())
-        set.insert(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->structuredNodeOutputs())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlStructuredActivityNodeObject::variables() const
 {
     QSet<QObject *> set;
-    foreach (QUmlVariable *element, qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->variables())
-        set.insert(element->asQObject());
+    foreach (QUmlVariable *element, qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->variables())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -429,14 +432,14 @@ const QSet<QObject *> QUmlStructuredActivityNodeObject::variables() const
 QSet<QObject *> QUmlStructuredActivityNodeObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlStructuredActivityNodeObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -444,39 +447,39 @@ bool QUmlStructuredActivityNodeObject::mustBeOwned() const
 QList<QObject *> QUmlStructuredActivityNodeObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlStructuredActivityNodeObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlStructuredActivityNodeObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlStructuredActivityNodeObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlStructuredActivityNodeObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlStructuredActivityNodeObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [Namespace]
@@ -485,430 +488,571 @@ QSet<QObject *> QUmlStructuredActivityNodeObject::excludeCollisions(QSet<QObject
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlStructuredActivityNodeObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlStructuredActivityNodeObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlStructuredActivityNodeObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->membersAreDistinguishable();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlStructuredActivityNodeObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlStructuredActivityNodeObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlStructuredActivityNodeObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlStructuredActivityNodeObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlStructuredActivityNodeObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlStructuredActivityNodeObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlStructuredActivityNodeObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlStructuredActivityNodeObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->setName(name);
 }
 
 void QUmlStructuredActivityNodeObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlStructuredActivityNodeObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlStructuredActivityNodeObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlStructuredActivityNodeObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlStructuredActivityNodeObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlStructuredActivityNodeObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlStructuredActivityNodeObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlStructuredActivityNodeObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlStructuredActivityNodeObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlStructuredActivityNodeObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlStructuredActivityNodeObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlStructuredActivityNodeObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlStructuredActivityNodeObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlStructuredActivityNodeObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlStructuredActivityNodeObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlStructuredActivityNodeObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlStructuredActivityNodeObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlStructuredActivityNodeObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlStructuredActivityNodeObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlStructuredActivityNodeObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlStructuredActivityNodeObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlStructuredActivityNodeObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlStructuredActivityNodeObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlStructuredActivityNodeObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlStructuredActivityNodeObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlStructuredActivityNodeObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlStructuredActivityNodeObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlStructuredActivityNodeObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlStructuredActivityNodeObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlStructuredActivityNodeObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlStructuredActivityNodeObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlStructuredActivityNodeObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlStructuredActivityNodeObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlStructuredActivityNodeObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlStructuredActivityNodeObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlStructuredActivityNodeObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlStructuredActivityNodeObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlStructuredActivityNodeObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlStructuredActivityNodeObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlStructuredActivityNodeObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlStructuredActivityNodeObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlStructuredActivityNodeObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlStructuredActivityNodeObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlStructuredActivityNodeObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlStructuredActivityNodeObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlStructuredActivityNodeObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlStructuredActivityNodeObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlStructuredActivityNodeObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityGroup]
 
 void QUmlStructuredActivityNodeObject::addContainedEdge(QObject *containedEdge)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->addContainedEdge(qmodelingobjectproperty_cast<QUmlActivityEdge *>(containedEdge));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->addContainedEdge(qmodelingelementproperty_cast<QUmlActivityEdge *>(containedEdge));
 }
 
 void QUmlStructuredActivityNodeObject::removeContainedEdge(QObject *containedEdge)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->removeContainedEdge(qmodelingobjectproperty_cast<QUmlActivityEdge *>(containedEdge));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->removeContainedEdge(qmodelingelementproperty_cast<QUmlActivityEdge *>(containedEdge));
 }
 
 void QUmlStructuredActivityNodeObject::addContainedNode(QObject *containedNode)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->addContainedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(containedNode));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->addContainedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(containedNode));
 }
 
 void QUmlStructuredActivityNodeObject::removeContainedNode(QObject *containedNode)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->removeContainedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(containedNode));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->removeContainedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(containedNode));
 }
 
 void QUmlStructuredActivityNodeObject::addSubgroup(QObject *subgroup)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->addSubgroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(subgroup));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->addSubgroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(subgroup));
 }
 
 void QUmlStructuredActivityNodeObject::removeSubgroup(QObject *subgroup)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->removeSubgroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(subgroup));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->removeSubgroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(subgroup));
 }
 
 void QUmlStructuredActivityNodeObject::setSuperGroup(QObject *superGroup)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->setSuperGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(superGroup));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->setSuperGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(superGroup));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [StructuredActivityNode]
 
 void QUmlStructuredActivityNodeObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlStructuredActivityNodeObject::addEdge(QObject *edge)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->addEdge(qmodelingobjectproperty_cast<QUmlActivityEdge *>(edge));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->addEdge(qmodelingelementproperty_cast<QUmlActivityEdge *>(edge));
 }
 
 void QUmlStructuredActivityNodeObject::removeEdge(QObject *edge)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->removeEdge(qmodelingobjectproperty_cast<QUmlActivityEdge *>(edge));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->removeEdge(qmodelingelementproperty_cast<QUmlActivityEdge *>(edge));
 }
 
 void QUmlStructuredActivityNodeObject::setMustIsolate(bool mustIsolate)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->setMustIsolate(mustIsolate);
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->setMustIsolate(mustIsolate);
 }
 
 void QUmlStructuredActivityNodeObject::unsetMustIsolate()
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("mustIsolate"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("mustIsolate"));
 }
 
 void QUmlStructuredActivityNodeObject::addNode(QObject *node)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->addNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(node));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->addNode(qmodelingelementproperty_cast<QUmlActivityNode *>(node));
 }
 
 void QUmlStructuredActivityNodeObject::removeNode(QObject *node)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->removeNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(node));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->removeNode(qmodelingelementproperty_cast<QUmlActivityNode *>(node));
 }
 
 void QUmlStructuredActivityNodeObject::addStructuredNodeInput(QObject *structuredNodeInput)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->addStructuredNodeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(structuredNodeInput));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->addStructuredNodeInput(qmodelingelementproperty_cast<QUmlInputPin *>(structuredNodeInput));
 }
 
 void QUmlStructuredActivityNodeObject::removeStructuredNodeInput(QObject *structuredNodeInput)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->removeStructuredNodeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(structuredNodeInput));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->removeStructuredNodeInput(qmodelingelementproperty_cast<QUmlInputPin *>(structuredNodeInput));
 }
 
 void QUmlStructuredActivityNodeObject::addStructuredNodeOutput(QObject *structuredNodeOutput)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->addStructuredNodeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(structuredNodeOutput));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->addStructuredNodeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(structuredNodeOutput));
 }
 
 void QUmlStructuredActivityNodeObject::removeStructuredNodeOutput(QObject *structuredNodeOutput)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->removeStructuredNodeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(structuredNodeOutput));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->removeStructuredNodeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(structuredNodeOutput));
 }
 
 void QUmlStructuredActivityNodeObject::addVariable(QObject *variable)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->addVariable(qmodelingobjectproperty_cast<QUmlVariable *>(variable));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->addVariable(qmodelingelementproperty_cast<QUmlVariable *>(variable));
 }
 
 void QUmlStructuredActivityNodeObject::removeVariable(QObject *variable)
 {
-    qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(this)->removeVariable(qmodelingobjectproperty_cast<QUmlVariable *>(variable));
+    qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(this)->removeVariable(qmodelingelementproperty_cast<QUmlVariable *>(variable));
+}
+
+
+void QUmlStructuredActivityNodeObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityGroup");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("containedEdges"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("containedNodes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("subgroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superGroup"))));
+
+    d->propertyGroups << QStringLiteral("QUmlStructuredActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("edges"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("mustIsolate"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nodes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("structuredNodeInputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("structuredNodeOutputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("variables"))));
+}
+
+void QUmlStructuredActivityNodeObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, activity, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, activity, PropertyClassRole, QStringLiteral("QUmlStructuredActivityNode"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, activity, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, activity, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, activity, DocumentationRole, QStringLiteral("Activity immediately containing the node."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, activity, RedefinedPropertiesRole, QStringLiteral("ActivityGroup-inActivity ActivityNode-activity"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, activity, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, activity, OppositeEndRole, QStringLiteral("Activity-structuredNode"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, edges, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, edges, PropertyClassRole, QStringLiteral("QUmlStructuredActivityNode"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, edges, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, edges, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, edges, DocumentationRole, QStringLiteral("Edges immediately contained in the structured node."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, edges, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, edges, SubsettedPropertiesRole, QStringLiteral("ActivityGroup-containedEdge Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, edges, OppositeEndRole, QStringLiteral("ActivityEdge-inStructuredNode"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, mustIsolate, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, mustIsolate, PropertyClassRole, QStringLiteral("QUmlStructuredActivityNode"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, mustIsolate, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, mustIsolate, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, mustIsolate, DocumentationRole, QStringLiteral("If true, then the actions in the node execute in isolation from actions outside the node."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, mustIsolate, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, mustIsolate, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, mustIsolate, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, nodes, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, nodes, PropertyClassRole, QStringLiteral("QUmlStructuredActivityNode"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, nodes, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, nodes, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, nodes, DocumentationRole, QStringLiteral("Nodes immediately contained in the group."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, nodes, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, nodes, SubsettedPropertiesRole, QStringLiteral("ActivityGroup-containedNode Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, nodes, OppositeEndRole, QStringLiteral("ActivityNode-inStructuredNode"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, structuredNodeInputs, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, structuredNodeInputs, PropertyClassRole, QStringLiteral("QUmlStructuredActivityNode"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, structuredNodeInputs, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, structuredNodeInputs, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, structuredNodeInputs, DocumentationRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, structuredNodeInputs, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, structuredNodeInputs, SubsettedPropertiesRole, QStringLiteral("Action-input"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, structuredNodeInputs, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, structuredNodeOutputs, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, structuredNodeOutputs, PropertyClassRole, QStringLiteral("QUmlStructuredActivityNode"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, structuredNodeOutputs, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, structuredNodeOutputs, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, structuredNodeOutputs, DocumentationRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, structuredNodeOutputs, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, structuredNodeOutputs, SubsettedPropertiesRole, QStringLiteral("Action-output"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, structuredNodeOutputs, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, variables, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, variables, PropertyClassRole, QStringLiteral("QUmlStructuredActivityNode"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, variables, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, variables, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, variables, DocumentationRole, QStringLiteral("A variable defined in the scope of the structured activity node. It has no value and may not be accessed"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, variables, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, variables, SubsettedPropertiesRole, QStringLiteral("Namespace-ownedMember"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlStructuredActivityNode, variables, OppositeEndRole, QStringLiteral("Variable-scope"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlstructuredactivitynodeobject_p.h b/src/uml/qobjects/qumlstructuredactivitynodeobject_p.h
index faf6f6bc..c6481c03 100644
--- a/src/uml/qobjects/qumlstructuredactivitynodeobject_p.h
+++ b/src/uml/qobjects/qumlstructuredactivitynodeobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlStructuredActivityNode;
-class Q_UML_EXPORT QUmlStructuredActivityNodeObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlStructuredActivityNodeObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlStructuredActivityNodeObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -120,7 +123,7 @@ class Q_UML_EXPORT QUmlStructuredActivityNodeObject : public QObject
     Q_PROPERTY(QSet<QObject *> variables READ variables)
 
 public:
-    Q_INVOKABLE explicit QUmlStructuredActivityNodeObject(QUmlStructuredActivityNode *qModelingObject);
+    Q_INVOKABLE explicit QUmlStructuredActivityNodeObject(QUmlStructuredActivityNode *qModelingElement);
     virtual ~QUmlStructuredActivityNodeObject();
 
     // Owned attributes [Element]
@@ -299,6 +302,10 @@ public Q_SLOTS:
     void removeStructuredNodeOutput(QObject *structuredNodeOutput);
     void addVariable(QObject *variable);
     void removeVariable(QObject *variable);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlsubstitutionobject.cpp b/src/uml/qobjects/qumlsubstitutionobject.cpp
index 3561e082..950feb05 100644
--- a/src/uml/qobjects/qumlsubstitutionobject.cpp
+++ b/src/uml/qobjects/qumlsubstitutionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlsubstitutionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlSubstitution>
 #include <QtUml/QUmlClassifier>
@@ -55,16 +56,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlSubstitutionObject::QUmlSubstitutionObject(QUmlSubstitution *qModelingObject)
+QUmlSubstitutionObject::QUmlSubstitutionObject(QUmlSubstitution *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlSubstitutionObject::~QUmlSubstitutionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlSubstitution *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -73,43 +76,43 @@ QUmlSubstitutionObject::~QUmlSubstitutionObject()
 const QSet<QObject *> QUmlSubstitutionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlSubstitution *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSubstitutionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlSubstitution *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlSubstitutionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlSubstitution *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSubstitution *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlSubstitutionObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlSubstitution *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSubstitution *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlSubstitutionObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlSubstitution *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSubstitution *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -117,42 +120,42 @@ QObject *QUmlSubstitutionObject::templateParameter() const
 const QSet<QObject *> QUmlSubstitutionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlSubstitution *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlSubstitutionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlSubstitution *>(this)->name();
 }
 
 QObject *QUmlSubstitutionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlSubstitution *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSubstitution *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlSubstitutionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlSubstitution *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSubstitution *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlSubstitutionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlSubstitution *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlSubstitutionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlSubstitution *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Relationship]
@@ -160,8 +163,8 @@ QtUml::VisibilityKind QUmlSubstitutionObject::visibility() const
 const QSet<QObject *> QUmlSubstitutionObject::relatedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->relatedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlSubstitution *>(this)->relatedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -170,16 +173,16 @@ const QSet<QObject *> QUmlSubstitutionObject::relatedElements() const
 const QSet<QObject *> QUmlSubstitutionObject::sources() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->sources())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlSubstitution *>(this)->sources())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSubstitutionObject::targets() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->targets())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlSubstitution *>(this)->targets())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -188,16 +191,16 @@ const QSet<QObject *> QUmlSubstitutionObject::targets() const
 const QSet<QObject *> QUmlSubstitutionObject::clients() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->clients())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlSubstitution *>(this)->clients())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlSubstitutionObject::suppliers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->suppliers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlSubstitution *>(this)->suppliers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -205,28 +208,28 @@ const QSet<QObject *> QUmlSubstitutionObject::suppliers() const
 
 QObject *QUmlSubstitutionObject::mapping() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->mapping())
+    if (!qmodelingelementproperty_cast<QUmlSubstitution *>(this)->mapping())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->mapping()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSubstitution *>(this)->mapping()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [Substitution]
 
 QObject *QUmlSubstitutionObject::contract() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->contract())
+    if (!qmodelingelementproperty_cast<QUmlSubstitution *>(this)->contract())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->contract()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSubstitution *>(this)->contract()->asQModelingObject();
 }
 
 QObject *QUmlSubstitutionObject::substitutingClassifier() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->substitutingClassifier())
+    if (!qmodelingelementproperty_cast<QUmlSubstitution *>(this)->substitutingClassifier())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->substitutingClassifier()->asQObject();
+        return qmodelingelementproperty_cast<QUmlSubstitution *>(this)->substitutingClassifier()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -234,26 +237,26 @@ QObject *QUmlSubstitutionObject::substitutingClassifier() const
 QSet<QObject *> QUmlSubstitutionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlSubstitution *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlSubstitutionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlSubstitution *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlSubstitutionObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlSubstitution *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlSubstitutionObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlSubstitution *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [NamedElement]
@@ -261,184 +264,256 @@ bool QUmlSubstitutionObject::isTemplateParameter() const
 QList<QObject *> QUmlSubstitutionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlSubstitution *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlSubstitutionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlSubstitution *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlSubstitutionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlSubstitution *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlSubstitutionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlSubstitution *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlSubstitutionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlSubstitution *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlSubstitutionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlSubstitution *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlSubstitutionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlSubstitution *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlSubstitutionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlSubstitution *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlSubstitutionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlSubstitution *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlSubstitutionObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlSubstitution *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlSubstitutionObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlSubstitution *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlSubstitutionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlSubstitution *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlSubstitutionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlSubstitution *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlSubstitutionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlSubstitution *>(this)->setName(name);
 }
 
 void QUmlSubstitutionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlSubstitution *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlSubstitutionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlSubstitution *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlSubstitutionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlSubstitution *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlSubstitutionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlSubstitution *>(this)->setVisibility(visibility);
 }
 
 void QUmlSubstitutionObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Relationship]
 
 void QUmlSubstitutionObject::addRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->addRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlSubstitution *>(this)->addRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 void QUmlSubstitutionObject::removeRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->removeRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlSubstitution *>(this)->removeRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [DirectedRelationship]
 
 void QUmlSubstitutionObject::addSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->addSource(qmodelingobjectproperty_cast<QUmlElement *>(source));
+    qmodelingelementproperty_cast<QUmlSubstitution *>(this)->addSource(qmodelingelementproperty_cast<QUmlElement *>(source));
 }
 
 void QUmlSubstitutionObject::removeSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->removeSource(qmodelingobjectproperty_cast<QUmlElement *>(source));
+    qmodelingelementproperty_cast<QUmlSubstitution *>(this)->removeSource(qmodelingelementproperty_cast<QUmlElement *>(source));
 }
 
 void QUmlSubstitutionObject::addTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->addTarget(qmodelingobjectproperty_cast<QUmlElement *>(target));
+    qmodelingelementproperty_cast<QUmlSubstitution *>(this)->addTarget(qmodelingelementproperty_cast<QUmlElement *>(target));
 }
 
 void QUmlSubstitutionObject::removeTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->removeTarget(qmodelingobjectproperty_cast<QUmlElement *>(target));
+    qmodelingelementproperty_cast<QUmlSubstitution *>(this)->removeTarget(qmodelingelementproperty_cast<QUmlElement *>(target));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Dependency]
 
 void QUmlSubstitutionObject::addClient(QObject *client)
 {
-    qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->addClient(qmodelingobjectproperty_cast<QUmlNamedElement *>(client));
+    qmodelingelementproperty_cast<QUmlSubstitution *>(this)->addClient(qmodelingelementproperty_cast<QUmlNamedElement *>(client));
 }
 
 void QUmlSubstitutionObject::removeClient(QObject *client)
 {
-    qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->removeClient(qmodelingobjectproperty_cast<QUmlNamedElement *>(client));
+    qmodelingelementproperty_cast<QUmlSubstitution *>(this)->removeClient(qmodelingelementproperty_cast<QUmlNamedElement *>(client));
 }
 
 void QUmlSubstitutionObject::addSupplier(QObject *supplier)
 {
-    qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->addSupplier(qmodelingobjectproperty_cast<QUmlNamedElement *>(supplier));
+    qmodelingelementproperty_cast<QUmlSubstitution *>(this)->addSupplier(qmodelingelementproperty_cast<QUmlNamedElement *>(supplier));
 }
 
 void QUmlSubstitutionObject::removeSupplier(QObject *supplier)
 {
-    qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->removeSupplier(qmodelingobjectproperty_cast<QUmlNamedElement *>(supplier));
+    qmodelingelementproperty_cast<QUmlSubstitution *>(this)->removeSupplier(qmodelingelementproperty_cast<QUmlNamedElement *>(supplier));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Abstraction]
 
 void QUmlSubstitutionObject::setMapping(QObject *mapping)
 {
-    qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->setMapping(qmodelingobjectproperty_cast<QUmlOpaqueExpression *>(mapping));
+    qmodelingelementproperty_cast<QUmlSubstitution *>(this)->setMapping(qmodelingelementproperty_cast<QUmlOpaqueExpression *>(mapping));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Substitution]
 
 void QUmlSubstitutionObject::setContract(QObject *contract)
 {
-    qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->setContract(qmodelingobjectproperty_cast<QUmlClassifier *>(contract));
+    qmodelingelementproperty_cast<QUmlSubstitution *>(this)->setContract(qmodelingelementproperty_cast<QUmlClassifier *>(contract));
 }
 
 void QUmlSubstitutionObject::setSubstitutingClassifier(QObject *substitutingClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlSubstitution *>(this)->setSubstitutingClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(substitutingClassifier));
+    qmodelingelementproperty_cast<QUmlSubstitution *>(this)->setSubstitutingClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(substitutingClassifier));
+}
+
+
+void QUmlSubstitutionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDirectedRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDependency");
+    d->groupProperties.insert(QStringLiteral("QUmlDependency"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clients"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDependency"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("suppliers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAbstraction");
+    d->groupProperties.insert(QStringLiteral("QUmlAbstraction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("mapping"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRealization");
+
+    d->propertyGroups << QStringLiteral("QUmlSubstitution");
+    d->groupProperties.insert(QStringLiteral("QUmlSubstitution"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("contract"))));
+    d->groupProperties.insert(QStringLiteral("QUmlSubstitution"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutingClassifier"))));
+}
+
+void QUmlSubstitutionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSubstitution, contract, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSubstitution, contract, PropertyClassRole, QStringLiteral("QUmlSubstitution"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSubstitution, contract, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSubstitution, contract, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSubstitution, contract, DocumentationRole, QStringLiteral("The contract with which the substituting classifier complies."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSubstitution, contract, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSubstitution, contract, SubsettedPropertiesRole, QStringLiteral("Dependency-supplier"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSubstitution, contract, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSubstitution, substitutingClassifier, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSubstitution, substitutingClassifier, PropertyClassRole, QStringLiteral("QUmlSubstitution"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSubstitution, substitutingClassifier, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSubstitution, substitutingClassifier, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSubstitution, substitutingClassifier, DocumentationRole, QStringLiteral("Instances of the substituting classifier are runtime substitutable where instances of the contract classifier are expected."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSubstitution, substitutingClassifier, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSubstitution, substitutingClassifier, SubsettedPropertiesRole, QStringLiteral("Element-owner Dependency-client"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlSubstitution, substitutingClassifier, OppositeEndRole, QStringLiteral("Classifier-substitution"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlsubstitutionobject_p.h b/src/uml/qobjects/qumlsubstitutionobject_p.h
index 0e9beb00..eb1d61e4 100644
--- a/src/uml/qobjects/qumlsubstitutionobject_p.h
+++ b/src/uml/qobjects/qumlsubstitutionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlSubstitution;
-class Q_UML_EXPORT QUmlSubstitutionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlSubstitutionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlSubstitutionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -96,7 +99,7 @@ class Q_UML_EXPORT QUmlSubstitutionObject : public QObject
     Q_PROPERTY(QObject * substitutingClassifier READ substitutingClassifier WRITE setSubstitutingClassifier)
 
 public:
-    Q_INVOKABLE explicit QUmlSubstitutionObject(QUmlSubstitution *qModelingObject);
+    Q_INVOKABLE explicit QUmlSubstitutionObject(QUmlSubstitution *qModelingElement);
     virtual ~QUmlSubstitutionObject();
 
     // Owned attributes [Element]
@@ -197,6 +200,10 @@ public Q_SLOTS:
     // Slots for owned attributes [Substitution]
     void setContract(QObject *contract = 0);
     void setSubstitutingClassifier(QObject *substitutingClassifier = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumltemplatebindingobject.cpp b/src/uml/qobjects/qumltemplatebindingobject.cpp
index 1e5e33e3..da7e629c 100644
--- a/src/uml/qobjects/qumltemplatebindingobject.cpp
+++ b/src/uml/qobjects/qumltemplatebindingobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumltemplatebindingobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlTemplateBinding>
 #include <QtUml/QUmlComment>
@@ -49,16 +50,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlTemplateBindingObject::QUmlTemplateBindingObject(QUmlTemplateBinding *qModelingObject)
+QUmlTemplateBindingObject::QUmlTemplateBindingObject(QUmlTemplateBinding *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlTemplateBindingObject::~QUmlTemplateBindingObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlTemplateBinding *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlTemplateBinding *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -67,25 +70,25 @@ QUmlTemplateBindingObject::~QUmlTemplateBindingObject()
 const QSet<QObject *> QUmlTemplateBindingObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlTemplateBinding *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlTemplateBinding *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlTemplateBindingObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlTemplateBinding *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlTemplateBinding *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlTemplateBindingObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTemplateBinding *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlTemplateBinding *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTemplateBinding *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTemplateBinding *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [Relationship]
@@ -93,8 +96,8 @@ QObject *QUmlTemplateBindingObject::owner() const
 const QSet<QObject *> QUmlTemplateBindingObject::relatedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlTemplateBinding *>(this)->relatedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlTemplateBinding *>(this)->relatedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -103,16 +106,16 @@ const QSet<QObject *> QUmlTemplateBindingObject::relatedElements() const
 const QSet<QObject *> QUmlTemplateBindingObject::sources() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlTemplateBinding *>(this)->sources())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlTemplateBinding *>(this)->sources())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlTemplateBindingObject::targets() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlTemplateBinding *>(this)->targets())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlTemplateBinding *>(this)->targets())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -120,26 +123,26 @@ const QSet<QObject *> QUmlTemplateBindingObject::targets() const
 
 QObject *QUmlTemplateBindingObject::boundElement() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTemplateBinding *>(this)->boundElement())
+    if (!qmodelingelementproperty_cast<QUmlTemplateBinding *>(this)->boundElement())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTemplateBinding *>(this)->boundElement()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTemplateBinding *>(this)->boundElement()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlTemplateBindingObject::parameterSubstitutions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTemplateParameterSubstitution *element, qmodelingobjectproperty_cast<QUmlTemplateBinding *>(this)->parameterSubstitutions())
-        set.insert(element->asQObject());
+    foreach (QUmlTemplateParameterSubstitution *element, qmodelingelementproperty_cast<QUmlTemplateBinding *>(this)->parameterSubstitutions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlTemplateBindingObject::signature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTemplateBinding *>(this)->signature())
+    if (!qmodelingelementproperty_cast<QUmlTemplateBinding *>(this)->signature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTemplateBinding *>(this)->signature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTemplateBinding *>(this)->signature()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -147,97 +150,155 @@ QObject *QUmlTemplateBindingObject::signature() const
 QSet<QObject *> QUmlTemplateBindingObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlTemplateBinding *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlTemplateBinding *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlTemplateBindingObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlTemplateBinding *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlTemplateBinding *>(this)->mustBeOwned();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlTemplateBindingObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateBinding *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlTemplateBinding *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlTemplateBindingObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateBinding *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlTemplateBinding *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlTemplateBindingObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateBinding *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlTemplateBinding *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlTemplateBindingObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateBinding *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlTemplateBinding *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlTemplateBindingObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateBinding *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlTemplateBinding *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Relationship]
 
 void QUmlTemplateBindingObject::addRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateBinding *>(this)->addRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlTemplateBinding *>(this)->addRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 void QUmlTemplateBindingObject::removeRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateBinding *>(this)->removeRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlTemplateBinding *>(this)->removeRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [DirectedRelationship]
 
 void QUmlTemplateBindingObject::addSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateBinding *>(this)->addSource(qmodelingobjectproperty_cast<QUmlElement *>(source));
+    qmodelingelementproperty_cast<QUmlTemplateBinding *>(this)->addSource(qmodelingelementproperty_cast<QUmlElement *>(source));
 }
 
 void QUmlTemplateBindingObject::removeSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateBinding *>(this)->removeSource(qmodelingobjectproperty_cast<QUmlElement *>(source));
+    qmodelingelementproperty_cast<QUmlTemplateBinding *>(this)->removeSource(qmodelingelementproperty_cast<QUmlElement *>(source));
 }
 
 void QUmlTemplateBindingObject::addTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateBinding *>(this)->addTarget(qmodelingobjectproperty_cast<QUmlElement *>(target));
+    qmodelingelementproperty_cast<QUmlTemplateBinding *>(this)->addTarget(qmodelingelementproperty_cast<QUmlElement *>(target));
 }
 
 void QUmlTemplateBindingObject::removeTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateBinding *>(this)->removeTarget(qmodelingobjectproperty_cast<QUmlElement *>(target));
+    qmodelingelementproperty_cast<QUmlTemplateBinding *>(this)->removeTarget(qmodelingelementproperty_cast<QUmlElement *>(target));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateBinding]
 
 void QUmlTemplateBindingObject::setBoundElement(QObject *boundElement)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateBinding *>(this)->setBoundElement(qmodelingobjectproperty_cast<QUmlTemplateableElement *>(boundElement));
+    qmodelingelementproperty_cast<QUmlTemplateBinding *>(this)->setBoundElement(qmodelingelementproperty_cast<QUmlTemplateableElement *>(boundElement));
 }
 
 void QUmlTemplateBindingObject::addParameterSubstitution(QObject *parameterSubstitution)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateBinding *>(this)->addParameterSubstitution(qmodelingobjectproperty_cast<QUmlTemplateParameterSubstitution *>(parameterSubstitution));
+    qmodelingelementproperty_cast<QUmlTemplateBinding *>(this)->addParameterSubstitution(qmodelingelementproperty_cast<QUmlTemplateParameterSubstitution *>(parameterSubstitution));
 }
 
 void QUmlTemplateBindingObject::removeParameterSubstitution(QObject *parameterSubstitution)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateBinding *>(this)->removeParameterSubstitution(qmodelingobjectproperty_cast<QUmlTemplateParameterSubstitution *>(parameterSubstitution));
+    qmodelingelementproperty_cast<QUmlTemplateBinding *>(this)->removeParameterSubstitution(qmodelingelementproperty_cast<QUmlTemplateParameterSubstitution *>(parameterSubstitution));
 }
 
 void QUmlTemplateBindingObject::setSignature(QObject *signature)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateBinding *>(this)->setSignature(qmodelingobjectproperty_cast<QUmlTemplateSignature *>(signature));
+    qmodelingelementproperty_cast<QUmlTemplateBinding *>(this)->setSignature(qmodelingelementproperty_cast<QUmlTemplateSignature *>(signature));
+}
+
+
+void QUmlTemplateBindingObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDirectedRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateBinding");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateBinding"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("boundElement"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateBinding"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parameterSubstitutions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateBinding"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("signature"))));
+}
+
+void QUmlTemplateBindingObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateBinding, boundElement, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateBinding, boundElement, PropertyClassRole, QStringLiteral("QUmlTemplateBinding"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateBinding, boundElement, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateBinding, boundElement, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateBinding, boundElement, DocumentationRole, QStringLiteral("The element that is bound by this binding."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateBinding, boundElement, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateBinding, boundElement, SubsettedPropertiesRole, QStringLiteral("Element-owner DirectedRelationship-source"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateBinding, boundElement, OppositeEndRole, QStringLiteral("TemplateableElement-templateBinding"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateBinding, parameterSubstitutions, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateBinding, parameterSubstitutions, PropertyClassRole, QStringLiteral("QUmlTemplateBinding"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateBinding, parameterSubstitutions, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateBinding, parameterSubstitutions, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateBinding, parameterSubstitutions, DocumentationRole, QStringLiteral("The parameter substitutions owned by this template binding."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateBinding, parameterSubstitutions, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateBinding, parameterSubstitutions, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateBinding, parameterSubstitutions, OppositeEndRole, QStringLiteral("TemplateParameterSubstitution-templateBinding"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateBinding, signature, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateBinding, signature, PropertyClassRole, QStringLiteral("QUmlTemplateBinding"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateBinding, signature, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateBinding, signature, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateBinding, signature, DocumentationRole, QStringLiteral("The template signature for the template that is the target of the binding."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateBinding, signature, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateBinding, signature, SubsettedPropertiesRole, QStringLiteral("DirectedRelationship-target"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateBinding, signature, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumltemplatebindingobject_p.h b/src/uml/qobjects/qumltemplatebindingobject_p.h
index 5dcfa37b..371d2151 100644
--- a/src/uml/qobjects/qumltemplatebindingobject_p.h
+++ b/src/uml/qobjects/qumltemplatebindingobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 QT_BEGIN_HEADER
 
@@ -52,9 +52,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlTemplateBinding;
-class Q_UML_EXPORT QUmlTemplateBindingObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlTemplateBindingObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlTemplateBindingObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -74,7 +77,7 @@ class Q_UML_EXPORT QUmlTemplateBindingObject : public QObject
     Q_PROPERTY(QObject * signature READ signature WRITE setSignature)
 
 public:
-    Q_INVOKABLE explicit QUmlTemplateBindingObject(QUmlTemplateBinding *qModelingObject);
+    Q_INVOKABLE explicit QUmlTemplateBindingObject(QUmlTemplateBinding *qModelingElement);
     virtual ~QUmlTemplateBindingObject();
 
     // Owned attributes [Element]
@@ -122,6 +125,10 @@ public Q_SLOTS:
     void addParameterSubstitution(QObject *parameterSubstitution);
     void removeParameterSubstitution(QObject *parameterSubstitution);
     void setSignature(QObject *signature = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumltemplateparameterobject.cpp b/src/uml/qobjects/qumltemplateparameterobject.cpp
index ff01b6ce..bc9d198a 100644
--- a/src/uml/qobjects/qumltemplateparameterobject.cpp
+++ b/src/uml/qobjects/qumltemplateparameterobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumltemplateparameterobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlTemplateParameter>
 #include <QtUml/QUmlComment>
@@ -48,16 +49,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlTemplateParameterObject::QUmlTemplateParameterObject(QUmlTemplateParameter *qModelingObject)
+QUmlTemplateParameterObject::QUmlTemplateParameterObject(QUmlTemplateParameter *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlTemplateParameterObject::~QUmlTemplateParameterObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlTemplateParameter *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlTemplateParameter *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -66,67 +69,67 @@ QUmlTemplateParameterObject::~QUmlTemplateParameterObject()
 const QSet<QObject *> QUmlTemplateParameterObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlTemplateParameter *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlTemplateParameter *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlTemplateParameterObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlTemplateParameter *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlTemplateParameter *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlTemplateParameterObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTemplateParameter *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlTemplateParameter *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTemplateParameter *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTemplateParameter *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [TemplateParameter]
 
 QObject *QUmlTemplateParameterObject::default_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTemplateParameter *>(this)->default_())
+    if (!qmodelingelementproperty_cast<QUmlTemplateParameter *>(this)->default_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTemplateParameter *>(this)->default_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTemplateParameter *>(this)->default_()->asQModelingObject();
 }
 
 QObject *QUmlTemplateParameterObject::ownedDefault() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTemplateParameter *>(this)->ownedDefault())
+    if (!qmodelingelementproperty_cast<QUmlTemplateParameter *>(this)->ownedDefault())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTemplateParameter *>(this)->ownedDefault()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTemplateParameter *>(this)->ownedDefault()->asQModelingObject();
 }
 
 QObject *QUmlTemplateParameterObject::ownedParameteredElement() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTemplateParameter *>(this)->ownedParameteredElement())
+    if (!qmodelingelementproperty_cast<QUmlTemplateParameter *>(this)->ownedParameteredElement())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTemplateParameter *>(this)->ownedParameteredElement()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTemplateParameter *>(this)->ownedParameteredElement()->asQModelingObject();
 }
 
 QObject *QUmlTemplateParameterObject::parameteredElement() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTemplateParameter *>(this)->parameteredElement())
+    if (!qmodelingelementproperty_cast<QUmlTemplateParameter *>(this)->parameteredElement())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTemplateParameter *>(this)->parameteredElement()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTemplateParameter *>(this)->parameteredElement()->asQModelingObject();
 }
 
 QObject *QUmlTemplateParameterObject::signature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTemplateParameter *>(this)->signature())
+    if (!qmodelingelementproperty_cast<QUmlTemplateParameter *>(this)->signature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTemplateParameter *>(this)->signature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTemplateParameter *>(this)->signature()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -134,68 +137,139 @@ QObject *QUmlTemplateParameterObject::signature() const
 QSet<QObject *> QUmlTemplateParameterObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlTemplateParameter *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlTemplateParameter *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlTemplateParameterObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlTemplateParameter *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlTemplateParameter *>(this)->mustBeOwned();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlTemplateParameterObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateParameter *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlTemplateParameter *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlTemplateParameterObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateParameter *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlTemplateParameter *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlTemplateParameterObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateParameter *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlTemplateParameter *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlTemplateParameterObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateParameter *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlTemplateParameter *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlTemplateParameterObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateParameter *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlTemplateParameter *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateParameter]
 
 void QUmlTemplateParameterObject::setDefault(QObject *default_)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateParameter *>(this)->setDefault(qmodelingobjectproperty_cast<QUmlParameterableElement *>(default_));
+    qmodelingelementproperty_cast<QUmlTemplateParameter *>(this)->setDefault(qmodelingelementproperty_cast<QUmlParameterableElement *>(default_));
 }
 
 void QUmlTemplateParameterObject::setOwnedDefault(QObject *ownedDefault)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateParameter *>(this)->setOwnedDefault(qmodelingobjectproperty_cast<QUmlParameterableElement *>(ownedDefault));
+    qmodelingelementproperty_cast<QUmlTemplateParameter *>(this)->setOwnedDefault(qmodelingelementproperty_cast<QUmlParameterableElement *>(ownedDefault));
 }
 
 void QUmlTemplateParameterObject::setOwnedParameteredElement(QObject *ownedParameteredElement)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateParameter *>(this)->setOwnedParameteredElement(qmodelingobjectproperty_cast<QUmlParameterableElement *>(ownedParameteredElement));
+    qmodelingelementproperty_cast<QUmlTemplateParameter *>(this)->setOwnedParameteredElement(qmodelingelementproperty_cast<QUmlParameterableElement *>(ownedParameteredElement));
 }
 
 void QUmlTemplateParameterObject::setParameteredElement(QObject *parameteredElement)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateParameter *>(this)->setParameteredElement(qmodelingobjectproperty_cast<QUmlParameterableElement *>(parameteredElement));
+    qmodelingelementproperty_cast<QUmlTemplateParameter *>(this)->setParameteredElement(qmodelingelementproperty_cast<QUmlParameterableElement *>(parameteredElement));
 }
 
 void QUmlTemplateParameterObject::setSignature(QObject *signature)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateParameter *>(this)->setSignature(qmodelingobjectproperty_cast<QUmlTemplateSignature *>(signature));
+    qmodelingelementproperty_cast<QUmlTemplateParameter *>(this)->setSignature(qmodelingelementproperty_cast<QUmlTemplateSignature *>(signature));
+}
+
+
+void QUmlTemplateParameterObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateParameter");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("default_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedDefault"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameteredElement"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parameteredElement"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("signature"))));
+}
+
+void QUmlTemplateParameterObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, default_, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, default_, PropertyClassRole, QStringLiteral("QUmlTemplateParameter"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, default_, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, default_, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, default_, DocumentationRole, QStringLiteral("The element that is the default for this formal template parameter."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, default_, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, default_, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, default_, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, ownedDefault, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, ownedDefault, PropertyClassRole, QStringLiteral("QUmlTemplateParameter"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, ownedDefault, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, ownedDefault, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, ownedDefault, DocumentationRole, QStringLiteral("The element that is owned by this template parameter for the purpose of providing a default."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, ownedDefault, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, ownedDefault, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement TemplateParameter-default"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, ownedDefault, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, ownedParameteredElement, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, ownedParameteredElement, PropertyClassRole, QStringLiteral("QUmlTemplateParameter"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, ownedParameteredElement, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, ownedParameteredElement, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, ownedParameteredElement, DocumentationRole, QStringLiteral("The element that is owned by this template parameter."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, ownedParameteredElement, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, ownedParameteredElement, SubsettedPropertiesRole, QStringLiteral("TemplateParameter-parameteredElement Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, ownedParameteredElement, OppositeEndRole, QStringLiteral("ParameterableElement-owningTemplateParameter"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, parameteredElement, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, parameteredElement, PropertyClassRole, QStringLiteral("QUmlTemplateParameter"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, parameteredElement, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, parameteredElement, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, parameteredElement, DocumentationRole, QStringLiteral("The element exposed by this template parameter."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, parameteredElement, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, parameteredElement, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, parameteredElement, OppositeEndRole, QStringLiteral("ParameterableElement-templateParameter"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, signature, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, signature, PropertyClassRole, QStringLiteral("QUmlTemplateParameter"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, signature, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, signature, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, signature, DocumentationRole, QStringLiteral("The template signature that owns this template parameter."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, signature, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, signature, SubsettedPropertiesRole, QStringLiteral("Element-owner A_parameter_templateSignature-templateSignature"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameter, signature, OppositeEndRole, QStringLiteral("TemplateSignature-ownedParameter"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumltemplateparameterobject_p.h b/src/uml/qobjects/qumltemplateparameterobject_p.h
index 3b7ec1fc..a8bf4d73 100644
--- a/src/uml/qobjects/qumltemplateparameterobject_p.h
+++ b/src/uml/qobjects/qumltemplateparameterobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 QT_BEGIN_HEADER
 
@@ -52,9 +52,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlTemplateParameter;
-class Q_UML_EXPORT QUmlTemplateParameterObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlTemplateParameterObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlTemplateParameterObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -69,7 +72,7 @@ class Q_UML_EXPORT QUmlTemplateParameterObject : public QObject
     Q_PROPERTY(QObject * signature READ signature WRITE setSignature)
 
 public:
-    Q_INVOKABLE explicit QUmlTemplateParameterObject(QUmlTemplateParameter *qModelingObject);
+    Q_INVOKABLE explicit QUmlTemplateParameterObject(QUmlTemplateParameter *qModelingElement);
     virtual ~QUmlTemplateParameterObject();
 
     // Owned attributes [Element]
@@ -103,6 +106,10 @@ public Q_SLOTS:
     void setOwnedParameteredElement(QObject *ownedParameteredElement = 0);
     void setParameteredElement(QObject *parameteredElement = 0);
     void setSignature(QObject *signature = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumltemplateparametersubstitutionobject.cpp b/src/uml/qobjects/qumltemplateparametersubstitutionobject.cpp
index 7fabf26a..4aec5cce 100644
--- a/src/uml/qobjects/qumltemplateparametersubstitutionobject.cpp
+++ b/src/uml/qobjects/qumltemplateparametersubstitutionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumltemplateparametersubstitutionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlTemplateParameterSubstitution>
 #include <QtUml/QUmlComment>
@@ -49,16 +50,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlTemplateParameterSubstitutionObject::QUmlTemplateParameterSubstitutionObject(QUmlTemplateParameterSubstitution *qModelingObject)
+QUmlTemplateParameterSubstitutionObject::QUmlTemplateParameterSubstitutionObject(QUmlTemplateParameterSubstitution *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlTemplateParameterSubstitutionObject::~QUmlTemplateParameterSubstitutionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlTemplateParameterSubstitution *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlTemplateParameterSubstitution *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -67,59 +70,59 @@ QUmlTemplateParameterSubstitutionObject::~QUmlTemplateParameterSubstitutionObjec
 const QSet<QObject *> QUmlTemplateParameterSubstitutionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlTemplateParameterSubstitution *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlTemplateParameterSubstitution *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlTemplateParameterSubstitutionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlTemplateParameterSubstitution *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlTemplateParameterSubstitution *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlTemplateParameterSubstitutionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTemplateParameterSubstitution *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlTemplateParameterSubstitution *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTemplateParameterSubstitution *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTemplateParameterSubstitution *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [TemplateParameterSubstitution]
 
 QObject *QUmlTemplateParameterSubstitutionObject::actual() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTemplateParameterSubstitution *>(this)->actual())
+    if (!qmodelingelementproperty_cast<QUmlTemplateParameterSubstitution *>(this)->actual())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTemplateParameterSubstitution *>(this)->actual()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTemplateParameterSubstitution *>(this)->actual()->asQModelingObject();
 }
 
 QObject *QUmlTemplateParameterSubstitutionObject::formal() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTemplateParameterSubstitution *>(this)->formal())
+    if (!qmodelingelementproperty_cast<QUmlTemplateParameterSubstitution *>(this)->formal())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTemplateParameterSubstitution *>(this)->formal()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTemplateParameterSubstitution *>(this)->formal()->asQModelingObject();
 }
 
 QObject *QUmlTemplateParameterSubstitutionObject::ownedActual() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTemplateParameterSubstitution *>(this)->ownedActual())
+    if (!qmodelingelementproperty_cast<QUmlTemplateParameterSubstitution *>(this)->ownedActual())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTemplateParameterSubstitution *>(this)->ownedActual()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTemplateParameterSubstitution *>(this)->ownedActual()->asQModelingObject();
 }
 
 QObject *QUmlTemplateParameterSubstitutionObject::templateBinding() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTemplateParameterSubstitution *>(this)->templateBinding())
+    if (!qmodelingelementproperty_cast<QUmlTemplateParameterSubstitution *>(this)->templateBinding())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTemplateParameterSubstitution *>(this)->templateBinding()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTemplateParameterSubstitution *>(this)->templateBinding()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -127,63 +130,124 @@ QObject *QUmlTemplateParameterSubstitutionObject::templateBinding() const
 QSet<QObject *> QUmlTemplateParameterSubstitutionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlTemplateParameterSubstitution *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlTemplateParameterSubstitution *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlTemplateParameterSubstitutionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlTemplateParameterSubstitution *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlTemplateParameterSubstitution *>(this)->mustBeOwned();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlTemplateParameterSubstitutionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateParameterSubstitution *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlTemplateParameterSubstitution *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlTemplateParameterSubstitutionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateParameterSubstitution *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlTemplateParameterSubstitution *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlTemplateParameterSubstitutionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateParameterSubstitution *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlTemplateParameterSubstitution *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlTemplateParameterSubstitutionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateParameterSubstitution *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlTemplateParameterSubstitution *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlTemplateParameterSubstitutionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateParameterSubstitution *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlTemplateParameterSubstitution *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateParameterSubstitution]
 
 void QUmlTemplateParameterSubstitutionObject::setActual(QObject *actual)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateParameterSubstitution *>(this)->setActual(qmodelingobjectproperty_cast<QUmlParameterableElement *>(actual));
+    qmodelingelementproperty_cast<QUmlTemplateParameterSubstitution *>(this)->setActual(qmodelingelementproperty_cast<QUmlParameterableElement *>(actual));
 }
 
 void QUmlTemplateParameterSubstitutionObject::setFormal(QObject *formal)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateParameterSubstitution *>(this)->setFormal(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(formal));
+    qmodelingelementproperty_cast<QUmlTemplateParameterSubstitution *>(this)->setFormal(qmodelingelementproperty_cast<QUmlTemplateParameter *>(formal));
 }
 
 void QUmlTemplateParameterSubstitutionObject::setOwnedActual(QObject *ownedActual)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateParameterSubstitution *>(this)->setOwnedActual(qmodelingobjectproperty_cast<QUmlParameterableElement *>(ownedActual));
+    qmodelingelementproperty_cast<QUmlTemplateParameterSubstitution *>(this)->setOwnedActual(qmodelingelementproperty_cast<QUmlParameterableElement *>(ownedActual));
 }
 
 void QUmlTemplateParameterSubstitutionObject::setTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateParameterSubstitution *>(this)->setTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlTemplateParameterSubstitution *>(this)->setTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
+}
+
+
+void QUmlTemplateParameterSubstitutionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateParameterSubstitution");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateParameterSubstitution"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("actual"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateParameterSubstitution"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("formal"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateParameterSubstitution"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedActual"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateParameterSubstitution"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBinding"))));
+}
+
+void QUmlTemplateParameterSubstitutionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameterSubstitution, actual, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameterSubstitution, actual, PropertyClassRole, QStringLiteral("QUmlTemplateParameterSubstitution"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameterSubstitution, actual, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameterSubstitution, actual, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameterSubstitution, actual, DocumentationRole, QStringLiteral("The element that is the actual parameter for this substitution."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameterSubstitution, actual, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameterSubstitution, actual, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameterSubstitution, actual, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameterSubstitution, formal, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameterSubstitution, formal, PropertyClassRole, QStringLiteral("QUmlTemplateParameterSubstitution"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameterSubstitution, formal, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameterSubstitution, formal, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameterSubstitution, formal, DocumentationRole, QStringLiteral("The formal template parameter that is associated with this substitution."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameterSubstitution, formal, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameterSubstitution, formal, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameterSubstitution, formal, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameterSubstitution, ownedActual, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameterSubstitution, ownedActual, PropertyClassRole, QStringLiteral("QUmlTemplateParameterSubstitution"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameterSubstitution, ownedActual, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameterSubstitution, ownedActual, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameterSubstitution, ownedActual, DocumentationRole, QStringLiteral("The actual parameter that is owned by this substitution."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameterSubstitution, ownedActual, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameterSubstitution, ownedActual, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement TemplateParameterSubstitution-actual"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameterSubstitution, ownedActual, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameterSubstitution, templateBinding, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameterSubstitution, templateBinding, PropertyClassRole, QStringLiteral("QUmlTemplateParameterSubstitution"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameterSubstitution, templateBinding, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameterSubstitution, templateBinding, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameterSubstitution, templateBinding, DocumentationRole, QStringLiteral("The optional bindings from this element to templates."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameterSubstitution, templateBinding, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameterSubstitution, templateBinding, SubsettedPropertiesRole, QStringLiteral("Element-owner"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateParameterSubstitution, templateBinding, OppositeEndRole, QStringLiteral("TemplateBinding-parameterSubstitution"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumltemplateparametersubstitutionobject_p.h b/src/uml/qobjects/qumltemplateparametersubstitutionobject_p.h
index dc69699c..cab81993 100644
--- a/src/uml/qobjects/qumltemplateparametersubstitutionobject_p.h
+++ b/src/uml/qobjects/qumltemplateparametersubstitutionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 QT_BEGIN_HEADER
 
@@ -52,9 +52,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlTemplateParameterSubstitution;
-class Q_UML_EXPORT QUmlTemplateParameterSubstitutionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlTemplateParameterSubstitutionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlTemplateParameterSubstitutionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -68,7 +71,7 @@ class Q_UML_EXPORT QUmlTemplateParameterSubstitutionObject : public QObject
     Q_PROPERTY(QObject * templateBinding READ templateBinding WRITE setTemplateBinding)
 
 public:
-    Q_INVOKABLE explicit QUmlTemplateParameterSubstitutionObject(QUmlTemplateParameterSubstitution *qModelingObject);
+    Q_INVOKABLE explicit QUmlTemplateParameterSubstitutionObject(QUmlTemplateParameterSubstitution *qModelingElement);
     virtual ~QUmlTemplateParameterSubstitutionObject();
 
     // Owned attributes [Element]
@@ -100,6 +103,10 @@ public Q_SLOTS:
     void setFormal(QObject *formal = 0);
     void setOwnedActual(QObject *ownedActual = 0);
     void setTemplateBinding(QObject *templateBinding = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumltemplatesignatureobject.cpp b/src/uml/qobjects/qumltemplatesignatureobject.cpp
index 2a76be47..e6a65a00 100644
--- a/src/uml/qobjects/qumltemplatesignatureobject.cpp
+++ b/src/uml/qobjects/qumltemplatesignatureobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumltemplatesignatureobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlTemplateSignature>
 #include <QtUml/QUmlComment>
@@ -48,16 +49,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlTemplateSignatureObject::QUmlTemplateSignatureObject(QUmlTemplateSignature *qModelingObject)
+QUmlTemplateSignatureObject::QUmlTemplateSignatureObject(QUmlTemplateSignature *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlTemplateSignatureObject::~QUmlTemplateSignatureObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlTemplateSignature *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlTemplateSignature *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -66,25 +69,25 @@ QUmlTemplateSignatureObject::~QUmlTemplateSignatureObject()
 const QSet<QObject *> QUmlTemplateSignatureObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlTemplateSignature *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlTemplateSignature *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlTemplateSignatureObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlTemplateSignature *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlTemplateSignature *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlTemplateSignatureObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTemplateSignature *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlTemplateSignature *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTemplateSignature *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTemplateSignature *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [TemplateSignature]
@@ -92,25 +95,25 @@ QObject *QUmlTemplateSignatureObject::owner() const
 const QList<QObject *> QUmlTemplateSignatureObject::ownedParameters() const
 {
     QList<QObject *> list;
-    foreach (QUmlTemplateParameter *element, qmodelingobjectproperty_cast<QUmlTemplateSignature *>(this)->ownedParameters())
-        list.append(element->asQObject());
+    foreach (QUmlTemplateParameter *element, qmodelingelementproperty_cast<QUmlTemplateSignature *>(this)->ownedParameters())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 const QList<QObject *> QUmlTemplateSignatureObject::parameters() const
 {
     QList<QObject *> list;
-    foreach (QUmlTemplateParameter *element, qmodelingobjectproperty_cast<QUmlTemplateSignature *>(this)->parameters())
-        list.append(element->asQObject());
+    foreach (QUmlTemplateParameter *element, qmodelingelementproperty_cast<QUmlTemplateSignature *>(this)->parameters())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 QObject *QUmlTemplateSignatureObject::template_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTemplateSignature *>(this)->template_())
+    if (!qmodelingelementproperty_cast<QUmlTemplateSignature *>(this)->template_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTemplateSignature *>(this)->template_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTemplateSignature *>(this)->template_()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -118,68 +121,119 @@ QObject *QUmlTemplateSignatureObject::template_() const
 QSet<QObject *> QUmlTemplateSignatureObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlTemplateSignature *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlTemplateSignature *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlTemplateSignatureObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlTemplateSignature *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlTemplateSignature *>(this)->mustBeOwned();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlTemplateSignatureObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateSignature *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlTemplateSignature *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlTemplateSignatureObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateSignature *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlTemplateSignature *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlTemplateSignatureObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateSignature *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlTemplateSignature *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlTemplateSignatureObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateSignature *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlTemplateSignature *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlTemplateSignatureObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateSignature *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlTemplateSignature *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateSignature]
 
 void QUmlTemplateSignatureObject::addOwnedParameter(QObject *ownedParameter)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateSignature *>(this)->addOwnedParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(ownedParameter));
+    qmodelingelementproperty_cast<QUmlTemplateSignature *>(this)->addOwnedParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(ownedParameter));
 }
 
 void QUmlTemplateSignatureObject::removeOwnedParameter(QObject *ownedParameter)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateSignature *>(this)->removeOwnedParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(ownedParameter));
+    qmodelingelementproperty_cast<QUmlTemplateSignature *>(this)->removeOwnedParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(ownedParameter));
 }
 
 void QUmlTemplateSignatureObject::addParameter(QObject *parameter)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateSignature *>(this)->addParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(parameter));
+    qmodelingelementproperty_cast<QUmlTemplateSignature *>(this)->addParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(parameter));
 }
 
 void QUmlTemplateSignatureObject::removeParameter(QObject *parameter)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateSignature *>(this)->removeParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(parameter));
+    qmodelingelementproperty_cast<QUmlTemplateSignature *>(this)->removeParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(parameter));
 }
 
 void QUmlTemplateSignatureObject::setTemplate(QObject *template_)
 {
-    qmodelingobjectproperty_cast<QUmlTemplateSignature *>(this)->setTemplate(qmodelingobjectproperty_cast<QUmlTemplateableElement *>(template_));
+    qmodelingelementproperty_cast<QUmlTemplateSignature *>(this)->setTemplate(qmodelingelementproperty_cast<QUmlTemplateableElement *>(template_));
+}
+
+
+void QUmlTemplateSignatureObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateSignature");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateSignature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameters"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateSignature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parameters"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateSignature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("template_"))));
+}
+
+void QUmlTemplateSignatureObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateSignature, ownedParameters, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateSignature, ownedParameters, PropertyClassRole, QStringLiteral("QUmlTemplateSignature"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateSignature, ownedParameters, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateSignature, ownedParameters, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateSignature, ownedParameters, DocumentationRole, QStringLiteral("The formal template parameters that are owned by this template signature."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateSignature, ownedParameters, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateSignature, ownedParameters, SubsettedPropertiesRole, QStringLiteral("TemplateSignature-parameter Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateSignature, ownedParameters, OppositeEndRole, QStringLiteral("TemplateParameter-signature"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateSignature, parameters, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateSignature, parameters, PropertyClassRole, QStringLiteral("QUmlTemplateSignature"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateSignature, parameters, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateSignature, parameters, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateSignature, parameters, DocumentationRole, QStringLiteral("The ordered set of all formal template parameters for this template signature."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateSignature, parameters, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateSignature, parameters, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateSignature, parameters, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateSignature, template_, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateSignature, template_, PropertyClassRole, QStringLiteral("QUmlTemplateSignature"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateSignature, template_, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateSignature, template_, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateSignature, template_, DocumentationRole, QStringLiteral("The element that owns this template signature."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateSignature, template_, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateSignature, template_, SubsettedPropertiesRole, QStringLiteral("Element-owner"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTemplateSignature, template_, OppositeEndRole, QStringLiteral("TemplateableElement-ownedTemplateSignature"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumltemplatesignatureobject_p.h b/src/uml/qobjects/qumltemplatesignatureobject_p.h
index 1e094a6c..0a8dd641 100644
--- a/src/uml/qobjects/qumltemplatesignatureobject_p.h
+++ b/src/uml/qobjects/qumltemplatesignatureobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 QT_BEGIN_HEADER
 
@@ -52,9 +52,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlTemplateSignature;
-class Q_UML_EXPORT QUmlTemplateSignatureObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlTemplateSignatureObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlTemplateSignatureObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -67,7 +70,7 @@ class Q_UML_EXPORT QUmlTemplateSignatureObject : public QObject
     Q_PROPERTY(QObject * template_ READ template_ WRITE setTemplate)
 
 public:
-    Q_INVOKABLE explicit QUmlTemplateSignatureObject(QUmlTemplateSignature *qModelingObject);
+    Q_INVOKABLE explicit QUmlTemplateSignatureObject(QUmlTemplateSignature *qModelingElement);
     virtual ~QUmlTemplateSignatureObject();
 
     // Owned attributes [Element]
@@ -99,6 +102,10 @@ public Q_SLOTS:
     void addParameter(QObject *parameter);
     void removeParameter(QObject *parameter);
     void setTemplate(QObject *template_ = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumltestidentityactionobject.cpp b/src/uml/qobjects/qumltestidentityactionobject.cpp
index ccee3bac..40ec47c8 100644
--- a/src/uml/qobjects/qumltestidentityactionobject.cpp
+++ b/src/uml/qobjects/qumltestidentityactionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumltestidentityactionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlTestIdentityAction>
 #include <QtUml/QUmlActivity>
@@ -64,16 +65,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlTestIdentityActionObject::QUmlTestIdentityActionObject(QUmlTestIdentityAction *qModelingObject)
+QUmlTestIdentityActionObject::QUmlTestIdentityActionObject(QUmlTestIdentityAction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlTestIdentityActionObject::~QUmlTestIdentityActionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -82,25 +85,25 @@ QUmlTestIdentityActionObject::~QUmlTestIdentityActionObject()
 const QSet<QObject *> QUmlTestIdentityActionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlTestIdentityActionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlTestIdentityActionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -108,62 +111,62 @@ QObject *QUmlTestIdentityActionObject::owner() const
 const QSet<QObject *> QUmlTestIdentityActionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlTestIdentityActionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->name();
 }
 
 QObject *QUmlTestIdentityActionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlTestIdentityActionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlTestIdentityActionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlTestIdentityActionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlTestIdentityActionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlTestIdentityActionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlTestIdentityActionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -171,65 +174,65 @@ const QSet<QObject *> QUmlTestIdentityActionObject::redefinitionContexts() const
 
 QObject *QUmlTestIdentityActionObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlTestIdentityActionObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlTestIdentityActionObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlTestIdentityActionObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlTestIdentityActionObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlTestIdentityActionObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlTestIdentityActionObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlTestIdentityActionObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -238,8 +241,8 @@ const QSet<QObject *> QUmlTestIdentityActionObject::redefinedNodes() const
 const QSet<QObject *> QUmlTestIdentityActionObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -247,46 +250,46 @@ const QSet<QObject *> QUmlTestIdentityActionObject::handlers() const
 
 QObject *QUmlTestIdentityActionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlTestIdentityActionObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlTestIdentityActionObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlTestIdentityActionObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlTestIdentityActionObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlTestIdentityActionObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -294,26 +297,26 @@ const QList<QObject *> QUmlTestIdentityActionObject::outputs() const
 
 QObject *QUmlTestIdentityActionObject::first() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->first())
+    if (!qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->first())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->first()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->first()->asQModelingObject();
 }
 
 QObject *QUmlTestIdentityActionObject::result() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->result())
+    if (!qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->result())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->result()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->result()->asQModelingObject();
 }
 
 QObject *QUmlTestIdentityActionObject::second() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->second())
+    if (!qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->second())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->second()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->second()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -321,14 +324,14 @@ QObject *QUmlTestIdentityActionObject::second() const
 QSet<QObject *> QUmlTestIdentityActionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlTestIdentityActionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -336,293 +339,380 @@ bool QUmlTestIdentityActionObject::mustBeOwned() const
 QList<QObject *> QUmlTestIdentityActionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlTestIdentityActionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlTestIdentityActionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlTestIdentityActionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlTestIdentityActionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlTestIdentityActionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlTestIdentityActionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlTestIdentityActionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlTestIdentityActionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlTestIdentityActionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlTestIdentityActionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlTestIdentityActionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlTestIdentityActionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlTestIdentityActionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->setName(name);
 }
 
 void QUmlTestIdentityActionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlTestIdentityActionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlTestIdentityActionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlTestIdentityActionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlTestIdentityActionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlTestIdentityActionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlTestIdentityActionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlTestIdentityActionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlTestIdentityActionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlTestIdentityActionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlTestIdentityActionObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlTestIdentityActionObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlTestIdentityActionObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlTestIdentityActionObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlTestIdentityActionObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlTestIdentityActionObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlTestIdentityActionObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlTestIdentityActionObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlTestIdentityActionObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlTestIdentityActionObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlTestIdentityActionObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlTestIdentityActionObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlTestIdentityActionObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlTestIdentityActionObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlTestIdentityActionObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlTestIdentityActionObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlTestIdentityActionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlTestIdentityActionObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlTestIdentityActionObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlTestIdentityActionObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlTestIdentityActionObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlTestIdentityActionObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlTestIdentityActionObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlTestIdentityActionObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlTestIdentityActionObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlTestIdentityActionObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlTestIdentityActionObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TestIdentityAction]
 
 void QUmlTestIdentityActionObject::setFirst(QObject *first)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->setFirst(qmodelingobjectproperty_cast<QUmlInputPin *>(first));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->setFirst(qmodelingelementproperty_cast<QUmlInputPin *>(first));
 }
 
 void QUmlTestIdentityActionObject::setResult(QObject *result)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->setResult(qmodelingobjectproperty_cast<QUmlOutputPin *>(result));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->setResult(qmodelingelementproperty_cast<QUmlOutputPin *>(result));
 }
 
 void QUmlTestIdentityActionObject::setSecond(QObject *second)
 {
-    qmodelingobjectproperty_cast<QUmlTestIdentityAction *>(this)->setSecond(qmodelingobjectproperty_cast<QUmlInputPin *>(second));
+    qmodelingelementproperty_cast<QUmlTestIdentityAction *>(this)->setSecond(qmodelingelementproperty_cast<QUmlInputPin *>(second));
+}
+
+
+void QUmlTestIdentityActionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTestIdentityAction");
+    d->groupProperties.insert(QStringLiteral("QUmlTestIdentityAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("first"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTestIdentityAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("result"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTestIdentityAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("second"))));
+}
+
+void QUmlTestIdentityActionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTestIdentityAction, first, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTestIdentityAction, first, PropertyClassRole, QStringLiteral("QUmlTestIdentityAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTestIdentityAction, first, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTestIdentityAction, first, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTestIdentityAction, first, DocumentationRole, QStringLiteral("Gives the pin on which an object is placed."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTestIdentityAction, first, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTestIdentityAction, first, SubsettedPropertiesRole, QStringLiteral("Action-input"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTestIdentityAction, first, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTestIdentityAction, result, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTestIdentityAction, result, PropertyClassRole, QStringLiteral("QUmlTestIdentityAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTestIdentityAction, result, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTestIdentityAction, result, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTestIdentityAction, result, DocumentationRole, QStringLiteral("Tells whether the two input objects are identical."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTestIdentityAction, result, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTestIdentityAction, result, SubsettedPropertiesRole, QStringLiteral("Action-output"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTestIdentityAction, result, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTestIdentityAction, second, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTestIdentityAction, second, PropertyClassRole, QStringLiteral("QUmlTestIdentityAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTestIdentityAction, second, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTestIdentityAction, second, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTestIdentityAction, second, DocumentationRole, QStringLiteral("Gives the pin on which an object is placed."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTestIdentityAction, second, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTestIdentityAction, second, SubsettedPropertiesRole, QStringLiteral("Action-input"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTestIdentityAction, second, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumltestidentityactionobject_p.h b/src/uml/qobjects/qumltestidentityactionobject_p.h
index 34a21e75..45c4519c 100644
--- a/src/uml/qobjects/qumltestidentityactionobject_p.h
+++ b/src/uml/qobjects/qumltestidentityactionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlTestIdentityAction;
-class Q_UML_EXPORT QUmlTestIdentityActionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlTestIdentityActionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlTestIdentityActionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -103,7 +106,7 @@ class Q_UML_EXPORT QUmlTestIdentityActionObject : public QObject
     Q_PROPERTY(QObject * second READ second WRITE setSecond)
 
 public:
-    Q_INVOKABLE explicit QUmlTestIdentityActionObject(QUmlTestIdentityAction *qModelingObject);
+    Q_INVOKABLE explicit QUmlTestIdentityActionObject(QUmlTestIdentityAction *qModelingElement);
     virtual ~QUmlTestIdentityActionObject();
 
     // Owned attributes [Element]
@@ -227,6 +230,10 @@ public Q_SLOTS:
     void setFirst(QObject *first = 0);
     void setResult(QObject *result = 0);
     void setSecond(QObject *second = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumltimeconstraintobject.cpp b/src/uml/qobjects/qumltimeconstraintobject.cpp
index ff7de8c2..7504c2b5 100644
--- a/src/uml/qobjects/qumltimeconstraintobject.cpp
+++ b/src/uml/qobjects/qumltimeconstraintobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumltimeconstraintobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlTimeConstraint>
 #include <QtUml/QUmlComment>
@@ -56,16 +57,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlTimeConstraintObject::QUmlTimeConstraintObject(QUmlTimeConstraint *qModelingObject)
+QUmlTimeConstraintObject::QUmlTimeConstraintObject(QUmlTimeConstraint *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlTimeConstraintObject::~QUmlTimeConstraintObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -74,43 +77,43 @@ QUmlTimeConstraintObject::~QUmlTimeConstraintObject()
 const QSet<QObject *> QUmlTimeConstraintObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlTimeConstraintObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlTimeConstraintObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlTimeConstraintObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlTimeConstraintObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -118,42 +121,42 @@ QObject *QUmlTimeConstraintObject::templateParameter() const
 const QSet<QObject *> QUmlTimeConstraintObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlTimeConstraintObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->name();
 }
 
 QObject *QUmlTimeConstraintObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlTimeConstraintObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlTimeConstraintObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlTimeConstraintObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Constraint]
@@ -161,32 +164,32 @@ QtUml::VisibilityKind QUmlTimeConstraintObject::visibility() const
 const QList<QObject *> QUmlTimeConstraintObject::constrainedElements() const
 {
     QList<QObject *> list;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->constrainedElements())
-        list.append(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->constrainedElements())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 QObject *QUmlTimeConstraintObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->context()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [TimeConstraint]
 
 bool QUmlTimeConstraintObject::firstEvent() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->firstEvent();
+    return qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->firstEvent();
 }
 
 QObject *QUmlTimeConstraintObject::specification() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->specification())
+    if (!qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->specification())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->specification()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->specification()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -194,26 +197,26 @@ QObject *QUmlTimeConstraintObject::specification() const
 QSet<QObject *> QUmlTimeConstraintObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlTimeConstraintObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlTimeConstraintObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlTimeConstraintObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [NamedElement]
@@ -221,142 +224,205 @@ bool QUmlTimeConstraintObject::isTemplateParameter() const
 QList<QObject *> QUmlTimeConstraintObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlTimeConstraintObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlTimeConstraintObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlTimeConstraintObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlTimeConstraintObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlTimeConstraintObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlTimeConstraintObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlTimeConstraintObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlTimeConstraintObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlTimeConstraintObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlTimeConstraintObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlTimeConstraintObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlTimeConstraintObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlTimeConstraintObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->setName(name);
 }
 
 void QUmlTimeConstraintObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlTimeConstraintObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlTimeConstraintObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlTimeConstraintObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->setVisibility(visibility);
 }
 
 void QUmlTimeConstraintObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Constraint]
 
 void QUmlTimeConstraintObject::addConstrainedElement(QObject *constrainedElement)
 {
-    qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->addConstrainedElement(qmodelingobjectproperty_cast<QUmlElement *>(constrainedElement));
+    qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->addConstrainedElement(qmodelingelementproperty_cast<QUmlElement *>(constrainedElement));
 }
 
 void QUmlTimeConstraintObject::removeConstrainedElement(QObject *constrainedElement)
 {
-    qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->removeConstrainedElement(qmodelingobjectproperty_cast<QUmlElement *>(constrainedElement));
+    qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->removeConstrainedElement(qmodelingelementproperty_cast<QUmlElement *>(constrainedElement));
 }
 
 void QUmlTimeConstraintObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->setContext(qmodelingobjectproperty_cast<QUmlNamespace *>(context));
+    qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->setContext(qmodelingelementproperty_cast<QUmlNamespace *>(context));
 }
 // SLOTS FOR OWNED ATTRIBUTES [TimeConstraint]
 
 void QUmlTimeConstraintObject::setFirstEvent(bool firstEvent)
 {
-    qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->setFirstEvent(firstEvent);
+    qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->setFirstEvent(firstEvent);
 }
 
 void QUmlTimeConstraintObject::unsetFirstEvent()
 {
-    qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("firstEvent"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("firstEvent"));
 }
 
 void QUmlTimeConstraintObject::setSpecification(QObject *specification)
 {
-    qmodelingobjectproperty_cast<QUmlTimeConstraint *>(this)->setSpecification(qmodelingobjectproperty_cast<QUmlTimeInterval *>(specification));
+    qmodelingelementproperty_cast<QUmlTimeConstraint *>(this)->setSpecification(qmodelingelementproperty_cast<QUmlTimeInterval *>(specification));
+}
+
+
+void QUmlTimeConstraintObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlConstraint");
+    d->groupProperties.insert(QStringLiteral("QUmlConstraint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("constrainedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlConstraint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+
+    d->propertyGroups << QStringLiteral("QUmlIntervalConstraint");
+
+    d->propertyGroups << QStringLiteral("QUmlTimeConstraint");
+    d->groupProperties.insert(QStringLiteral("QUmlTimeConstraint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("firstEvent"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTimeConstraint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("specification"))));
+}
+
+void QUmlTimeConstraintObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeConstraint, firstEvent, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeConstraint, firstEvent, PropertyClassRole, QStringLiteral("QUmlTimeConstraint"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeConstraint, firstEvent, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeConstraint, firstEvent, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeConstraint, firstEvent, DocumentationRole, QStringLiteral("The value of firstEvent is related to constrainedElement. If firstEvent is true, then the corresponding observation event is the first time instant the execution enters constrainedElement. If firstEvent is false, then the corresponding observation event is the last time instant the execution is within constrainedElement."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeConstraint, firstEvent, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeConstraint, firstEvent, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeConstraint, firstEvent, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeConstraint, specification, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeConstraint, specification, PropertyClassRole, QStringLiteral("QUmlTimeConstraint"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeConstraint, specification, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeConstraint, specification, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeConstraint, specification, DocumentationRole, QStringLiteral("A condition that must be true when evaluated in order for the constraint to be satisfied."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeConstraint, specification, RedefinedPropertiesRole, QStringLiteral("IntervalConstraint-specification"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeConstraint, specification, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeConstraint, specification, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumltimeconstraintobject_p.h b/src/uml/qobjects/qumltimeconstraintobject_p.h
index 06e43fc6..e3fb97d3 100644
--- a/src/uml/qobjects/qumltimeconstraintobject_p.h
+++ b/src/uml/qobjects/qumltimeconstraintobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlTimeConstraint;
-class Q_UML_EXPORT QUmlTimeConstraintObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlTimeConstraintObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlTimeConstraintObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -88,7 +91,7 @@ class Q_UML_EXPORT QUmlTimeConstraintObject : public QObject
     Q_PROPERTY(QObject * specification READ specification WRITE setSpecification)
 
 public:
-    Q_INVOKABLE explicit QUmlTimeConstraintObject(QUmlTimeConstraint *qModelingObject);
+    Q_INVOKABLE explicit QUmlTimeConstraintObject(QUmlTimeConstraint *qModelingElement);
     virtual ~QUmlTimeConstraintObject();
 
     // Owned attributes [Element]
@@ -170,6 +173,10 @@ public Q_SLOTS:
     void setFirstEvent(bool firstEvent);
     void unsetFirstEvent();
     void setSpecification(QObject *specification = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumltimeeventobject.cpp b/src/uml/qobjects/qumltimeeventobject.cpp
index ddc8b3ed..70c7f9cb 100644
--- a/src/uml/qobjects/qumltimeeventobject.cpp
+++ b/src/uml/qobjects/qumltimeeventobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumltimeeventobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlTimeEvent>
 #include <QtUml/QUmlComment>
@@ -54,16 +55,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlTimeEventObject::QUmlTimeEventObject(QUmlTimeEvent *qModelingObject)
+QUmlTimeEventObject::QUmlTimeEventObject(QUmlTimeEvent *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlTimeEventObject::~QUmlTimeEventObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -72,43 +75,43 @@ QUmlTimeEventObject::~QUmlTimeEventObject()
 const QSet<QObject *> QUmlTimeEventObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlTimeEventObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlTimeEventObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlTimeEventObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlTimeEventObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -116,57 +119,57 @@ QObject *QUmlTimeEventObject::templateParameter() const
 const QSet<QObject *> QUmlTimeEventObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlTimeEventObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->name();
 }
 
 QObject *QUmlTimeEventObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlTimeEventObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlTimeEventObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlTimeEventObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [TimeEvent]
 
 bool QUmlTimeEventObject::isRelative() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->isRelative();
+    return qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->isRelative();
 }
 
 QObject *QUmlTimeEventObject::when() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->when())
+    if (!qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->when())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->when()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->when()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -174,26 +177,26 @@ QObject *QUmlTimeEventObject::when() const
 QSet<QObject *> QUmlTimeEventObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlTimeEventObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlTimeEventObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlTimeEventObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [NamedElement]
@@ -201,126 +204,185 @@ bool QUmlTimeEventObject::isTemplateParameter() const
 QList<QObject *> QUmlTimeEventObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlTimeEventObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlTimeEventObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlTimeEventObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlTimeEventObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlTimeEventObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlTimeEventObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlTimeEventObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlTimeEventObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlTimeEventObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlTimeEventObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlTimeEventObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlTimeEventObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlTimeEventObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->setName(name);
 }
 
 void QUmlTimeEventObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlTimeEventObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlTimeEventObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlTimeEventObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->setVisibility(visibility);
 }
 
 void QUmlTimeEventObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TimeEvent]
 
 void QUmlTimeEventObject::setRelative(bool isRelative)
 {
-    qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->setRelative(isRelative);
+    qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->setRelative(isRelative);
 }
 
 void QUmlTimeEventObject::unsetRelative()
 {
-    qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("relative"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("relative"));
 }
 
 void QUmlTimeEventObject::setWhen(QObject *when)
 {
-    qmodelingobjectproperty_cast<QUmlTimeEvent *>(this)->setWhen(qmodelingobjectproperty_cast<QUmlTimeExpression *>(when));
+    qmodelingelementproperty_cast<QUmlTimeEvent *>(this)->setWhen(qmodelingelementproperty_cast<QUmlTimeExpression *>(when));
+}
+
+
+void QUmlTimeEventObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlEvent");
+
+    d->propertyGroups << QStringLiteral("QUmlTimeEvent");
+    d->groupProperties.insert(QStringLiteral("QUmlTimeEvent"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isRelative"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTimeEvent"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("when"))));
+}
+
+void QUmlTimeEventObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeEvent, isRelative, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeEvent, isRelative, PropertyClassRole, QStringLiteral("QUmlTimeEvent"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeEvent, isRelative, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeEvent, isRelative, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeEvent, isRelative, DocumentationRole, QStringLiteral("Specifies whether it is relative or absolute time."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeEvent, isRelative, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeEvent, isRelative, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeEvent, isRelative, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeEvent, when, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeEvent, when, PropertyClassRole, QStringLiteral("QUmlTimeEvent"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeEvent, when, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeEvent, when, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeEvent, when, DocumentationRole, QStringLiteral("Specifies the corresponding time deadline."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeEvent, when, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeEvent, when, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeEvent, when, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumltimeeventobject_p.h b/src/uml/qobjects/qumltimeeventobject_p.h
index 0fc0d906..75a6539a 100644
--- a/src/uml/qobjects/qumltimeeventobject_p.h
+++ b/src/uml/qobjects/qumltimeeventobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlTimeEvent;
-class Q_UML_EXPORT QUmlTimeEventObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlTimeEventObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlTimeEventObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -82,7 +85,7 @@ class Q_UML_EXPORT QUmlTimeEventObject : public QObject
     Q_PROPERTY(QObject * when READ when WRITE setWhen)
 
 public:
-    Q_INVOKABLE explicit QUmlTimeEventObject(QUmlTimeEvent *qModelingObject);
+    Q_INVOKABLE explicit QUmlTimeEventObject(QUmlTimeEvent *qModelingElement);
     virtual ~QUmlTimeEventObject();
 
     // Owned attributes [Element]
@@ -151,6 +154,10 @@ public Q_SLOTS:
     void setRelative(bool isRelative);
     void unsetRelative();
     void setWhen(QObject *when = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumltimeexpressionobject.cpp b/src/uml/qobjects/qumltimeexpressionobject.cpp
index c40acee3..22f12c11 100644
--- a/src/uml/qobjects/qumltimeexpressionobject.cpp
+++ b/src/uml/qobjects/qumltimeexpressionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumltimeexpressionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlTimeExpression>
 #include <QtUml/QUmlComment>
@@ -56,16 +57,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlTimeExpressionObject::QUmlTimeExpressionObject(QUmlTimeExpression *qModelingObject)
+QUmlTimeExpressionObject::QUmlTimeExpressionObject(QUmlTimeExpression *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlTimeExpressionObject::~QUmlTimeExpressionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -74,25 +77,25 @@ QUmlTimeExpressionObject::~QUmlTimeExpressionObject()
 const QSet<QObject *> QUmlTimeExpressionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlTimeExpressionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlTimeExpressionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -100,87 +103,87 @@ QObject *QUmlTimeExpressionObject::owner() const
 const QSet<QObject *> QUmlTimeExpressionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlTimeExpressionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->name();
 }
 
 QObject *QUmlTimeExpressionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlTimeExpressionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlTimeExpressionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [TypedElement]
 
 QObject *QUmlTimeExpressionObject::type() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->type())
+    if (!qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->type())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->type()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->type()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlTimeExpressionObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlTimeExpressionObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlTimeExpressionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [TimeExpression]
 
 QObject *QUmlTimeExpressionObject::expr() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->expr())
+    if (!qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->expr())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->expr()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->expr()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlTimeExpressionObject::observations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlObservation *element, qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->observations())
-        set.insert(element->asQObject());
+    foreach (QUmlObservation *element, qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->observations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -189,14 +192,14 @@ const QSet<QObject *> QUmlTimeExpressionObject::observations() const
 QSet<QObject *> QUmlTimeExpressionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlTimeExpressionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -204,182 +207,243 @@ bool QUmlTimeExpressionObject::mustBeOwned() const
 QList<QObject *> QUmlTimeExpressionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlTimeExpressionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlTimeExpressionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlTimeExpressionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->separator();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlTimeExpressionObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [ValueSpecification]
 
 bool QUmlTimeExpressionObject::booleanValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->booleanValue();
+    return qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->booleanValue();
 }
 
 int QUmlTimeExpressionObject::integerValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->integerValue();
+    return qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->integerValue();
 }
 
 bool QUmlTimeExpressionObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlTimeExpressionObject::isComputable() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->isComputable();
+    return qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->isComputable();
 }
 
 bool QUmlTimeExpressionObject::isNull() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->isNull();
+    return qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->isNull();
 }
 
 double QUmlTimeExpressionObject::realValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->realValue();
+    return qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->realValue();
 }
 
 QString QUmlTimeExpressionObject::stringValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->stringValue();
+    return qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->stringValue();
 }
 
 int QUmlTimeExpressionObject::unlimitedValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->unlimitedValue();
+    return qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->unlimitedValue();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlTimeExpressionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlTimeExpressionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlTimeExpressionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlTimeExpressionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlTimeExpressionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlTimeExpressionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlTimeExpressionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlTimeExpressionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->setName(name);
 }
 
 void QUmlTimeExpressionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlTimeExpressionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlTimeExpressionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [TypedElement]
 
 void QUmlTimeExpressionObject::setType(QObject *type)
 {
-    qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->setType(qmodelingobjectproperty_cast<QUmlType *>(type));
+    qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->setType(qmodelingelementproperty_cast<QUmlType *>(type));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlTimeExpressionObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlTimeExpressionObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlTimeExpressionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->setVisibility(visibility);
 }
 
 void QUmlTimeExpressionObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TimeExpression]
 
 void QUmlTimeExpressionObject::setExpr(QObject *expr)
 {
-    qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->setExpr(qmodelingobjectproperty_cast<QUmlValueSpecification *>(expr));
+    qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->setExpr(qmodelingelementproperty_cast<QUmlValueSpecification *>(expr));
 }
 
 void QUmlTimeExpressionObject::addObservation(QObject *observation)
 {
-    qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->addObservation(qmodelingobjectproperty_cast<QUmlObservation *>(observation));
+    qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->addObservation(qmodelingelementproperty_cast<QUmlObservation *>(observation));
 }
 
 void QUmlTimeExpressionObject::removeObservation(QObject *observation)
 {
-    qmodelingobjectproperty_cast<QUmlTimeExpression *>(this)->removeObservation(qmodelingobjectproperty_cast<QUmlObservation *>(observation));
+    qmodelingelementproperty_cast<QUmlTimeExpression *>(this)->removeObservation(qmodelingelementproperty_cast<QUmlObservation *>(observation));
+}
+
+
+void QUmlTimeExpressionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTypedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlValueSpecification");
+
+    d->propertyGroups << QStringLiteral("QUmlTimeExpression");
+    d->groupProperties.insert(QStringLiteral("QUmlTimeExpression"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("expr"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTimeExpression"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("observations"))));
+}
+
+void QUmlTimeExpressionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeExpression, expr, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeExpression, expr, PropertyClassRole, QStringLiteral("QUmlTimeExpression"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeExpression, expr, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeExpression, expr, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeExpression, expr, DocumentationRole, QStringLiteral("The value of the time expression."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeExpression, expr, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeExpression, expr, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeExpression, expr, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeExpression, observations, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeExpression, observations, PropertyClassRole, QStringLiteral("QUmlTimeExpression"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeExpression, observations, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeExpression, observations, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeExpression, observations, DocumentationRole, QStringLiteral("Refers to the time and duration observations that are involved in expr."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeExpression, observations, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeExpression, observations, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeExpression, observations, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumltimeexpressionobject_p.h b/src/uml/qobjects/qumltimeexpressionobject_p.h
index 0c69ff9e..50ff9a86 100644
--- a/src/uml/qobjects/qumltimeexpressionobject_p.h
+++ b/src/uml/qobjects/qumltimeexpressionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlTimeExpression;
-class Q_UML_EXPORT QUmlTimeExpressionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlTimeExpressionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlTimeExpressionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -85,7 +88,7 @@ class Q_UML_EXPORT QUmlTimeExpressionObject : public QObject
     Q_PROPERTY(QSet<QObject *> observations READ observations)
 
 public:
-    Q_INVOKABLE explicit QUmlTimeExpressionObject(QUmlTimeExpression *qModelingObject);
+    Q_INVOKABLE explicit QUmlTimeExpressionObject(QUmlTimeExpression *qModelingElement);
     virtual ~QUmlTimeExpressionObject();
 
     // Owned attributes [Element]
@@ -169,6 +172,10 @@ public Q_SLOTS:
     void setExpr(QObject *expr = 0);
     void addObservation(QObject *observation);
     void removeObservation(QObject *observation);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumltimeintervalobject.cpp b/src/uml/qobjects/qumltimeintervalobject.cpp
index 1d374708..ee8bd902 100644
--- a/src/uml/qobjects/qumltimeintervalobject.cpp
+++ b/src/uml/qobjects/qumltimeintervalobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumltimeintervalobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlTimeInterval>
 #include <QtUml/QUmlComment>
@@ -56,16 +57,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlTimeIntervalObject::QUmlTimeIntervalObject(QUmlTimeInterval *qModelingObject)
+QUmlTimeIntervalObject::QUmlTimeIntervalObject(QUmlTimeInterval *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlTimeIntervalObject::~QUmlTimeIntervalObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -74,25 +77,25 @@ QUmlTimeIntervalObject::~QUmlTimeIntervalObject()
 const QSet<QObject *> QUmlTimeIntervalObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlTimeIntervalObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlTimeIntervalObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -100,88 +103,88 @@ QObject *QUmlTimeIntervalObject::owner() const
 const QSet<QObject *> QUmlTimeIntervalObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlTimeIntervalObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->name();
 }
 
 QObject *QUmlTimeIntervalObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlTimeIntervalObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlTimeIntervalObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [TypedElement]
 
 QObject *QUmlTimeIntervalObject::type() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->type())
+    if (!qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->type())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->type()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->type()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlTimeIntervalObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlTimeIntervalObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlTimeIntervalObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [TimeInterval]
 
 QObject *QUmlTimeIntervalObject::max() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->max())
+    if (!qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->max())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->max()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->max()->asQModelingObject();
 }
 
 QObject *QUmlTimeIntervalObject::min() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->min())
+    if (!qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->min())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->min()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->min()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -189,14 +192,14 @@ QObject *QUmlTimeIntervalObject::min() const
 QSet<QObject *> QUmlTimeIntervalObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlTimeIntervalObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -204,177 +207,240 @@ bool QUmlTimeIntervalObject::mustBeOwned() const
 QList<QObject *> QUmlTimeIntervalObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlTimeIntervalObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlTimeIntervalObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlTimeIntervalObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->separator();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlTimeIntervalObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [ValueSpecification]
 
 bool QUmlTimeIntervalObject::booleanValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->booleanValue();
+    return qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->booleanValue();
 }
 
 int QUmlTimeIntervalObject::integerValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->integerValue();
+    return qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->integerValue();
 }
 
 bool QUmlTimeIntervalObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlTimeIntervalObject::isComputable() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->isComputable();
+    return qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->isComputable();
 }
 
 bool QUmlTimeIntervalObject::isNull() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->isNull();
+    return qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->isNull();
 }
 
 double QUmlTimeIntervalObject::realValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->realValue();
+    return qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->realValue();
 }
 
 QString QUmlTimeIntervalObject::stringValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->stringValue();
+    return qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->stringValue();
 }
 
 int QUmlTimeIntervalObject::unlimitedValue() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->unlimitedValue();
+    return qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->unlimitedValue();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlTimeIntervalObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlTimeIntervalObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlTimeIntervalObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlTimeIntervalObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlTimeIntervalObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlTimeIntervalObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlTimeIntervalObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlTimeIntervalObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->setName(name);
 }
 
 void QUmlTimeIntervalObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlTimeIntervalObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlTimeIntervalObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [TypedElement]
 
 void QUmlTimeIntervalObject::setType(QObject *type)
 {
-    qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->setType(qmodelingobjectproperty_cast<QUmlType *>(type));
+    qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->setType(qmodelingelementproperty_cast<QUmlType *>(type));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlTimeIntervalObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlTimeIntervalObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlTimeIntervalObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->setVisibility(visibility);
 }
 
 void QUmlTimeIntervalObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TimeInterval]
 
 void QUmlTimeIntervalObject::setMax(QObject *max)
 {
-    qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->setMax(qmodelingobjectproperty_cast<QUmlTimeExpression *>(max));
+    qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->setMax(qmodelingelementproperty_cast<QUmlTimeExpression *>(max));
 }
 
 void QUmlTimeIntervalObject::setMin(QObject *min)
 {
-    qmodelingobjectproperty_cast<QUmlTimeInterval *>(this)->setMin(qmodelingobjectproperty_cast<QUmlTimeExpression *>(min));
+    qmodelingelementproperty_cast<QUmlTimeInterval *>(this)->setMin(qmodelingelementproperty_cast<QUmlTimeExpression *>(min));
+}
+
+
+void QUmlTimeIntervalObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTypedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlValueSpecification");
+
+    d->propertyGroups << QStringLiteral("QUmlInterval");
+
+    d->propertyGroups << QStringLiteral("QUmlTimeInterval");
+    d->groupProperties.insert(QStringLiteral("QUmlTimeInterval"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("max"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTimeInterval"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("min"))));
+}
+
+void QUmlTimeIntervalObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeInterval, max, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeInterval, max, PropertyClassRole, QStringLiteral("QUmlTimeInterval"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeInterval, max, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeInterval, max, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeInterval, max, DocumentationRole, QStringLiteral("Refers to the TimeExpression denoting the maximum value of the range."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeInterval, max, RedefinedPropertiesRole, QStringLiteral("Interval-max"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeInterval, max, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeInterval, max, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeInterval, min, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeInterval, min, PropertyClassRole, QStringLiteral("QUmlTimeInterval"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeInterval, min, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeInterval, min, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeInterval, min, DocumentationRole, QStringLiteral("Refers to the TimeExpression denoting the minimum value of the range."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeInterval, min, RedefinedPropertiesRole, QStringLiteral("Interval-min"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeInterval, min, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeInterval, min, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumltimeintervalobject_p.h b/src/uml/qobjects/qumltimeintervalobject_p.h
index 5b930c3c..2ac8ecad 100644
--- a/src/uml/qobjects/qumltimeintervalobject_p.h
+++ b/src/uml/qobjects/qumltimeintervalobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlTimeInterval;
-class Q_UML_EXPORT QUmlTimeIntervalObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlTimeIntervalObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlTimeIntervalObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -87,7 +90,7 @@ class Q_UML_EXPORT QUmlTimeIntervalObject : public QObject
     Q_PROPERTY(QObject * min READ min WRITE setMin)
 
 public:
-    Q_INVOKABLE explicit QUmlTimeIntervalObject(QUmlTimeInterval *qModelingObject);
+    Q_INVOKABLE explicit QUmlTimeIntervalObject(QUmlTimeInterval *qModelingElement);
     virtual ~QUmlTimeIntervalObject();
 
     // Owned attributes [Element]
@@ -174,6 +177,10 @@ public Q_SLOTS:
     // Slots for owned attributes [TimeInterval]
     void setMax(QObject *max = 0);
     void setMin(QObject *min = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumltimeobservationobject.cpp b/src/uml/qobjects/qumltimeobservationobject.cpp
index b4422a89..8012e77b 100644
--- a/src/uml/qobjects/qumltimeobservationobject.cpp
+++ b/src/uml/qobjects/qumltimeobservationobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumltimeobservationobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlTimeObservation>
 #include <QtUml/QUmlComment>
@@ -53,16 +54,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlTimeObservationObject::QUmlTimeObservationObject(QUmlTimeObservation *qModelingObject)
+QUmlTimeObservationObject::QUmlTimeObservationObject(QUmlTimeObservation *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlTimeObservationObject::~QUmlTimeObservationObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -71,43 +74,43 @@ QUmlTimeObservationObject::~QUmlTimeObservationObject()
 const QSet<QObject *> QUmlTimeObservationObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlTimeObservationObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlTimeObservationObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlTimeObservationObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlTimeObservationObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -115,57 +118,57 @@ QObject *QUmlTimeObservationObject::templateParameter() const
 const QSet<QObject *> QUmlTimeObservationObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlTimeObservationObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->name();
 }
 
 QObject *QUmlTimeObservationObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlTimeObservationObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlTimeObservationObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlTimeObservationObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [TimeObservation]
 
 QObject *QUmlTimeObservationObject::event() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->event())
+    if (!qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->event())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->event()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->event()->asQModelingObject();
 }
 
 bool QUmlTimeObservationObject::firstEvent() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->firstEvent();
+    return qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->firstEvent();
 }
 
 // OPERATIONS [Element]
@@ -173,26 +176,26 @@ bool QUmlTimeObservationObject::firstEvent() const
 QSet<QObject *> QUmlTimeObservationObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlTimeObservationObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlTimeObservationObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlTimeObservationObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [NamedElement]
@@ -200,126 +203,185 @@ bool QUmlTimeObservationObject::isTemplateParameter() const
 QList<QObject *> QUmlTimeObservationObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlTimeObservationObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlTimeObservationObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlTimeObservationObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlTimeObservationObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlTimeObservationObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlTimeObservationObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlTimeObservationObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlTimeObservationObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlTimeObservationObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlTimeObservationObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlTimeObservationObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlTimeObservationObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlTimeObservationObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->setName(name);
 }
 
 void QUmlTimeObservationObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlTimeObservationObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlTimeObservationObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlTimeObservationObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->setVisibility(visibility);
 }
 
 void QUmlTimeObservationObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TimeObservation]
 
 void QUmlTimeObservationObject::setEvent(QObject *event)
 {
-    qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->setEvent(qmodelingobjectproperty_cast<QUmlNamedElement *>(event));
+    qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->setEvent(qmodelingelementproperty_cast<QUmlNamedElement *>(event));
 }
 
 void QUmlTimeObservationObject::setFirstEvent(bool firstEvent)
 {
-    qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->setFirstEvent(firstEvent);
+    qmodelingelementproperty_cast<QUmlTimeObservation *>(this)->setFirstEvent(firstEvent);
 }
 
 void QUmlTimeObservationObject::unsetFirstEvent()
 {
-    qmodelingobjectproperty_cast<QUmlTimeObservation *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("firstEvent"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("firstEvent"));
+}
+
+
+void QUmlTimeObservationObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlObservation");
+
+    d->propertyGroups << QStringLiteral("QUmlTimeObservation");
+    d->groupProperties.insert(QStringLiteral("QUmlTimeObservation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("event"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTimeObservation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("firstEvent"))));
+}
+
+void QUmlTimeObservationObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeObservation, event, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeObservation, event, PropertyClassRole, QStringLiteral("QUmlTimeObservation"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeObservation, event, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeObservation, event, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeObservation, event, DocumentationRole, QStringLiteral("The observation is determined by the entering or exiting of the event element during execution."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeObservation, event, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeObservation, event, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeObservation, event, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeObservation, firstEvent, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeObservation, firstEvent, PropertyClassRole, QStringLiteral("QUmlTimeObservation"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeObservation, firstEvent, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeObservation, firstEvent, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeObservation, firstEvent, DocumentationRole, QStringLiteral("The value of firstEvent is related to event. If firstEvent is true, then the corresponding observation event is the first time instant the execution enters event. If firstEvent is false, then the corresponding observation event is the time instant the execution exits event."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeObservation, firstEvent, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeObservation, firstEvent, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTimeObservation, firstEvent, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumltimeobservationobject_p.h b/src/uml/qobjects/qumltimeobservationobject_p.h
index 904306d3..3cd712f6 100644
--- a/src/uml/qobjects/qumltimeobservationobject_p.h
+++ b/src/uml/qobjects/qumltimeobservationobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlTimeObservation;
-class Q_UML_EXPORT QUmlTimeObservationObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlTimeObservationObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlTimeObservationObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -82,7 +85,7 @@ class Q_UML_EXPORT QUmlTimeObservationObject : public QObject
     Q_PROPERTY(bool firstEvent READ firstEvent WRITE setFirstEvent RESET unsetFirstEvent)
 
 public:
-    Q_INVOKABLE explicit QUmlTimeObservationObject(QUmlTimeObservation *qModelingObject);
+    Q_INVOKABLE explicit QUmlTimeObservationObject(QUmlTimeObservation *qModelingElement);
     virtual ~QUmlTimeObservationObject();
 
     // Owned attributes [Element]
@@ -151,6 +154,10 @@ public Q_SLOTS:
     void setEvent(QObject *event = 0);
     void setFirstEvent(bool firstEvent);
     void unsetFirstEvent();
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumltransitionobject.cpp b/src/uml/qobjects/qumltransitionobject.cpp
index 414e862f..c5cd75ea 100644
--- a/src/uml/qobjects/qumltransitionobject.cpp
+++ b/src/uml/qobjects/qumltransitionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumltransitionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlTransition>
 #include <QtUml/QUmlBehavior>
@@ -62,16 +63,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlTransitionObject::QUmlTransitionObject(QUmlTransition *qModelingObject)
+QUmlTransitionObject::QUmlTransitionObject(QUmlTransition *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlTransitionObject::~QUmlTransitionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlTransition *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlTransition *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -80,25 +83,25 @@ QUmlTransitionObject::~QUmlTransitionObject()
 const QSet<QObject *> QUmlTransitionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlTransition *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlTransition *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlTransitionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlTransition *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlTransition *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlTransitionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTransition *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlTransition *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTransition *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTransition *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -106,54 +109,54 @@ QObject *QUmlTransitionObject::owner() const
 const QSet<QObject *> QUmlTransitionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlTransition *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlTransition *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlTransitionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlTransition *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlTransition *>(this)->name();
 }
 
 QObject *QUmlTransitionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTransition *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlTransition *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTransition *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTransition *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlTransitionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTransition *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlTransition *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTransition *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTransition *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlTransitionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlTransition *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlTransition *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlTransitionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlTransition *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlTransition *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlTransitionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlTransition *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlTransition *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlTransitionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlTransition *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlTransition *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -162,48 +165,48 @@ const QSet<QObject *> QUmlTransitionObject::redefinedElements() const
 const QSet<QObject *> QUmlTransitionObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlTransition *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlTransition *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlTransitionObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlTransition *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlTransition *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlTransitionObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlTransition *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlTransition *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlTransitionObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlTransition *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlTransition *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlTransitionObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlTransition *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlTransition *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlTransitionObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlTransition *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlTransition *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -211,70 +214,70 @@ const QSet<QObject *> QUmlTransitionObject::packageImports() const
 
 QObject *QUmlTransitionObject::container() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTransition *>(this)->container())
+    if (!qmodelingelementproperty_cast<QUmlTransition *>(this)->container())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTransition *>(this)->container()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTransition *>(this)->container()->asQModelingObject();
 }
 
 QObject *QUmlTransitionObject::effect() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTransition *>(this)->effect())
+    if (!qmodelingelementproperty_cast<QUmlTransition *>(this)->effect())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTransition *>(this)->effect()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTransition *>(this)->effect()->asQModelingObject();
 }
 
 QObject *QUmlTransitionObject::guard() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTransition *>(this)->guard())
+    if (!qmodelingelementproperty_cast<QUmlTransition *>(this)->guard())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTransition *>(this)->guard()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTransition *>(this)->guard()->asQModelingObject();
 }
 
 QtUml::TransitionKind QUmlTransitionObject::kind() const
 {
-    return qmodelingobjectproperty_cast<QUmlTransition *>(this)->kind();
+    return qmodelingelementproperty_cast<QUmlTransition *>(this)->kind();
 }
 
 QObject *QUmlTransitionObject::redefinedTransition() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTransition *>(this)->redefinedTransition())
+    if (!qmodelingelementproperty_cast<QUmlTransition *>(this)->redefinedTransition())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTransition *>(this)->redefinedTransition()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTransition *>(this)->redefinedTransition()->asQModelingObject();
 }
 
 QObject *QUmlTransitionObject::redefinitionContext() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTransition *>(this)->redefinitionContext())
+    if (!qmodelingelementproperty_cast<QUmlTransition *>(this)->redefinitionContext())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTransition *>(this)->redefinitionContext()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTransition *>(this)->redefinitionContext()->asQModelingObject();
 }
 
 QObject *QUmlTransitionObject::source() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTransition *>(this)->source())
+    if (!qmodelingelementproperty_cast<QUmlTransition *>(this)->source())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTransition *>(this)->source()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTransition *>(this)->source()->asQModelingObject();
 }
 
 QObject *QUmlTransitionObject::target() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTransition *>(this)->target())
+    if (!qmodelingelementproperty_cast<QUmlTransition *>(this)->target())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTransition *>(this)->target()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTransition *>(this)->target()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlTransitionObject::triggers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTrigger *element, qmodelingobjectproperty_cast<QUmlTransition *>(this)->triggers())
-        set.insert(element->asQObject());
+    foreach (QUmlTrigger *element, qmodelingelementproperty_cast<QUmlTransition *>(this)->triggers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -283,14 +286,14 @@ const QSet<QObject *> QUmlTransitionObject::triggers() const
 QSet<QObject *> QUmlTransitionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlTransition *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlTransition *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlTransitionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlTransition *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlTransition *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -298,34 +301,34 @@ bool QUmlTransitionObject::mustBeOwned() const
 QList<QObject *> QUmlTransitionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlTransition *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlTransition *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlTransitionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlTransition *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlTransition *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlTransitionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlTransition *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlTransition *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlTransitionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlTransition *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlTransition *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlTransitionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlTransition *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlTransition *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [Namespace]
@@ -334,251 +337,384 @@ QSet<QObject *> QUmlTransitionObject::excludeCollisions(QSet<QObject *> imps) co
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlTransition *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlTransition *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlTransitionObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlTransition *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlTransition *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlTransitionObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlTransition *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlTransition *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlTransitionObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlTransition *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlTransition *>(this)->membersAreDistinguishable();
 }
 
 // OPERATIONS [Transition]
 
 QObject *QUmlTransitionObject::containingStateMachine() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTransition *>(this)->containingStateMachine())
+    if (!qmodelingelementproperty_cast<QUmlTransition *>(this)->containingStateMachine())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTransition *>(this)->containingStateMachine()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTransition *>(this)->containingStateMachine()->asQModelingObject();
 }
 
 bool QUmlTransitionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlTransition *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlTransition *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlTransitionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlTransition *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlTransitionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlTransition *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlTransitionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlTransition *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlTransitionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlTransition *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlTransitionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlTransition *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlTransitionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlTransition *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlTransitionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlTransition *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlTransitionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlTransition *>(this)->setName(name);
 }
 
 void QUmlTransitionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlTransition *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlTransitionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlTransition *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlTransitionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlTransition *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlTransitionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlTransition *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlTransitionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlTransition *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlTransitionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlTransitionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlTransition *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlTransitionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlTransition *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlTransitionObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlTransition *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlTransitionObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlTransition *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlTransitionObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlTransition *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlTransitionObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlTransition *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlTransitionObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlTransition *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlTransitionObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlTransition *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlTransitionObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlTransition *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlTransitionObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlTransition *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlTransitionObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlTransition *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlTransitionObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlTransition *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlTransitionObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlTransition *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlTransitionObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlTransition *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Transition]
 
 void QUmlTransitionObject::setContainer(QObject *container)
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->setContainer(qmodelingobjectproperty_cast<QUmlRegion *>(container));
+    qmodelingelementproperty_cast<QUmlTransition *>(this)->setContainer(qmodelingelementproperty_cast<QUmlRegion *>(container));
 }
 
 void QUmlTransitionObject::setEffect(QObject *effect)
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->setEffect(qmodelingobjectproperty_cast<QUmlBehavior *>(effect));
+    qmodelingelementproperty_cast<QUmlTransition *>(this)->setEffect(qmodelingelementproperty_cast<QUmlBehavior *>(effect));
 }
 
 void QUmlTransitionObject::setGuard(QObject *guard)
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->setGuard(qmodelingobjectproperty_cast<QUmlConstraint *>(guard));
+    qmodelingelementproperty_cast<QUmlTransition *>(this)->setGuard(qmodelingelementproperty_cast<QUmlConstraint *>(guard));
 }
 
 void QUmlTransitionObject::setKind(QtUml::TransitionKind kind)
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->setKind(kind);
+    qmodelingelementproperty_cast<QUmlTransition *>(this)->setKind(kind);
 }
 
 void QUmlTransitionObject::unsetKind()
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("kind"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("kind"));
 }
 
 void QUmlTransitionObject::setRedefinedTransition(QObject *redefinedTransition)
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->setRedefinedTransition(qmodelingobjectproperty_cast<QUmlTransition *>(redefinedTransition));
+    qmodelingelementproperty_cast<QUmlTransition *>(this)->setRedefinedTransition(qmodelingelementproperty_cast<QUmlTransition *>(redefinedTransition));
 }
 
 void QUmlTransitionObject::setRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->setRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlTransition *>(this)->setRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlTransitionObject::setSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->setSource(qmodelingobjectproperty_cast<QUmlVertex *>(source));
+    qmodelingelementproperty_cast<QUmlTransition *>(this)->setSource(qmodelingelementproperty_cast<QUmlVertex *>(source));
 }
 
 void QUmlTransitionObject::setTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->setTarget(qmodelingobjectproperty_cast<QUmlVertex *>(target));
+    qmodelingelementproperty_cast<QUmlTransition *>(this)->setTarget(qmodelingelementproperty_cast<QUmlVertex *>(target));
 }
 
 void QUmlTransitionObject::addTrigger(QObject *trigger)
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->addTrigger(qmodelingobjectproperty_cast<QUmlTrigger *>(trigger));
+    qmodelingelementproperty_cast<QUmlTransition *>(this)->addTrigger(qmodelingelementproperty_cast<QUmlTrigger *>(trigger));
 }
 
 void QUmlTransitionObject::removeTrigger(QObject *trigger)
 {
-    qmodelingobjectproperty_cast<QUmlTransition *>(this)->removeTrigger(qmodelingobjectproperty_cast<QUmlTrigger *>(trigger));
+    qmodelingelementproperty_cast<QUmlTransition *>(this)->removeTrigger(qmodelingelementproperty_cast<QUmlTrigger *>(trigger));
+}
+
+
+void QUmlTransitionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTransition");
+    d->groupProperties.insert(QStringLiteral("QUmlTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("container"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("effect"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("guard"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("kind"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedTransition"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContext"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("source"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("target"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("triggers"))));
+}
+
+void QUmlTransitionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, container, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, container, PropertyClassRole, QStringLiteral("QUmlTransition"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, container, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, container, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, container, DocumentationRole, QStringLiteral("Designates the region that owns this transition."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, container, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, container, SubsettedPropertiesRole, QStringLiteral("NamedElement-namespace"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, container, OppositeEndRole, QStringLiteral("Region-transition"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, effect, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, effect, PropertyClassRole, QStringLiteral("QUmlTransition"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, effect, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, effect, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, effect, DocumentationRole, QStringLiteral("Specifies an optional behavior to be performed when the transition fires."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, effect, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, effect, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, effect, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, guard, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, guard, PropertyClassRole, QStringLiteral("QUmlTransition"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, guard, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, guard, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, guard, DocumentationRole, QStringLiteral("A guard is a constraint that provides a fine-grained control over the firing of the transition. The guard is evaluated when an event occurrence is dispatched by the state machine. If the guard is true at that time, the transition may be enabled, otherwise, it is disabled. Guards should be pure expressions without side effects. Guard expressions with side effects are ill formed."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, guard, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, guard, SubsettedPropertiesRole, QStringLiteral("Namespace-ownedRule"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, guard, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, kind, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, kind, PropertyClassRole, QStringLiteral("QUmlTransition"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, kind, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, kind, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, kind, DocumentationRole, QStringLiteral("Indicates the precise type of the transition."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, kind, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, kind, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, kind, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, redefinedTransition, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, redefinedTransition, PropertyClassRole, QStringLiteral("QUmlTransition"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, redefinedTransition, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, redefinedTransition, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, redefinedTransition, DocumentationRole, QStringLiteral("The transition that is redefined by this transition."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, redefinedTransition, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, redefinedTransition, SubsettedPropertiesRole, QStringLiteral("RedefinableElement-redefinedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, redefinedTransition, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, redefinitionContext, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, redefinitionContext, PropertyClassRole, QStringLiteral("QUmlTransition"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, redefinitionContext, IsDerivedRole, true);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, redefinitionContext, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, redefinitionContext, DocumentationRole, QStringLiteral("References the classifier in which context this element may be redefined."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, redefinitionContext, RedefinedPropertiesRole, QStringLiteral("RedefinableElement-redefinitionContext"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, redefinitionContext, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, redefinitionContext, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, source, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, source, PropertyClassRole, QStringLiteral("QUmlTransition"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, source, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, source, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, source, DocumentationRole, QStringLiteral("Designates the originating vertex (state or pseudostate) of the transition."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, source, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, source, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, source, OppositeEndRole, QStringLiteral("Vertex-outgoing"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, target, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, target, PropertyClassRole, QStringLiteral("QUmlTransition"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, target, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, target, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, target, DocumentationRole, QStringLiteral("Designates the target vertex that is reached when the transition is taken."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, target, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, target, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, target, OppositeEndRole, QStringLiteral("Vertex-incoming"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, triggers, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, triggers, PropertyClassRole, QStringLiteral("QUmlTransition"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, triggers, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, triggers, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, triggers, DocumentationRole, QStringLiteral("Specifies the triggers that may fire the transition."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, triggers, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, triggers, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTransition, triggers, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumltransitionobject_p.h b/src/uml/qobjects/qumltransitionobject_p.h
index ba587ed4..062eb3f0 100644
--- a/src/uml/qobjects/qumltransitionobject_p.h
+++ b/src/uml/qobjects/qumltransitionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlTransition;
-class Q_UML_EXPORT QUmlTransitionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlTransitionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlTransitionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -95,7 +98,7 @@ class Q_UML_EXPORT QUmlTransitionObject : public QObject
     Q_PROPERTY(QSet<QObject *> triggers READ triggers)
 
 public:
-    Q_INVOKABLE explicit QUmlTransitionObject(QUmlTransition *qModelingObject);
+    Q_INVOKABLE explicit QUmlTransitionObject(QUmlTransition *qModelingElement);
     virtual ~QUmlTransitionObject();
 
     // Owned attributes [Element]
@@ -207,6 +210,10 @@ public Q_SLOTS:
     void setTarget(QObject *target = 0);
     void addTrigger(QObject *trigger);
     void removeTrigger(QObject *trigger);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumltriggerobject.cpp b/src/uml/qobjects/qumltriggerobject.cpp
index ddad0e74..5e0ddf65 100644
--- a/src/uml/qobjects/qumltriggerobject.cpp
+++ b/src/uml/qobjects/qumltriggerobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumltriggerobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlTrigger>
 #include <QtUml/QUmlComment>
@@ -53,16 +54,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlTriggerObject::QUmlTriggerObject(QUmlTrigger *qModelingObject)
+QUmlTriggerObject::QUmlTriggerObject(QUmlTrigger *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlTriggerObject::~QUmlTriggerObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlTrigger *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlTrigger *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -71,25 +74,25 @@ QUmlTriggerObject::~QUmlTriggerObject()
 const QSet<QObject *> QUmlTriggerObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlTrigger *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlTrigger *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlTriggerObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlTrigger *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlTrigger *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlTriggerObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTrigger *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlTrigger *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTrigger *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTrigger *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -97,57 +100,57 @@ QObject *QUmlTriggerObject::owner() const
 const QSet<QObject *> QUmlTriggerObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlTrigger *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlTrigger *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlTriggerObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlTrigger *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlTrigger *>(this)->name();
 }
 
 QObject *QUmlTriggerObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTrigger *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlTrigger *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTrigger *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTrigger *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlTriggerObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTrigger *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlTrigger *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTrigger *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTrigger *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlTriggerObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlTrigger *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlTrigger *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlTriggerObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlTrigger *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlTrigger *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Trigger]
 
 QObject *QUmlTriggerObject::event() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlTrigger *>(this)->event())
+    if (!qmodelingelementproperty_cast<QUmlTrigger *>(this)->event())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlTrigger *>(this)->event()->asQObject();
+        return qmodelingelementproperty_cast<QUmlTrigger *>(this)->event()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlTriggerObject::ports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPort *element, qmodelingobjectproperty_cast<QUmlTrigger *>(this)->ports())
-        set.insert(element->asQObject());
+    foreach (QUmlPort *element, qmodelingelementproperty_cast<QUmlTrigger *>(this)->ports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -156,14 +159,14 @@ const QSet<QObject *> QUmlTriggerObject::ports() const
 QSet<QObject *> QUmlTriggerObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlTrigger *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlTrigger *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlTriggerObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlTrigger *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlTrigger *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -171,108 +174,157 @@ bool QUmlTriggerObject::mustBeOwned() const
 QList<QObject *> QUmlTriggerObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlTrigger *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlTrigger *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlTriggerObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlTrigger *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlTrigger *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlTriggerObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlTrigger *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlTrigger *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlTriggerObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlTrigger *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlTrigger *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlTriggerObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlTrigger *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlTrigger *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlTriggerObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlTrigger *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlTrigger *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlTriggerObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlTrigger *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlTrigger *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlTriggerObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlTrigger *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlTrigger *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlTriggerObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlTrigger *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlTrigger *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlTriggerObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlTrigger *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlTrigger *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlTriggerObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlTrigger *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlTrigger *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlTriggerObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlTrigger *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlTrigger *>(this)->setName(name);
 }
 
 void QUmlTriggerObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlTrigger *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlTrigger *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlTriggerObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlTrigger *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlTrigger *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlTriggerObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlTrigger *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlTrigger *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlTriggerObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlTrigger *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlTrigger *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Trigger]
 
 void QUmlTriggerObject::setEvent(QObject *event)
 {
-    qmodelingobjectproperty_cast<QUmlTrigger *>(this)->setEvent(qmodelingobjectproperty_cast<QUmlEvent *>(event));
+    qmodelingelementproperty_cast<QUmlTrigger *>(this)->setEvent(qmodelingelementproperty_cast<QUmlEvent *>(event));
 }
 
 void QUmlTriggerObject::addPort(QObject *port)
 {
-    qmodelingobjectproperty_cast<QUmlTrigger *>(this)->addPort(qmodelingobjectproperty_cast<QUmlPort *>(port));
+    qmodelingelementproperty_cast<QUmlTrigger *>(this)->addPort(qmodelingelementproperty_cast<QUmlPort *>(port));
 }
 
 void QUmlTriggerObject::removePort(QObject *port)
 {
-    qmodelingobjectproperty_cast<QUmlTrigger *>(this)->removePort(qmodelingobjectproperty_cast<QUmlPort *>(port));
+    qmodelingelementproperty_cast<QUmlTrigger *>(this)->removePort(qmodelingelementproperty_cast<QUmlPort *>(port));
+}
+
+
+void QUmlTriggerObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTrigger");
+    d->groupProperties.insert(QStringLiteral("QUmlTrigger"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("event"))));
+    d->groupProperties.insert(QStringLiteral("QUmlTrigger"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ports"))));
+}
+
+void QUmlTriggerObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTrigger, event, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTrigger, event, PropertyClassRole, QStringLiteral("QUmlTrigger"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTrigger, event, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTrigger, event, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTrigger, event, DocumentationRole, QStringLiteral("The event that causes the trigger."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTrigger, event, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTrigger, event, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTrigger, event, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTrigger, ports, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTrigger, ports, PropertyClassRole, QStringLiteral("QUmlTrigger"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTrigger, ports, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTrigger, ports, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTrigger, ports, DocumentationRole, QStringLiteral("A optional port of the receiver object on which the behavioral feature is invoked."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTrigger, ports, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTrigger, ports, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlTrigger, ports, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumltriggerobject_p.h b/src/uml/qobjects/qumltriggerobject_p.h
index 48f788b3..04f5fea5 100644
--- a/src/uml/qobjects/qumltriggerobject_p.h
+++ b/src/uml/qobjects/qumltriggerobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlTrigger;
-class Q_UML_EXPORT QUmlTriggerObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlTriggerObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlTriggerObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -76,7 +79,7 @@ class Q_UML_EXPORT QUmlTriggerObject : public QObject
     Q_PROPERTY(QSet<QObject *> ports READ ports)
 
 public:
-    Q_INVOKABLE explicit QUmlTriggerObject(QUmlTrigger *qModelingObject);
+    Q_INVOKABLE explicit QUmlTriggerObject(QUmlTrigger *qModelingElement);
     virtual ~QUmlTriggerObject();
 
     // Owned attributes [Element]
@@ -128,6 +131,10 @@ public Q_SLOTS:
     void setEvent(QObject *event = 0);
     void addPort(QObject *port);
     void removePort(QObject *port);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlunmarshallactionobject.cpp b/src/uml/qobjects/qumlunmarshallactionobject.cpp
index 9a0181d6..87c990d5 100644
--- a/src/uml/qobjects/qumlunmarshallactionobject.cpp
+++ b/src/uml/qobjects/qumlunmarshallactionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlunmarshallactionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlUnmarshallAction>
 #include <QtUml/QUmlActivity>
@@ -64,16 +65,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlUnmarshallActionObject::QUmlUnmarshallActionObject(QUmlUnmarshallAction *qModelingObject)
+QUmlUnmarshallActionObject::QUmlUnmarshallActionObject(QUmlUnmarshallAction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlUnmarshallActionObject::~QUmlUnmarshallActionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -82,25 +85,25 @@ QUmlUnmarshallActionObject::~QUmlUnmarshallActionObject()
 const QSet<QObject *> QUmlUnmarshallActionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlUnmarshallActionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlUnmarshallActionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -108,62 +111,62 @@ QObject *QUmlUnmarshallActionObject::owner() const
 const QSet<QObject *> QUmlUnmarshallActionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlUnmarshallActionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->name();
 }
 
 QObject *QUmlUnmarshallActionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlUnmarshallActionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlUnmarshallActionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlUnmarshallActionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlUnmarshallActionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlUnmarshallActionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlUnmarshallActionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -171,65 +174,65 @@ const QSet<QObject *> QUmlUnmarshallActionObject::redefinitionContexts() const
 
 QObject *QUmlUnmarshallActionObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlUnmarshallActionObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlUnmarshallActionObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlUnmarshallActionObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlUnmarshallActionObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlUnmarshallActionObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlUnmarshallActionObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlUnmarshallActionObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -238,8 +241,8 @@ const QSet<QObject *> QUmlUnmarshallActionObject::redefinedNodes() const
 const QSet<QObject *> QUmlUnmarshallActionObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -247,46 +250,46 @@ const QSet<QObject *> QUmlUnmarshallActionObject::handlers() const
 
 QObject *QUmlUnmarshallActionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlUnmarshallActionObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlUnmarshallActionObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlUnmarshallActionObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlUnmarshallActionObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlUnmarshallActionObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -294,26 +297,26 @@ const QList<QObject *> QUmlUnmarshallActionObject::outputs() const
 
 QObject *QUmlUnmarshallActionObject::object() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->object())
+    if (!qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->object())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->object()->asQObject();
+        return qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->object()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlUnmarshallActionObject::results() const
 {
     QSet<QObject *> set;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->results())
-        set.insert(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->results())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlUnmarshallActionObject::unmarshallType() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->unmarshallType())
+    if (!qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->unmarshallType())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->unmarshallType()->asQObject();
+        return qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->unmarshallType()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -321,14 +324,14 @@ QObject *QUmlUnmarshallActionObject::unmarshallType() const
 QSet<QObject *> QUmlUnmarshallActionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlUnmarshallActionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -336,298 +339,385 @@ bool QUmlUnmarshallActionObject::mustBeOwned() const
 QList<QObject *> QUmlUnmarshallActionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlUnmarshallActionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlUnmarshallActionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlUnmarshallActionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlUnmarshallActionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlUnmarshallActionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlUnmarshallActionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlUnmarshallActionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlUnmarshallActionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlUnmarshallActionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlUnmarshallActionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlUnmarshallActionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlUnmarshallActionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlUnmarshallActionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->setName(name);
 }
 
 void QUmlUnmarshallActionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlUnmarshallActionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlUnmarshallActionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlUnmarshallActionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlUnmarshallActionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlUnmarshallActionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlUnmarshallActionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlUnmarshallActionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlUnmarshallActionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlUnmarshallActionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlUnmarshallActionObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlUnmarshallActionObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlUnmarshallActionObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlUnmarshallActionObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlUnmarshallActionObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlUnmarshallActionObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlUnmarshallActionObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlUnmarshallActionObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlUnmarshallActionObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlUnmarshallActionObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlUnmarshallActionObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlUnmarshallActionObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlUnmarshallActionObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlUnmarshallActionObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlUnmarshallActionObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlUnmarshallActionObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlUnmarshallActionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlUnmarshallActionObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlUnmarshallActionObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlUnmarshallActionObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlUnmarshallActionObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlUnmarshallActionObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlUnmarshallActionObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlUnmarshallActionObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlUnmarshallActionObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlUnmarshallActionObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlUnmarshallActionObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [UnmarshallAction]
 
 void QUmlUnmarshallActionObject::setObject(QObject *object)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->setObject(qmodelingobjectproperty_cast<QUmlInputPin *>(object));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->setObject(qmodelingelementproperty_cast<QUmlInputPin *>(object));
 }
 
 void QUmlUnmarshallActionObject::addResult(QObject *result)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->addResult(qmodelingobjectproperty_cast<QUmlOutputPin *>(result));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->addResult(qmodelingelementproperty_cast<QUmlOutputPin *>(result));
 }
 
 void QUmlUnmarshallActionObject::removeResult(QObject *result)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->removeResult(qmodelingobjectproperty_cast<QUmlOutputPin *>(result));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->removeResult(qmodelingelementproperty_cast<QUmlOutputPin *>(result));
 }
 
 void QUmlUnmarshallActionObject::setUnmarshallType(QObject *unmarshallType)
 {
-    qmodelingobjectproperty_cast<QUmlUnmarshallAction *>(this)->setUnmarshallType(qmodelingobjectproperty_cast<QUmlClassifier *>(unmarshallType));
+    qmodelingelementproperty_cast<QUmlUnmarshallAction *>(this)->setUnmarshallType(qmodelingelementproperty_cast<QUmlClassifier *>(unmarshallType));
+}
+
+
+void QUmlUnmarshallActionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlUnmarshallAction");
+    d->groupProperties.insert(QStringLiteral("QUmlUnmarshallAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("object"))));
+    d->groupProperties.insert(QStringLiteral("QUmlUnmarshallAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("results"))));
+    d->groupProperties.insert(QStringLiteral("QUmlUnmarshallAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("unmarshallType"))));
+}
+
+void QUmlUnmarshallActionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUnmarshallAction, object, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUnmarshallAction, object, PropertyClassRole, QStringLiteral("QUmlUnmarshallAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUnmarshallAction, object, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUnmarshallAction, object, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUnmarshallAction, object, DocumentationRole, QStringLiteral("The object to be unmarshalled."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUnmarshallAction, object, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUnmarshallAction, object, SubsettedPropertiesRole, QStringLiteral("Action-input"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUnmarshallAction, object, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUnmarshallAction, results, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUnmarshallAction, results, PropertyClassRole, QStringLiteral("QUmlUnmarshallAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUnmarshallAction, results, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUnmarshallAction, results, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUnmarshallAction, results, DocumentationRole, QStringLiteral("The values of the structural features of the input object."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUnmarshallAction, results, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUnmarshallAction, results, SubsettedPropertiesRole, QStringLiteral("Action-output"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUnmarshallAction, results, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUnmarshallAction, unmarshallType, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUnmarshallAction, unmarshallType, PropertyClassRole, QStringLiteral("QUmlUnmarshallAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUnmarshallAction, unmarshallType, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUnmarshallAction, unmarshallType, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUnmarshallAction, unmarshallType, DocumentationRole, QStringLiteral("The type of the object to be unmarshalled."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUnmarshallAction, unmarshallType, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUnmarshallAction, unmarshallType, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUnmarshallAction, unmarshallType, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlunmarshallactionobject_p.h b/src/uml/qobjects/qumlunmarshallactionobject_p.h
index 1ff3290f..1fbfbf42 100644
--- a/src/uml/qobjects/qumlunmarshallactionobject_p.h
+++ b/src/uml/qobjects/qumlunmarshallactionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlUnmarshallAction;
-class Q_UML_EXPORT QUmlUnmarshallActionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlUnmarshallActionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlUnmarshallActionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -103,7 +106,7 @@ class Q_UML_EXPORT QUmlUnmarshallActionObject : public QObject
     Q_PROPERTY(QObject * unmarshallType READ unmarshallType WRITE setUnmarshallType)
 
 public:
-    Q_INVOKABLE explicit QUmlUnmarshallActionObject(QUmlUnmarshallAction *qModelingObject);
+    Q_INVOKABLE explicit QUmlUnmarshallActionObject(QUmlUnmarshallAction *qModelingElement);
     virtual ~QUmlUnmarshallActionObject();
 
     // Owned attributes [Element]
@@ -228,6 +231,10 @@ public Q_SLOTS:
     void addResult(QObject *result);
     void removeResult(QObject *result);
     void setUnmarshallType(QObject *unmarshallType = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlusageobject.cpp b/src/uml/qobjects/qumlusageobject.cpp
index bba0c22d..f57a2328 100644
--- a/src/uml/qobjects/qumlusageobject.cpp
+++ b/src/uml/qobjects/qumlusageobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlusageobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlUsage>
 #include <QtUml/QUmlComment>
@@ -53,16 +54,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlUsageObject::QUmlUsageObject(QUmlUsage *qModelingObject)
+QUmlUsageObject::QUmlUsageObject(QUmlUsage *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlUsageObject::~QUmlUsageObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlUsage *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlUsage *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -71,43 +74,43 @@ QUmlUsageObject::~QUmlUsageObject()
 const QSet<QObject *> QUmlUsageObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlUsage *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlUsage *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlUsageObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlUsage *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlUsage *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlUsageObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlUsage *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlUsage *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlUsage *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlUsage *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlUsageObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlUsage *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlUsage *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlUsage *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlUsage *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 QObject *QUmlUsageObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlUsage *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlUsage *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlUsage *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlUsage *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -115,42 +118,42 @@ QObject *QUmlUsageObject::templateParameter() const
 const QSet<QObject *> QUmlUsageObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlUsage *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlUsage *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlUsageObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlUsage *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlUsage *>(this)->name();
 }
 
 QObject *QUmlUsageObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlUsage *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlUsage *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlUsage *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlUsage *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlUsageObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlUsage *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlUsage *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlUsage *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlUsage *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlUsageObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlUsage *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlUsage *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlUsageObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlUsage *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlUsage *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Relationship]
@@ -158,8 +161,8 @@ QtUml::VisibilityKind QUmlUsageObject::visibility() const
 const QSet<QObject *> QUmlUsageObject::relatedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlUsage *>(this)->relatedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlUsage *>(this)->relatedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -168,16 +171,16 @@ const QSet<QObject *> QUmlUsageObject::relatedElements() const
 const QSet<QObject *> QUmlUsageObject::sources() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlUsage *>(this)->sources())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlUsage *>(this)->sources())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlUsageObject::targets() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlUsage *>(this)->targets())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlUsage *>(this)->targets())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -186,16 +189,16 @@ const QSet<QObject *> QUmlUsageObject::targets() const
 const QSet<QObject *> QUmlUsageObject::clients() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlUsage *>(this)->clients())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlUsage *>(this)->clients())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlUsageObject::suppliers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlUsage *>(this)->suppliers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlUsage *>(this)->suppliers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -204,26 +207,26 @@ const QSet<QObject *> QUmlUsageObject::suppliers() const
 QSet<QObject *> QUmlUsageObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlUsage *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlUsage *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlUsageObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlUsage *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlUsage *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlUsageObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlUsage *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlUsage *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlUsageObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlUsage *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlUsage *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [NamedElement]
@@ -231,165 +234,212 @@ bool QUmlUsageObject::isTemplateParameter() const
 QList<QObject *> QUmlUsageObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlUsage *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlUsage *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlUsageObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlUsage *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlUsage *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlUsageObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlUsage *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlUsage *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlUsageObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlUsage *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlUsage *>(this)->separator();
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlUsageObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlUsage *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlUsage *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlUsageObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlUsage *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlUsage *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlUsageObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlUsage *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlUsage *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlUsageObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlUsage *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlUsage *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlUsageObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlUsage *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlUsage *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlUsageObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlUsage *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlUsage *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 
 void QUmlUsageObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlUsage *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlUsage *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlUsageObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlUsage *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlUsage *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlUsageObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlUsage *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlUsage *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlUsageObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlUsage *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlUsage *>(this)->setName(name);
 }
 
 void QUmlUsageObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlUsage *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlUsage *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlUsageObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlUsage *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlUsage *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlUsageObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlUsage *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlUsage *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlUsageObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlUsage *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlUsage *>(this)->setVisibility(visibility);
 }
 
 void QUmlUsageObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlUsage *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Relationship]
 
 void QUmlUsageObject::addRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlUsage *>(this)->addRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlUsage *>(this)->addRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 void QUmlUsageObject::removeRelatedElement(QObject *relatedElement)
 {
-    qmodelingobjectproperty_cast<QUmlUsage *>(this)->removeRelatedElement(qmodelingobjectproperty_cast<QUmlElement *>(relatedElement));
+    qmodelingelementproperty_cast<QUmlUsage *>(this)->removeRelatedElement(qmodelingelementproperty_cast<QUmlElement *>(relatedElement));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [DirectedRelationship]
 
 void QUmlUsageObject::addSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlUsage *>(this)->addSource(qmodelingobjectproperty_cast<QUmlElement *>(source));
+    qmodelingelementproperty_cast<QUmlUsage *>(this)->addSource(qmodelingelementproperty_cast<QUmlElement *>(source));
 }
 
 void QUmlUsageObject::removeSource(QObject *source)
 {
-    qmodelingobjectproperty_cast<QUmlUsage *>(this)->removeSource(qmodelingobjectproperty_cast<QUmlElement *>(source));
+    qmodelingelementproperty_cast<QUmlUsage *>(this)->removeSource(qmodelingelementproperty_cast<QUmlElement *>(source));
 }
 
 void QUmlUsageObject::addTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlUsage *>(this)->addTarget(qmodelingobjectproperty_cast<QUmlElement *>(target));
+    qmodelingelementproperty_cast<QUmlUsage *>(this)->addTarget(qmodelingelementproperty_cast<QUmlElement *>(target));
 }
 
 void QUmlUsageObject::removeTarget(QObject *target)
 {
-    qmodelingobjectproperty_cast<QUmlUsage *>(this)->removeTarget(qmodelingobjectproperty_cast<QUmlElement *>(target));
+    qmodelingelementproperty_cast<QUmlUsage *>(this)->removeTarget(qmodelingelementproperty_cast<QUmlElement *>(target));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Dependency]
 
 void QUmlUsageObject::addClient(QObject *client)
 {
-    qmodelingobjectproperty_cast<QUmlUsage *>(this)->addClient(qmodelingobjectproperty_cast<QUmlNamedElement *>(client));
+    qmodelingelementproperty_cast<QUmlUsage *>(this)->addClient(qmodelingelementproperty_cast<QUmlNamedElement *>(client));
 }
 
 void QUmlUsageObject::removeClient(QObject *client)
 {
-    qmodelingobjectproperty_cast<QUmlUsage *>(this)->removeClient(qmodelingobjectproperty_cast<QUmlNamedElement *>(client));
+    qmodelingelementproperty_cast<QUmlUsage *>(this)->removeClient(qmodelingelementproperty_cast<QUmlNamedElement *>(client));
 }
 
 void QUmlUsageObject::addSupplier(QObject *supplier)
 {
-    qmodelingobjectproperty_cast<QUmlUsage *>(this)->addSupplier(qmodelingobjectproperty_cast<QUmlNamedElement *>(supplier));
+    qmodelingelementproperty_cast<QUmlUsage *>(this)->addSupplier(qmodelingelementproperty_cast<QUmlNamedElement *>(supplier));
 }
 
 void QUmlUsageObject::removeSupplier(QObject *supplier)
 {
-    qmodelingobjectproperty_cast<QUmlUsage *>(this)->removeSupplier(qmodelingobjectproperty_cast<QUmlNamedElement *>(supplier));
+    qmodelingelementproperty_cast<QUmlUsage *>(this)->removeSupplier(qmodelingelementproperty_cast<QUmlNamedElement *>(supplier));
+}
+
+
+void QUmlUsageObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDirectedRelationship");
+    d->groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
+
+    d->propertyGroups << QStringLiteral("QUmlDependency");
+    d->groupProperties.insert(QStringLiteral("QUmlDependency"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clients"))));
+    d->groupProperties.insert(QStringLiteral("QUmlDependency"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("suppliers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlUsage");
+}
+
+void QUmlUsageObject::setPropertyData()
+{
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlusageobject_p.h b/src/uml/qobjects/qumlusageobject_p.h
index 4b0c9de9..7903560a 100644
--- a/src/uml/qobjects/qumlusageobject_p.h
+++ b/src/uml/qobjects/qumlusageobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlUsage;
-class Q_UML_EXPORT QUmlUsageObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlUsageObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlUsageObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -89,7 +92,7 @@ class Q_UML_EXPORT QUmlUsageObject : public QObject
     Q_PROPERTY(QSet<QObject *> suppliers READ suppliers)
 
 public:
-    Q_INVOKABLE explicit QUmlUsageObject(QUmlUsage *qModelingObject);
+    Q_INVOKABLE explicit QUmlUsageObject(QUmlUsage *qModelingElement);
     virtual ~QUmlUsageObject();
 
     // Owned attributes [Element]
@@ -176,6 +179,10 @@ public Q_SLOTS:
     void removeClient(QObject *client);
     void addSupplier(QObject *supplier);
     void removeSupplier(QObject *supplier);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlusecaseobject.cpp b/src/uml/qobjects/qumlusecaseobject.cpp
index b89361a0..0a1bc919 100644
--- a/src/uml/qobjects/qumlusecaseobject.cpp
+++ b/src/uml/qobjects/qumlusecaseobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlusecaseobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlUseCase>
 #include <QtUml/QUmlBehavior>
@@ -75,16 +76,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlUseCaseObject::QUmlUseCaseObject(QUmlUseCase *qModelingObject)
+QUmlUseCaseObject::QUmlUseCaseObject(QUmlUseCase *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlUseCaseObject::~QUmlUseCaseObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlUseCase *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlUseCase *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -93,25 +96,25 @@ QUmlUseCaseObject::~QUmlUseCaseObject()
 const QSet<QObject *> QUmlUseCaseObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlUseCaseObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlUseCaseObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlUseCase *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlUseCase *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlUseCase *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlUseCase *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -119,35 +122,35 @@ QObject *QUmlUseCaseObject::owner() const
 const QSet<QObject *> QUmlUseCaseObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlUseCaseObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlUseCase *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlUseCase *>(this)->name();
 }
 
 QObject *QUmlUseCaseObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlUseCase *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlUseCase *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlUseCase *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlUseCase *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlUseCaseObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlUseCase *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlUseCase *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlUseCase *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlUseCase *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlUseCaseObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlUseCase *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlUseCase *>(this)->qualifiedName();
 }
 
 // OWNED ATTRIBUTES [Namespace]
@@ -155,48 +158,48 @@ QString QUmlUseCaseObject::qualifiedName() const
 const QSet<QObject *> QUmlUseCaseObject::elementImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElementImport *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->elementImports())
-        set.insert(element->asQObject());
+    foreach (QUmlElementImport *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->elementImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlUseCaseObject::importedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->importedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->importedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlUseCaseObject::members() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->members())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->members())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlUseCaseObject::ownedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->ownedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->ownedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlUseCaseObject::ownedRules() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->ownedRules())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->ownedRules())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlUseCaseObject::packageImports() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackageImport *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->packageImports())
-        set.insert(element->asQObject());
+    foreach (QUmlPackageImport *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->packageImports())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -204,49 +207,49 @@ const QSet<QObject *> QUmlUseCaseObject::packageImports() const
 
 QObject *QUmlUseCaseObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlUseCase *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlUseCase *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlUseCase *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlUseCase *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [PackageableElement]
 
 QtUml::VisibilityKind QUmlUseCaseObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlUseCase *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlUseCase *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [Type]
 
 QObject *QUmlUseCaseObject::package() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlUseCase *>(this)->package())
+    if (!qmodelingelementproperty_cast<QUmlUseCase *>(this)->package())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlUseCase *>(this)->package()->asQObject();
+        return qmodelingelementproperty_cast<QUmlUseCase *>(this)->package()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlUseCaseObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlUseCase *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlUseCase *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlUseCaseObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlUseCaseObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -255,8 +258,8 @@ const QSet<QObject *> QUmlUseCaseObject::redefinitionContexts() const
 const QSet<QObject *> QUmlUseCaseObject::templateBindings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlTemplateBinding *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->templateBindings())
-        set.insert(element->asQObject());
+    foreach (QUmlTemplateBinding *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->templateBindings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -265,122 +268,122 @@ const QSet<QObject *> QUmlUseCaseObject::templateBindings() const
 const QSet<QObject *> QUmlUseCaseObject::attributes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlProperty *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->attributes())
-        set.insert(element->asQObject());
+    foreach (QUmlProperty *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->attributes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlUseCaseObject::collaborationUses() const
 {
     QSet<QObject *> set;
-    foreach (QUmlCollaborationUse *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->collaborationUses())
-        set.insert(element->asQObject());
+    foreach (QUmlCollaborationUse *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->collaborationUses())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlUseCaseObject::features() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->features())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->features())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlUseCaseObject::generals() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->generals())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->generals())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlUseCaseObject::generalizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralization *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->generalizations())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralization *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->generalizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlUseCaseObject::inheritedMembers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->inheritedMembers())
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->inheritedMembers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlUseCaseObject::isAbstract() const
 {
-    return qmodelingobjectproperty_cast<QUmlUseCase *>(this)->isAbstract();
+    return qmodelingelementproperty_cast<QUmlUseCase *>(this)->isAbstract();
 }
 
 bool QUmlUseCaseObject::isFinalSpecialization() const
 {
-    return qmodelingobjectproperty_cast<QUmlUseCase *>(this)->isFinalSpecialization();
+    return qmodelingelementproperty_cast<QUmlUseCase *>(this)->isFinalSpecialization();
 }
 
 QObject *QUmlUseCaseObject::ownedTemplateSignature() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlUseCase *>(this)->ownedTemplateSignature())
+    if (!qmodelingelementproperty_cast<QUmlUseCase *>(this)->ownedTemplateSignature())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlUseCase *>(this)->ownedTemplateSignature()->asQObject();
+        return qmodelingelementproperty_cast<QUmlUseCase *>(this)->ownedTemplateSignature()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlUseCaseObject::ownedUseCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->ownedUseCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->ownedUseCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlUseCaseObject::powertypeExtents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlGeneralizationSet *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->powertypeExtents())
-        set.insert(element->asQObject());
+    foreach (QUmlGeneralizationSet *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->powertypeExtents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlUseCaseObject::redefinedClassifiers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->redefinedClassifiers())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->redefinedClassifiers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlUseCaseObject::representation() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlUseCase *>(this)->representation())
+    if (!qmodelingelementproperty_cast<QUmlUseCase *>(this)->representation())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlUseCase *>(this)->representation()->asQObject();
+        return qmodelingelementproperty_cast<QUmlUseCase *>(this)->representation()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlUseCaseObject::substitutions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlSubstitution *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->substitutions())
-        set.insert(element->asQObject());
+    foreach (QUmlSubstitution *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->substitutions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlUseCaseObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlUseCase *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlUseCase *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlUseCase *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlUseCase *>(this)->templateParameter()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlUseCaseObject::useCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->useCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->useCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -388,25 +391,25 @@ const QSet<QObject *> QUmlUseCaseObject::useCases() const
 
 QObject *QUmlUseCaseObject::classifierBehavior() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlUseCase *>(this)->classifierBehavior())
+    if (!qmodelingelementproperty_cast<QUmlUseCase *>(this)->classifierBehavior())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlUseCase *>(this)->classifierBehavior()->asQObject();
+        return qmodelingelementproperty_cast<QUmlUseCase *>(this)->classifierBehavior()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlUseCaseObject::interfaceRealizations() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterfaceRealization *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->interfaceRealizations())
-        set.insert(element->asQObject());
+    foreach (QUmlInterfaceRealization *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->interfaceRealizations())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlUseCaseObject::ownedBehaviors() const
 {
     QSet<QObject *> set;
-    foreach (QUmlBehavior *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->ownedBehaviors())
-        set.insert(element->asQObject());
+    foreach (QUmlBehavior *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->ownedBehaviors())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -415,32 +418,32 @@ const QSet<QObject *> QUmlUseCaseObject::ownedBehaviors() const
 const QSet<QObject *> QUmlUseCaseObject::extends() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExtend *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->extends())
-        set.insert(element->asQObject());
+    foreach (QUmlExtend *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->extends())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlUseCaseObject::extensionPoints() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExtensionPoint *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->extensionPoints())
-        set.insert(element->asQObject());
+    foreach (QUmlExtensionPoint *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->extensionPoints())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlUseCaseObject::includes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInclude *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->includes())
-        set.insert(element->asQObject());
+    foreach (QUmlInclude *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->includes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlUseCaseObject::subjects() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->subjects())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->subjects())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -449,14 +452,14 @@ const QSet<QObject *> QUmlUseCaseObject::subjects() const
 QSet<QObject *> QUmlUseCaseObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlUseCaseObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlUseCase *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlUseCase *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -464,27 +467,27 @@ bool QUmlUseCaseObject::mustBeOwned() const
 QList<QObject *> QUmlUseCaseObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlUseCaseObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlUseCaseObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlUseCase *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlUseCase *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlUseCaseObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlUseCase *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlUseCase *>(this)->separator();
 }
 
 // OPERATIONS [Namespace]
@@ -493,44 +496,44 @@ QSet<QObject *> QUmlUseCaseObject::excludeCollisions(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->excludeCollisions(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->excludeCollisions(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QString> QUmlUseCaseObject::getNamesOfMember(QObject *element) const
 {
-    return qmodelingobjectproperty_cast<QUmlUseCase *>(this)->getNamesOfMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(element));
+    return qmodelingelementproperty_cast<QUmlUseCase *>(this)->getNamesOfMember(qmodelingelementproperty_cast<QUmlNamedElement *>(element));
 }
 
 QSet<QObject *> QUmlUseCaseObject::importMembers(QSet<QObject *> imps) const
 {
     QSet<QUmlPackageableElement *> impsConverted;
     foreach (QObject *object, imps)
-        impsConverted.insert(qmodelingobjectproperty_cast<QUmlPackageableElement *>(object));
+        impsConverted.insert(qmodelingelementproperty_cast<QUmlPackageableElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlPackageableElement *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->importMembers(impsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlPackageableElement *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->importMembers(impsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlUseCaseObject::membersAreDistinguishable() const
 {
-    return qmodelingobjectproperty_cast<QUmlUseCase *>(this)->membersAreDistinguishable();
+    return qmodelingelementproperty_cast<QUmlUseCase *>(this)->membersAreDistinguishable();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlUseCaseObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlUseCase *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlUseCase *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlUseCaseObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlUseCase *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlUseCase *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [Type]
@@ -538,12 +541,12 @@ bool QUmlUseCaseObject::isTemplateParameter() const
 
 bool QUmlUseCaseObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlUseCase *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlUseCase *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlUseCaseObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlUseCase *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlUseCase *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // OPERATIONS [TemplateableElement]
@@ -551,8 +554,8 @@ bool QUmlUseCaseObject::isRedefinitionContextValid(QObject *redefined) const
 QSet<QObject *> QUmlUseCaseObject::parameterableElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlParameterableElement *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->parameterableElements())
-        set.insert(element->asQObject());
+    foreach (QUmlParameterableElement *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->parameterableElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -561,63 +564,63 @@ QSet<QObject *> QUmlUseCaseObject::parameterableElements() const
 QSet<QObject *> QUmlUseCaseObject::allFeatures() const
 {
     QSet<QObject *> set;
-    foreach (QUmlFeature *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->allFeatures())
-        set.insert(element->asQObject());
+    foreach (QUmlFeature *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->allFeatures())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlUseCaseObject::allParents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->allParents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->allParents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlUseCaseObject::conformsTo(QObject *other) const
 {
-    return qmodelingobjectproperty_cast<QUmlUseCase *>(this)->conformsTo(qmodelingobjectproperty_cast<QUmlClassifier *>(other));
+    return qmodelingelementproperty_cast<QUmlUseCase *>(this)->conformsTo(qmodelingelementproperty_cast<QUmlClassifier *>(other));
 }
 
 bool QUmlUseCaseObject::hasVisibilityOf(QObject *n) const
 {
-    return qmodelingobjectproperty_cast<QUmlUseCase *>(this)->hasVisibilityOf(qmodelingobjectproperty_cast<QUmlNamedElement *>(n));
+    return qmodelingelementproperty_cast<QUmlUseCase *>(this)->hasVisibilityOf(qmodelingelementproperty_cast<QUmlNamedElement *>(n));
 }
 
 QSet<QObject *> QUmlUseCaseObject::inherit(QSet<QObject *> inhs) const
 {
     QSet<QUmlNamedElement *> inhsConverted;
     foreach (QObject *object, inhs)
-        inhsConverted.insert(qmodelingobjectproperty_cast<QUmlNamedElement *>(object));
+        inhsConverted.insert(qmodelingelementproperty_cast<QUmlNamedElement *>(object));
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->inherit(inhsConverted))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->inherit(inhsConverted))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlUseCaseObject::inheritableMembers(QObject *c) const
 {
     QSet<QObject *> set;
-    foreach (QUmlNamedElement *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->inheritableMembers(qmodelingobjectproperty_cast<QUmlClassifier *>(c)))
-        set.insert(element->asQObject());
+    foreach (QUmlNamedElement *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->inheritableMembers(qmodelingelementproperty_cast<QUmlClassifier *>(c)))
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlUseCaseObject::isTemplate() const
 {
-    return qmodelingobjectproperty_cast<QUmlUseCase *>(this)->isTemplate();
+    return qmodelingelementproperty_cast<QUmlUseCase *>(this)->isTemplate();
 }
 
 bool QUmlUseCaseObject::maySpecializeType(QObject *c) const
 {
-    return qmodelingobjectproperty_cast<QUmlUseCase *>(this)->maySpecializeType(qmodelingobjectproperty_cast<QUmlClassifier *>(c));
+    return qmodelingelementproperty_cast<QUmlUseCase *>(this)->maySpecializeType(qmodelingelementproperty_cast<QUmlClassifier *>(c));
 }
 
 QSet<QObject *> QUmlUseCaseObject::parents() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->parents())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->parents())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -626,8 +629,8 @@ QSet<QObject *> QUmlUseCaseObject::parents() const
 QSet<QObject *> QUmlUseCaseObject::allIncludedUseCases() const
 {
     QSet<QObject *> set;
-    foreach (QUmlUseCase *element, qmodelingobjectproperty_cast<QUmlUseCase *>(this)->allIncludedUseCases())
-        set.insert(element->asQObject());
+    foreach (QUmlUseCase *element, qmodelingelementproperty_cast<QUmlUseCase *>(this)->allIncludedUseCases())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -635,405 +638,525 @@ QSet<QObject *> QUmlUseCaseObject::allIncludedUseCases() const
 
 void QUmlUseCaseObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlUseCaseObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlUseCaseObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlUseCaseObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlUseCaseObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlUseCaseObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlUseCaseObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlUseCaseObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->setName(name);
 }
 
 void QUmlUseCaseObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlUseCaseObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlUseCaseObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->setQualifiedName(qualifiedName);
 }
 // SLOTS FOR OWNED ATTRIBUTES [Namespace]
 
 void QUmlUseCaseObject::addElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->addElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->addElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlUseCaseObject::removeElementImport(QObject *elementImport)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->removeElementImport(qmodelingobjectproperty_cast<QUmlElementImport *>(elementImport));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->removeElementImport(qmodelingelementproperty_cast<QUmlElementImport *>(elementImport));
 }
 
 void QUmlUseCaseObject::addImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->addImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->addImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlUseCaseObject::removeImportedMember(QObject *importedMember)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->removeImportedMember(qmodelingobjectproperty_cast<QUmlPackageableElement *>(importedMember));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->removeImportedMember(qmodelingelementproperty_cast<QUmlPackageableElement *>(importedMember));
 }
 
 void QUmlUseCaseObject::addMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->addMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->addMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlUseCaseObject::removeMember(QObject *member)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->removeMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(member));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->removeMember(qmodelingelementproperty_cast<QUmlNamedElement *>(member));
 }
 
 void QUmlUseCaseObject::addOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->addOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->addOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlUseCaseObject::removeOwnedMember(QObject *ownedMember)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->removeOwnedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(ownedMember));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->removeOwnedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(ownedMember));
 }
 
 void QUmlUseCaseObject::addOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->addOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->addOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlUseCaseObject::removeOwnedRule(QObject *ownedRule)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->removeOwnedRule(qmodelingobjectproperty_cast<QUmlConstraint *>(ownedRule));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->removeOwnedRule(qmodelingelementproperty_cast<QUmlConstraint *>(ownedRule));
 }
 
 void QUmlUseCaseObject::addPackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->addPackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->addPackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 void QUmlUseCaseObject::removePackageImport(QObject *packageImport)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->removePackageImport(qmodelingobjectproperty_cast<QUmlPackageImport *>(packageImport));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->removePackageImport(qmodelingelementproperty_cast<QUmlPackageImport *>(packageImport));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlUseCaseObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 // SLOTS FOR OWNED ATTRIBUTES [PackageableElement]
 
 void QUmlUseCaseObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->setVisibility(visibility);
 }
 
 void QUmlUseCaseObject::unsetVisibility()
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("visibility"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Type]
 
 void QUmlUseCaseObject::setPackage(QObject *package)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->setPackage(qmodelingobjectproperty_cast<QUmlPackage *>(package));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->setPackage(qmodelingelementproperty_cast<QUmlPackage *>(package));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlUseCaseObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlUseCaseObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlUseCaseObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlUseCaseObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlUseCaseObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlUseCaseObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TemplateableElement]
 
 void QUmlUseCaseObject::addTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->addTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->addTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 void QUmlUseCaseObject::removeTemplateBinding(QObject *templateBinding)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->removeTemplateBinding(qmodelingobjectproperty_cast<QUmlTemplateBinding *>(templateBinding));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->removeTemplateBinding(qmodelingelementproperty_cast<QUmlTemplateBinding *>(templateBinding));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Classifier]
 
 void QUmlUseCaseObject::addAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->addAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->addAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlUseCaseObject::removeAttribute(QObject *attribute)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->removeAttribute(qmodelingobjectproperty_cast<QUmlProperty *>(attribute));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->removeAttribute(qmodelingelementproperty_cast<QUmlProperty *>(attribute));
 }
 
 void QUmlUseCaseObject::addCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->addCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->addCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlUseCaseObject::removeCollaborationUse(QObject *collaborationUse)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->removeCollaborationUse(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(collaborationUse));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->removeCollaborationUse(qmodelingelementproperty_cast<QUmlCollaborationUse *>(collaborationUse));
 }
 
 void QUmlUseCaseObject::addFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->addFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->addFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlUseCaseObject::removeFeature(QObject *feature)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->removeFeature(qmodelingobjectproperty_cast<QUmlFeature *>(feature));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->removeFeature(qmodelingelementproperty_cast<QUmlFeature *>(feature));
 }
 
 void QUmlUseCaseObject::addGeneral(QObject *general)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->addGeneral(qmodelingobjectproperty_cast<QUmlClassifier *>(general));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->addGeneral(qmodelingelementproperty_cast<QUmlClassifier *>(general));
 }
 
 void QUmlUseCaseObject::removeGeneral(QObject *general)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->removeGeneral(qmodelingobjectproperty_cast<QUmlClassifier *>(general));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->removeGeneral(qmodelingelementproperty_cast<QUmlClassifier *>(general));
 }
 
 void QUmlUseCaseObject::addGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->addGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->addGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlUseCaseObject::removeGeneralization(QObject *generalization)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->removeGeneralization(qmodelingobjectproperty_cast<QUmlGeneralization *>(generalization));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->removeGeneralization(qmodelingelementproperty_cast<QUmlGeneralization *>(generalization));
 }
 
 void QUmlUseCaseObject::addInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->addInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->addInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlUseCaseObject::removeInheritedMember(QObject *inheritedMember)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->removeInheritedMember(qmodelingobjectproperty_cast<QUmlNamedElement *>(inheritedMember));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->removeInheritedMember(qmodelingelementproperty_cast<QUmlNamedElement *>(inheritedMember));
 }
 
 void QUmlUseCaseObject::setAbstract(bool isAbstract)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->setAbstract(isAbstract);
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->setAbstract(isAbstract);
 }
 
 void QUmlUseCaseObject::unsetAbstract()
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("abstract"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
 void QUmlUseCaseObject::setFinalSpecialization(bool isFinalSpecialization)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->setFinalSpecialization(isFinalSpecialization);
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->setFinalSpecialization(isFinalSpecialization);
 }
 
 void QUmlUseCaseObject::unsetFinalSpecialization()
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("finalSpecialization"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
 void QUmlUseCaseObject::setOwnedTemplateSignature(QObject *ownedTemplateSignature)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->setOwnedTemplateSignature(qmodelingobjectproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->setOwnedTemplateSignature(qmodelingelementproperty_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature));
 }
 
 void QUmlUseCaseObject::addOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->addOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->addOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlUseCaseObject::removeOwnedUseCase(QObject *ownedUseCase)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->removeOwnedUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(ownedUseCase));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->removeOwnedUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(ownedUseCase));
 }
 
 void QUmlUseCaseObject::addPowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->addPowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->addPowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlUseCaseObject::removePowertypeExtent(QObject *powertypeExtent)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->removePowertypeExtent(qmodelingobjectproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->removePowertypeExtent(qmodelingelementproperty_cast<QUmlGeneralizationSet *>(powertypeExtent));
 }
 
 void QUmlUseCaseObject::addRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->addRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->addRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlUseCaseObject::removeRedefinedClassifier(QObject *redefinedClassifier)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->removeRedefinedClassifier(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinedClassifier));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->removeRedefinedClassifier(qmodelingelementproperty_cast<QUmlClassifier *>(redefinedClassifier));
 }
 
 void QUmlUseCaseObject::setRepresentation(QObject *representation)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->setRepresentation(qmodelingobjectproperty_cast<QUmlCollaborationUse *>(representation));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->setRepresentation(qmodelingelementproperty_cast<QUmlCollaborationUse *>(representation));
 }
 
 void QUmlUseCaseObject::addSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->addSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->addSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlUseCaseObject::removeSubstitution(QObject *substitution)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->removeSubstitution(qmodelingobjectproperty_cast<QUmlSubstitution *>(substitution));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->removeSubstitution(qmodelingelementproperty_cast<QUmlSubstitution *>(substitution));
 }
 
 void QUmlUseCaseObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlClassifierTemplateParameter *>(templateParameter));
 }
 
 void QUmlUseCaseObject::addUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->addUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->addUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 void QUmlUseCaseObject::removeUseCase(QObject *useCase)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->removeUseCase(qmodelingobjectproperty_cast<QUmlUseCase *>(useCase));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->removeUseCase(qmodelingelementproperty_cast<QUmlUseCase *>(useCase));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [BehavioredClassifier]
 
 void QUmlUseCaseObject::setClassifierBehavior(QObject *classifierBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->setClassifierBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(classifierBehavior));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->setClassifierBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(classifierBehavior));
 }
 
 void QUmlUseCaseObject::addInterfaceRealization(QObject *interfaceRealization)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->addInterfaceRealization(qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->addInterfaceRealization(qmodelingelementproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
 }
 
 void QUmlUseCaseObject::removeInterfaceRealization(QObject *interfaceRealization)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->removeInterfaceRealization(qmodelingobjectproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->removeInterfaceRealization(qmodelingelementproperty_cast<QUmlInterfaceRealization *>(interfaceRealization));
 }
 
 void QUmlUseCaseObject::addOwnedBehavior(QObject *ownedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->addOwnedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(ownedBehavior));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->addOwnedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(ownedBehavior));
 }
 
 void QUmlUseCaseObject::removeOwnedBehavior(QObject *ownedBehavior)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->removeOwnedBehavior(qmodelingobjectproperty_cast<QUmlBehavior *>(ownedBehavior));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->removeOwnedBehavior(qmodelingelementproperty_cast<QUmlBehavior *>(ownedBehavior));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [UseCase]
 
 void QUmlUseCaseObject::addExtend(QObject *extend)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->addExtend(qmodelingobjectproperty_cast<QUmlExtend *>(extend));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->addExtend(qmodelingelementproperty_cast<QUmlExtend *>(extend));
 }
 
 void QUmlUseCaseObject::removeExtend(QObject *extend)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->removeExtend(qmodelingobjectproperty_cast<QUmlExtend *>(extend));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->removeExtend(qmodelingelementproperty_cast<QUmlExtend *>(extend));
 }
 
 void QUmlUseCaseObject::addExtensionPoint(QObject *extensionPoint)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->addExtensionPoint(qmodelingobjectproperty_cast<QUmlExtensionPoint *>(extensionPoint));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->addExtensionPoint(qmodelingelementproperty_cast<QUmlExtensionPoint *>(extensionPoint));
 }
 
 void QUmlUseCaseObject::removeExtensionPoint(QObject *extensionPoint)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->removeExtensionPoint(qmodelingobjectproperty_cast<QUmlExtensionPoint *>(extensionPoint));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->removeExtensionPoint(qmodelingelementproperty_cast<QUmlExtensionPoint *>(extensionPoint));
 }
 
 void QUmlUseCaseObject::addInclude(QObject *include)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->addInclude(qmodelingobjectproperty_cast<QUmlInclude *>(include));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->addInclude(qmodelingelementproperty_cast<QUmlInclude *>(include));
 }
 
 void QUmlUseCaseObject::removeInclude(QObject *include)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->removeInclude(qmodelingobjectproperty_cast<QUmlInclude *>(include));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->removeInclude(qmodelingelementproperty_cast<QUmlInclude *>(include));
 }
 
 void QUmlUseCaseObject::addSubject(QObject *subject)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->addSubject(qmodelingobjectproperty_cast<QUmlClassifier *>(subject));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->addSubject(qmodelingelementproperty_cast<QUmlClassifier *>(subject));
 }
 
 void QUmlUseCaseObject::removeSubject(QObject *subject)
 {
-    qmodelingobjectproperty_cast<QUmlUseCase *>(this)->removeSubject(qmodelingobjectproperty_cast<QUmlClassifier *>(subject));
+    qmodelingelementproperty_cast<QUmlUseCase *>(this)->removeSubject(qmodelingelementproperty_cast<QUmlClassifier *>(subject));
+}
+
+
+void QUmlUseCaseObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamespace");
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPackageableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlType");
+    d->groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTemplateableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
+
+    d->propertyGroups << QStringLiteral("QUmlClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generals"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+    d->groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
+
+    d->propertyGroups << QStringLiteral("QUmlBehavioredClassifier");
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifierBehavior"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interfaceRealizations"))));
+    d->groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedBehaviors"))));
+
+    d->propertyGroups << QStringLiteral("QUmlUseCase");
+    d->groupProperties.insert(QStringLiteral("QUmlUseCase"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extends"))));
+    d->groupProperties.insert(QStringLiteral("QUmlUseCase"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extensionPoints"))));
+    d->groupProperties.insert(QStringLiteral("QUmlUseCase"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("includes"))));
+    d->groupProperties.insert(QStringLiteral("QUmlUseCase"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("subjects"))));
+}
+
+void QUmlUseCaseObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUseCase, extends, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUseCase, extends, PropertyClassRole, QStringLiteral("QUmlUseCase"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUseCase, extends, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUseCase, extends, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUseCase, extends, DocumentationRole, QStringLiteral("References the Extend relationships owned by this use case."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUseCase, extends, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUseCase, extends, SubsettedPropertiesRole, QStringLiteral("A_source_directedRelationship-directedRelationship Namespace-ownedMember"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUseCase, extends, OppositeEndRole, QStringLiteral("Extend-extension"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUseCase, extensionPoints, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUseCase, extensionPoints, PropertyClassRole, QStringLiteral("QUmlUseCase"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUseCase, extensionPoints, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUseCase, extensionPoints, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUseCase, extensionPoints, DocumentationRole, QStringLiteral("References the ExtensionPoints owned by the use case."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUseCase, extensionPoints, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUseCase, extensionPoints, SubsettedPropertiesRole, QStringLiteral("Namespace-ownedMember"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUseCase, extensionPoints, OppositeEndRole, QStringLiteral("ExtensionPoint-useCase"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUseCase, includes, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUseCase, includes, PropertyClassRole, QStringLiteral("QUmlUseCase"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUseCase, includes, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUseCase, includes, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUseCase, includes, DocumentationRole, QStringLiteral("References the Include relationships owned by this use case."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUseCase, includes, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUseCase, includes, SubsettedPropertiesRole, QStringLiteral("A_source_directedRelationship-directedRelationship Namespace-ownedMember"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUseCase, includes, OppositeEndRole, QStringLiteral("Include-includingCase"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUseCase, subjects, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUseCase, subjects, PropertyClassRole, QStringLiteral("QUmlUseCase"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUseCase, subjects, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUseCase, subjects, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUseCase, subjects, DocumentationRole, QStringLiteral("References the subjects to which this use case applies. The subject or its parts realize all the use cases that apply to this subject. Use cases need not be attached to any specific subject, however. The subject may, but need not, own the use cases that apply to it."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUseCase, subjects, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUseCase, subjects, SubsettedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlUseCase, subjects, OppositeEndRole, QStringLiteral("Classifier-useCase"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlusecaseobject_p.h b/src/uml/qobjects/qumlusecaseobject_p.h
index 54a91b70..9392e0ec 100644
--- a/src/uml/qobjects/qumlusecaseobject_p.h
+++ b/src/uml/qobjects/qumlusecaseobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlUseCase;
-class Q_UML_EXPORT QUmlUseCaseObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlUseCaseObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlUseCaseObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -125,7 +128,7 @@ class Q_UML_EXPORT QUmlUseCaseObject : public QObject
     Q_PROPERTY(QSet<QObject *> subjects READ subjects)
 
 public:
-    Q_INVOKABLE explicit QUmlUseCaseObject(QUmlUseCase *qModelingObject);
+    Q_INVOKABLE explicit QUmlUseCaseObject(QUmlUseCase *qModelingElement);
     virtual ~QUmlUseCaseObject();
 
     // Owned attributes [Element]
@@ -337,6 +340,10 @@ public Q_SLOTS:
     void removeInclude(QObject *include);
     void addSubject(QObject *subject);
     void removeSubject(QObject *subject);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlvaluepinobject.cpp b/src/uml/qobjects/qumlvaluepinobject.cpp
index a53cf0aa..1694c404 100644
--- a/src/uml/qobjects/qumlvaluepinobject.cpp
+++ b/src/uml/qobjects/qumlvaluepinobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlvaluepinobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlValuePin>
 #include <QtUml/QUmlActivity>
@@ -65,16 +66,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlValuePinObject::QUmlValuePinObject(QUmlValuePin *qModelingObject)
+QUmlValuePinObject::QUmlValuePinObject(QUmlValuePin *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlValuePinObject::~QUmlValuePinObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlValuePin *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlValuePin *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -83,63 +86,63 @@ QUmlValuePinObject::~QUmlValuePinObject()
 const QSet<QObject *> QUmlValuePinObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlValuePin *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlValuePin *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlValuePinObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlValuePin *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlValuePin *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlValuePinObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlValuePin *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlValuePin *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlValuePin *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlValuePin *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [MultiplicityElement]
 
 bool QUmlValuePinObject::isOrdered() const
 {
-    return qmodelingobjectproperty_cast<QUmlValuePin *>(this)->isOrdered();
+    return qmodelingelementproperty_cast<QUmlValuePin *>(this)->isOrdered();
 }
 
 bool QUmlValuePinObject::isUnique() const
 {
-    return qmodelingobjectproperty_cast<QUmlValuePin *>(this)->isUnique();
+    return qmodelingelementproperty_cast<QUmlValuePin *>(this)->isUnique();
 }
 
 int QUmlValuePinObject::lower() const
 {
-    return qmodelingobjectproperty_cast<QUmlValuePin *>(this)->lower();
+    return qmodelingelementproperty_cast<QUmlValuePin *>(this)->lower();
 }
 
 QObject *QUmlValuePinObject::lowerValue() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlValuePin *>(this)->lowerValue())
+    if (!qmodelingelementproperty_cast<QUmlValuePin *>(this)->lowerValue())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlValuePin *>(this)->lowerValue()->asQObject();
+        return qmodelingelementproperty_cast<QUmlValuePin *>(this)->lowerValue()->asQModelingObject();
 }
 
 int QUmlValuePinObject::upper() const
 {
-    return qmodelingobjectproperty_cast<QUmlValuePin *>(this)->upper();
+    return qmodelingelementproperty_cast<QUmlValuePin *>(this)->upper();
 }
 
 QObject *QUmlValuePinObject::upperValue() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlValuePin *>(this)->upperValue())
+    if (!qmodelingelementproperty_cast<QUmlValuePin *>(this)->upperValue())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlValuePin *>(this)->upperValue()->asQObject();
+        return qmodelingelementproperty_cast<QUmlValuePin *>(this)->upperValue()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -147,62 +150,62 @@ QObject *QUmlValuePinObject::upperValue() const
 const QSet<QObject *> QUmlValuePinObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlValuePin *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlValuePin *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlValuePinObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlValuePin *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlValuePin *>(this)->name();
 }
 
 QObject *QUmlValuePinObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlValuePin *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlValuePin *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlValuePin *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlValuePin *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlValuePinObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlValuePin *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlValuePin *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlValuePin *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlValuePin *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlValuePinObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlValuePin *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlValuePin *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlValuePinObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlValuePin *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlValuePin *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlValuePinObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlValuePin *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlValuePin *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlValuePinObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlValuePin *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlValuePin *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlValuePinObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlValuePin *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlValuePin *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -210,65 +213,65 @@ const QSet<QObject *> QUmlValuePinObject::redefinitionContexts() const
 
 QObject *QUmlValuePinObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlValuePin *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlValuePin *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlValuePin *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlValuePin *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlValuePinObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlValuePin *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlValuePin *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlValuePinObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlValuePin *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlValuePin *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlValuePinObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlValuePin *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlValuePin *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlValuePinObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlValuePin *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlValuePin *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlValuePin *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlValuePin *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlValuePinObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlValuePin *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlValuePin *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlValuePinObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlValuePin *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlValuePin *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlValuePinObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlValuePin *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlValuePin *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -276,10 +279,10 @@ const QSet<QObject *> QUmlValuePinObject::redefinedNodes() const
 
 QObject *QUmlValuePinObject::type() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlValuePin *>(this)->type())
+    if (!qmodelingelementproperty_cast<QUmlValuePin *>(this)->type())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlValuePin *>(this)->type()->asQObject();
+        return qmodelingelementproperty_cast<QUmlValuePin *>(this)->type()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ObjectNode]
@@ -287,52 +290,52 @@ QObject *QUmlValuePinObject::type() const
 const QSet<QObject *> QUmlValuePinObject::inStates() const
 {
     QSet<QObject *> set;
-    foreach (QUmlState *element, qmodelingobjectproperty_cast<QUmlValuePin *>(this)->inStates())
-        set.insert(element->asQObject());
+    foreach (QUmlState *element, qmodelingelementproperty_cast<QUmlValuePin *>(this)->inStates())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlValuePinObject::isControlType() const
 {
-    return qmodelingobjectproperty_cast<QUmlValuePin *>(this)->isControlType();
+    return qmodelingelementproperty_cast<QUmlValuePin *>(this)->isControlType();
 }
 
 QtUml::ObjectNodeOrderingKind QUmlValuePinObject::ordering() const
 {
-    return qmodelingobjectproperty_cast<QUmlValuePin *>(this)->ordering();
+    return qmodelingelementproperty_cast<QUmlValuePin *>(this)->ordering();
 }
 
 QObject *QUmlValuePinObject::selection() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlValuePin *>(this)->selection())
+    if (!qmodelingelementproperty_cast<QUmlValuePin *>(this)->selection())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlValuePin *>(this)->selection()->asQObject();
+        return qmodelingelementproperty_cast<QUmlValuePin *>(this)->selection()->asQModelingObject();
 }
 
 QObject *QUmlValuePinObject::upperBound() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlValuePin *>(this)->upperBound())
+    if (!qmodelingelementproperty_cast<QUmlValuePin *>(this)->upperBound())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlValuePin *>(this)->upperBound()->asQObject();
+        return qmodelingelementproperty_cast<QUmlValuePin *>(this)->upperBound()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [Pin]
 
 bool QUmlValuePinObject::isControl() const
 {
-    return qmodelingobjectproperty_cast<QUmlValuePin *>(this)->isControl();
+    return qmodelingelementproperty_cast<QUmlValuePin *>(this)->isControl();
 }
 
 // OWNED ATTRIBUTES [ValuePin]
 
 QObject *QUmlValuePinObject::value() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlValuePin *>(this)->value())
+    if (!qmodelingelementproperty_cast<QUmlValuePin *>(this)->value())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlValuePin *>(this)->value()->asQObject();
+        return qmodelingelementproperty_cast<QUmlValuePin *>(this)->value()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -340,51 +343,51 @@ QObject *QUmlValuePinObject::value() const
 QSet<QObject *> QUmlValuePinObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlValuePin *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlValuePin *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlValuePinObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlValuePin *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlValuePin *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [MultiplicityElement]
 
 bool QUmlValuePinObject::compatibleWith(QObject *other) const
 {
-    return qmodelingobjectproperty_cast<QUmlValuePin *>(this)->compatibleWith(qmodelingobjectproperty_cast<QUmlMultiplicityElement *>(other));
+    return qmodelingelementproperty_cast<QUmlValuePin *>(this)->compatibleWith(qmodelingelementproperty_cast<QUmlMultiplicityElement *>(other));
 }
 
 bool QUmlValuePinObject::includesCardinality(int C) const
 {
-    return qmodelingobjectproperty_cast<QUmlValuePin *>(this)->includesCardinality(C);
+    return qmodelingelementproperty_cast<QUmlValuePin *>(this)->includesCardinality(C);
 }
 
 bool QUmlValuePinObject::includesMultiplicity(QObject *M) const
 {
-    return qmodelingobjectproperty_cast<QUmlValuePin *>(this)->includesMultiplicity(qmodelingobjectproperty_cast<QUmlMultiplicityElement *>(M));
+    return qmodelingelementproperty_cast<QUmlValuePin *>(this)->includesMultiplicity(qmodelingelementproperty_cast<QUmlMultiplicityElement *>(M));
 }
 
 bool QUmlValuePinObject::is(int lowerbound, int upperbound) const
 {
-    return qmodelingobjectproperty_cast<QUmlValuePin *>(this)->is(lowerbound, upperbound);
+    return qmodelingelementproperty_cast<QUmlValuePin *>(this)->is(lowerbound, upperbound);
 }
 
 bool QUmlValuePinObject::isMultivalued() const
 {
-    return qmodelingobjectproperty_cast<QUmlValuePin *>(this)->isMultivalued();
+    return qmodelingelementproperty_cast<QUmlValuePin *>(this)->isMultivalued();
 }
 
 int QUmlValuePinObject::lowerBound() const
 {
-    return qmodelingobjectproperty_cast<QUmlValuePin *>(this)->lowerBound();
+    return qmodelingelementproperty_cast<QUmlValuePin *>(this)->lowerBound();
 }
 
 //int QUmlValuePinObject::upperBound() const
 //{
-//    return qmodelingobjectproperty_cast<QUmlValuePin *>(this)->upperBound();
+//    return qmodelingelementproperty_cast<QUmlValuePin *>(this)->upperBound();
 //}
 
 // OPERATIONS [NamedElement]
@@ -392,327 +395,412 @@ int QUmlValuePinObject::lowerBound() const
 QList<QObject *> QUmlValuePinObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlValuePin *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlValuePin *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlValuePinObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlValuePin *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlValuePin *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlValuePinObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlValuePin *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlValuePin *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlValuePinObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlValuePin *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlValuePin *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlValuePinObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlValuePin *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlValuePin *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlValuePinObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlValuePin *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlValuePin *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlValuePinObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlValuePinObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlValuePinObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlValuePinObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlValuePinObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [MultiplicityElement]
 
 void QUmlValuePinObject::setOrdered(bool isOrdered)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->setOrdered(isOrdered);
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->setOrdered(isOrdered);
 }
 
 void QUmlValuePinObject::unsetOrdered()
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("ordered"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("ordered"));
 }
 
 void QUmlValuePinObject::setUnique(bool isUnique)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->setUnique(isUnique);
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->setUnique(isUnique);
 }
 
 void QUmlValuePinObject::unsetUnique()
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("unique"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("unique"));
 }
 
 void QUmlValuePinObject::setLower(int lower)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->setLower(lower);
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->setLower(lower);
 }
 
 void QUmlValuePinObject::unsetLower()
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("lower"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("lower"));
 }
 
 void QUmlValuePinObject::setLowerValue(QObject *lowerValue)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->setLowerValue(qmodelingobjectproperty_cast<QUmlValueSpecification *>(lowerValue));
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->setLowerValue(qmodelingelementproperty_cast<QUmlValueSpecification *>(lowerValue));
 }
 
 void QUmlValuePinObject::setUpper(int upper)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->setUpper(upper);
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->setUpper(upper);
 }
 
 void QUmlValuePinObject::unsetUpper()
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("upper"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("upper"));
 }
 
 void QUmlValuePinObject::setUpperValue(QObject *upperValue)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->setUpperValue(qmodelingobjectproperty_cast<QUmlValueSpecification *>(upperValue));
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->setUpperValue(qmodelingelementproperty_cast<QUmlValueSpecification *>(upperValue));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlValuePinObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlValuePinObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlValuePinObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->setName(name);
 }
 
 void QUmlValuePinObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlValuePinObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlValuePinObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlValuePinObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlValuePinObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlValuePinObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlValuePinObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlValuePinObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlValuePinObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlValuePinObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlValuePinObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlValuePinObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlValuePinObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlValuePinObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlValuePinObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlValuePinObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlValuePinObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlValuePinObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlValuePinObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlValuePinObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlValuePinObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlValuePinObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlValuePinObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlValuePinObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TypedElement]
 
 void QUmlValuePinObject::setType(QObject *type)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->setType(qmodelingobjectproperty_cast<QUmlType *>(type));
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->setType(qmodelingelementproperty_cast<QUmlType *>(type));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ObjectNode]
 
 void QUmlValuePinObject::addInState(QObject *inState)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->addInState(qmodelingobjectproperty_cast<QUmlState *>(inState));
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->addInState(qmodelingelementproperty_cast<QUmlState *>(inState));
 }
 
 void QUmlValuePinObject::removeInState(QObject *inState)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->removeInState(qmodelingobjectproperty_cast<QUmlState *>(inState));
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->removeInState(qmodelingelementproperty_cast<QUmlState *>(inState));
 }
 
 void QUmlValuePinObject::setControlType(bool isControlType)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->setControlType(isControlType);
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->setControlType(isControlType);
 }
 
 void QUmlValuePinObject::unsetControlType()
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("controlType"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("controlType"));
 }
 
 void QUmlValuePinObject::setOrdering(QtUml::ObjectNodeOrderingKind ordering)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->setOrdering(ordering);
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->setOrdering(ordering);
 }
 
 void QUmlValuePinObject::unsetOrdering()
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("ordering"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("ordering"));
 }
 
 void QUmlValuePinObject::setSelection(QObject *selection)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->setSelection(qmodelingobjectproperty_cast<QUmlBehavior *>(selection));
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->setSelection(qmodelingelementproperty_cast<QUmlBehavior *>(selection));
 }
 
 void QUmlValuePinObject::setUpperBound(QObject *upperBound)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->setUpperBound(qmodelingobjectproperty_cast<QUmlValueSpecification *>(upperBound));
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->setUpperBound(qmodelingelementproperty_cast<QUmlValueSpecification *>(upperBound));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Pin]
 
 void QUmlValuePinObject::setControl(bool isControl)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->setControl(isControl);
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->setControl(isControl);
 }
 
 void QUmlValuePinObject::unsetControl()
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("control"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("control"));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ValuePin]
 
 void QUmlValuePinObject::setValue(QObject *value)
 {
-    qmodelingobjectproperty_cast<QUmlValuePin *>(this)->setValue(qmodelingobjectproperty_cast<QUmlValueSpecification *>(value));
+    qmodelingelementproperty_cast<QUmlValuePin *>(this)->setValue(qmodelingelementproperty_cast<QUmlValueSpecification *>(value));
+}
+
+
+void QUmlValuePinObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlMultiplicityElement");
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isOrdered"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isUnique"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lower"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lowerValue"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upper"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperValue"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTypedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
+
+    d->propertyGroups << QStringLiteral("QUmlObjectNode");
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStates"))));
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isControlType"))));
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ordering"))));
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("selection"))));
+    d->groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperBound"))));
+
+    d->propertyGroups << QStringLiteral("QUmlPin");
+    d->groupProperties.insert(QStringLiteral("QUmlPin"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isControl"))));
+
+    d->propertyGroups << QStringLiteral("QUmlInputPin");
+
+    d->propertyGroups << QStringLiteral("QUmlValuePin");
+    d->groupProperties.insert(QStringLiteral("QUmlValuePin"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("value"))));
+}
+
+void QUmlValuePinObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlValuePin, value, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlValuePin, value, PropertyClassRole, QStringLiteral("QUmlValuePin"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlValuePin, value, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlValuePin, value, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlValuePin, value, DocumentationRole, QStringLiteral("Value that the pin will provide."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlValuePin, value, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlValuePin, value, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlValuePin, value, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlvaluepinobject_p.h b/src/uml/qobjects/qumlvaluepinobject_p.h
index baea1653..ce81c351 100644
--- a/src/uml/qobjects/qumlvaluepinobject_p.h
+++ b/src/uml/qobjects/qumlvaluepinobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlValuePin;
-class Q_UML_EXPORT QUmlValuePinObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlValuePinObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlValuePinObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -111,7 +114,7 @@ class Q_UML_EXPORT QUmlValuePinObject : public QObject
     Q_PROPERTY(QObject * value READ value WRITE setValue)
 
 public:
-    Q_INVOKABLE explicit QUmlValuePinObject(QUmlValuePin *qModelingObject);
+    Q_INVOKABLE explicit QUmlValuePinObject(QUmlValuePin *qModelingElement);
     virtual ~QUmlValuePinObject();
 
     // Owned attributes [Element]
@@ -262,6 +265,10 @@ public Q_SLOTS:
 
     // Slots for owned attributes [ValuePin]
     void setValue(QObject *value = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlvaluespecificationactionobject.cpp b/src/uml/qobjects/qumlvaluespecificationactionobject.cpp
index 6c01baa2..66703c79 100644
--- a/src/uml/qobjects/qumlvaluespecificationactionobject.cpp
+++ b/src/uml/qobjects/qumlvaluespecificationactionobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlvaluespecificationactionobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlValueSpecificationAction>
 #include <QtUml/QUmlActivity>
@@ -65,16 +66,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlValueSpecificationActionObject::QUmlValueSpecificationActionObject(QUmlValueSpecificationAction *qModelingObject)
+QUmlValueSpecificationActionObject::QUmlValueSpecificationActionObject(QUmlValueSpecificationAction *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlValueSpecificationActionObject::~QUmlValueSpecificationActionObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -83,25 +86,25 @@ QUmlValueSpecificationActionObject::~QUmlValueSpecificationActionObject()
 const QSet<QObject *> QUmlValueSpecificationActionObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlValueSpecificationActionObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlValueSpecificationActionObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -109,62 +112,62 @@ QObject *QUmlValueSpecificationActionObject::owner() const
 const QSet<QObject *> QUmlValueSpecificationActionObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlValueSpecificationActionObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->name();
 }
 
 QObject *QUmlValueSpecificationActionObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlValueSpecificationActionObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlValueSpecificationActionObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlValueSpecificationActionObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [RedefinableElement]
 
 bool QUmlValueSpecificationActionObject::isLeaf() const
 {
-    return qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->isLeaf();
+    return qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->isLeaf();
 }
 
 const QSet<QObject *> QUmlValueSpecificationActionObject::redefinedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlRedefinableElement *element, qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->redefinedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlRedefinableElement *element, qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->redefinedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlValueSpecificationActionObject::redefinitionContexts() const
 {
     QSet<QObject *> set;
-    foreach (QUmlClassifier *element, qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->redefinitionContexts())
-        set.insert(element->asQObject());
+    foreach (QUmlClassifier *element, qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->redefinitionContexts())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -172,65 +175,65 @@ const QSet<QObject *> QUmlValueSpecificationActionObject::redefinitionContexts()
 
 QObject *QUmlValueSpecificationActionObject::activity() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->activity())
+    if (!qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->activity())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->activity()->asQObject();
+        return qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->activity()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlValueSpecificationActionObject::inGroups() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityGroup *element, qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->inGroups())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityGroup *element, qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->inGroups())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlValueSpecificationActionObject::inInterruptibleRegions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlInterruptibleActivityRegion *element, qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->inInterruptibleRegions())
-        set.insert(element->asQObject());
+    foreach (QUmlInterruptibleActivityRegion *element, qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->inInterruptibleRegions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlValueSpecificationActionObject::inPartitions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityPartition *element, qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->inPartitions())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityPartition *element, qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->inPartitions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlValueSpecificationActionObject::inStructuredNode() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->inStructuredNode())
+    if (!qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->inStructuredNode())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->inStructuredNode()->asQObject();
+        return qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->inStructuredNode()->asQModelingObject();
 }
 
 const QSet<QObject *> QUmlValueSpecificationActionObject::incomings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->incomings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->incomings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlValueSpecificationActionObject::outgoings() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityEdge *element, qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->outgoings())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityEdge *element, qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->outgoings())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlValueSpecificationActionObject::redefinedNodes() const
 {
     QSet<QObject *> set;
-    foreach (QUmlActivityNode *element, qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->redefinedNodes())
-        set.insert(element->asQObject());
+    foreach (QUmlActivityNode *element, qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->redefinedNodes())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -239,8 +242,8 @@ const QSet<QObject *> QUmlValueSpecificationActionObject::redefinedNodes() const
 const QSet<QObject *> QUmlValueSpecificationActionObject::handlers() const
 {
     QSet<QObject *> set;
-    foreach (QUmlExceptionHandler *element, qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->handlers())
-        set.insert(element->asQObject());
+    foreach (QUmlExceptionHandler *element, qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->handlers())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
@@ -248,46 +251,46 @@ const QSet<QObject *> QUmlValueSpecificationActionObject::handlers() const
 
 QObject *QUmlValueSpecificationActionObject::context() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->context())
+    if (!qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->context())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->context()->asQObject();
+        return qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->context()->asQModelingObject();
 }
 
 const QList<QObject *> QUmlValueSpecificationActionObject::inputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlInputPin *element, qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->inputs())
-        list.append(element->asQObject());
+    foreach (QUmlInputPin *element, qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->inputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 bool QUmlValueSpecificationActionObject::isLocallyReentrant() const
 {
-    return qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->isLocallyReentrant();
+    return qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->isLocallyReentrant();
 }
 
 const QSet<QObject *> QUmlValueSpecificationActionObject::localPostconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->localPostconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->localPostconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlValueSpecificationActionObject::localPreconditions() const
 {
     QSet<QObject *> set;
-    foreach (QUmlConstraint *element, qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->localPreconditions())
-        set.insert(element->asQObject());
+    foreach (QUmlConstraint *element, qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->localPreconditions())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QList<QObject *> QUmlValueSpecificationActionObject::outputs() const
 {
     QList<QObject *> list;
-    foreach (QUmlOutputPin *element, qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->outputs())
-        list.append(element->asQObject());
+    foreach (QUmlOutputPin *element, qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->outputs())
+        list.append(element->asQModelingObject());
     return list;
 }
 
@@ -295,18 +298,18 @@ const QList<QObject *> QUmlValueSpecificationActionObject::outputs() const
 
 QObject *QUmlValueSpecificationActionObject::result() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->result())
+    if (!qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->result())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->result()->asQObject();
+        return qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->result()->asQModelingObject();
 }
 
 QObject *QUmlValueSpecificationActionObject::value() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->value())
+    if (!qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->value())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->value()->asQObject();
+        return qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->value()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -314,14 +317,14 @@ QObject *QUmlValueSpecificationActionObject::value() const
 QSet<QObject *> QUmlValueSpecificationActionObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlValueSpecificationActionObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [NamedElement]
@@ -329,288 +332,365 @@ bool QUmlValueSpecificationActionObject::mustBeOwned() const
 QList<QObject *> QUmlValueSpecificationActionObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlValueSpecificationActionObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlValueSpecificationActionObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlValueSpecificationActionObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->separator();
 }
 
 // OPERATIONS [RedefinableElement]
 
 bool QUmlValueSpecificationActionObject::isConsistentWith(QObject *redefinee) const
 {
-    return qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->isConsistentWith(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinee));
+    return qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->isConsistentWith(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinee));
 }
 
 bool QUmlValueSpecificationActionObject::isRedefinitionContextValid(QObject *redefined) const
 {
-    return qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->isRedefinitionContextValid(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefined));
+    return qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->isRedefinitionContextValid(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefined));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlValueSpecificationActionObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlValueSpecificationActionObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlValueSpecificationActionObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlValueSpecificationActionObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlValueSpecificationActionObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlValueSpecificationActionObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlValueSpecificationActionObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlValueSpecificationActionObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->setName(name);
 }
 
 void QUmlValueSpecificationActionObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlValueSpecificationActionObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlValueSpecificationActionObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlValueSpecificationActionObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [RedefinableElement]
 
 void QUmlValueSpecificationActionObject::setLeaf(bool isLeaf)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->setLeaf(isLeaf);
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->setLeaf(isLeaf);
 }
 
 void QUmlValueSpecificationActionObject::unsetLeaf()
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("leaf"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
 void QUmlValueSpecificationActionObject::addRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->addRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->addRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlValueSpecificationActionObject::removeRedefinedElement(QObject *redefinedElement)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->removeRedefinedElement(qmodelingobjectproperty_cast<QUmlRedefinableElement *>(redefinedElement));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->removeRedefinedElement(qmodelingelementproperty_cast<QUmlRedefinableElement *>(redefinedElement));
 }
 
 void QUmlValueSpecificationActionObject::addRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->addRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->addRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 void QUmlValueSpecificationActionObject::removeRedefinitionContext(QObject *redefinitionContext)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->removeRedefinitionContext(qmodelingobjectproperty_cast<QUmlClassifier *>(redefinitionContext));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->removeRedefinitionContext(qmodelingelementproperty_cast<QUmlClassifier *>(redefinitionContext));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ActivityNode]
 
 void QUmlValueSpecificationActionObject::setActivity(QObject *activity)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->setActivity(qmodelingobjectproperty_cast<QUmlActivity *>(activity));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->setActivity(qmodelingelementproperty_cast<QUmlActivity *>(activity));
 }
 
 void QUmlValueSpecificationActionObject::addInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->addInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->addInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlValueSpecificationActionObject::removeInGroup(QObject *inGroup)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->removeInGroup(qmodelingobjectproperty_cast<QUmlActivityGroup *>(inGroup));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->removeInGroup(qmodelingelementproperty_cast<QUmlActivityGroup *>(inGroup));
 }
 
 void QUmlValueSpecificationActionObject::addInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->addInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->addInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlValueSpecificationActionObject::removeInInterruptibleRegion(QObject *inInterruptibleRegion)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->removeInInterruptibleRegion(qmodelingobjectproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->removeInInterruptibleRegion(qmodelingelementproperty_cast<QUmlInterruptibleActivityRegion *>(inInterruptibleRegion));
 }
 
 void QUmlValueSpecificationActionObject::addInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->addInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->addInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlValueSpecificationActionObject::removeInPartition(QObject *inPartition)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->removeInPartition(qmodelingobjectproperty_cast<QUmlActivityPartition *>(inPartition));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->removeInPartition(qmodelingelementproperty_cast<QUmlActivityPartition *>(inPartition));
 }
 
 void QUmlValueSpecificationActionObject::setInStructuredNode(QObject *inStructuredNode)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->setInStructuredNode(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->setInStructuredNode(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(inStructuredNode));
 }
 
 void QUmlValueSpecificationActionObject::addIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->addIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->addIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlValueSpecificationActionObject::removeIncoming(QObject *incoming)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->removeIncoming(qmodelingobjectproperty_cast<QUmlActivityEdge *>(incoming));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->removeIncoming(qmodelingelementproperty_cast<QUmlActivityEdge *>(incoming));
 }
 
 void QUmlValueSpecificationActionObject::addOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->addOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->addOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlValueSpecificationActionObject::removeOutgoing(QObject *outgoing)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->removeOutgoing(qmodelingobjectproperty_cast<QUmlActivityEdge *>(outgoing));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->removeOutgoing(qmodelingelementproperty_cast<QUmlActivityEdge *>(outgoing));
 }
 
 void QUmlValueSpecificationActionObject::addRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->addRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->addRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 void QUmlValueSpecificationActionObject::removeRedefinedNode(QObject *redefinedNode)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->removeRedefinedNode(qmodelingobjectproperty_cast<QUmlActivityNode *>(redefinedNode));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->removeRedefinedNode(qmodelingelementproperty_cast<QUmlActivityNode *>(redefinedNode));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ExecutableNode]
 
 void QUmlValueSpecificationActionObject::addHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->addHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->addHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 void QUmlValueSpecificationActionObject::removeHandler(QObject *handler)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->removeHandler(qmodelingobjectproperty_cast<QUmlExceptionHandler *>(handler));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->removeHandler(qmodelingelementproperty_cast<QUmlExceptionHandler *>(handler));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Action]
 
 void QUmlValueSpecificationActionObject::setContext(QObject *context)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->setContext(qmodelingobjectproperty_cast<QUmlClassifier *>(context));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->setContext(qmodelingelementproperty_cast<QUmlClassifier *>(context));
 }
 
 void QUmlValueSpecificationActionObject::addInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->addInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->addInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlValueSpecificationActionObject::removeInput(QObject *input)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->removeInput(qmodelingobjectproperty_cast<QUmlInputPin *>(input));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->removeInput(qmodelingelementproperty_cast<QUmlInputPin *>(input));
 }
 
 void QUmlValueSpecificationActionObject::setLocallyReentrant(bool isLocallyReentrant)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->setLocallyReentrant(isLocallyReentrant);
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->setLocallyReentrant(isLocallyReentrant);
 }
 
 void QUmlValueSpecificationActionObject::unsetLocallyReentrant()
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("locallyReentrant"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
 void QUmlValueSpecificationActionObject::addLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->addLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->addLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlValueSpecificationActionObject::removeLocalPostcondition(QObject *localPostcondition)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->removeLocalPostcondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPostcondition));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->removeLocalPostcondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPostcondition));
 }
 
 void QUmlValueSpecificationActionObject::addLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->addLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->addLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlValueSpecificationActionObject::removeLocalPrecondition(QObject *localPrecondition)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->removeLocalPrecondition(qmodelingobjectproperty_cast<QUmlConstraint *>(localPrecondition));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->removeLocalPrecondition(qmodelingelementproperty_cast<QUmlConstraint *>(localPrecondition));
 }
 
 void QUmlValueSpecificationActionObject::addOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->addOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->addOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 void QUmlValueSpecificationActionObject::removeOutput(QObject *output)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->removeOutput(qmodelingobjectproperty_cast<QUmlOutputPin *>(output));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->removeOutput(qmodelingelementproperty_cast<QUmlOutputPin *>(output));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ValueSpecificationAction]
 
 void QUmlValueSpecificationActionObject::setResult(QObject *result)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->setResult(qmodelingobjectproperty_cast<QUmlOutputPin *>(result));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->setResult(qmodelingelementproperty_cast<QUmlOutputPin *>(result));
 }
 
 void QUmlValueSpecificationActionObject::setValue(QObject *value)
 {
-    qmodelingobjectproperty_cast<QUmlValueSpecificationAction *>(this)->setValue(qmodelingobjectproperty_cast<QUmlValueSpecification *>(value));
+    qmodelingelementproperty_cast<QUmlValueSpecificationAction *>(this)->setValue(qmodelingelementproperty_cast<QUmlValueSpecification *>(value));
+}
+
+
+void QUmlValueSpecificationActionObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlRedefinableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
+
+    d->propertyGroups << QStringLiteral("QUmlActivityNode");
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
+    d->groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
+
+    d->propertyGroups << QStringLiteral("QUmlExecutableNode");
+    d->groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
+
+    d->propertyGroups << QStringLiteral("QUmlAction");
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
+    d->groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
+
+    d->propertyGroups << QStringLiteral("QUmlValueSpecificationAction");
+    d->groupProperties.insert(QStringLiteral("QUmlValueSpecificationAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("result"))));
+    d->groupProperties.insert(QStringLiteral("QUmlValueSpecificationAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("value"))));
+}
+
+void QUmlValueSpecificationActionObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlValueSpecificationAction, result, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlValueSpecificationAction, result, PropertyClassRole, QStringLiteral("QUmlValueSpecificationAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlValueSpecificationAction, result, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlValueSpecificationAction, result, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlValueSpecificationAction, result, DocumentationRole, QStringLiteral("Gives the output pin on which the result is put."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlValueSpecificationAction, result, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlValueSpecificationAction, result, SubsettedPropertiesRole, QStringLiteral("Action-output"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlValueSpecificationAction, result, OppositeEndRole, QStringLiteral(""));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlValueSpecificationAction, value, AggregationRole, QStringLiteral("composite"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlValueSpecificationAction, value, PropertyClassRole, QStringLiteral("QUmlValueSpecificationAction"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlValueSpecificationAction, value, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlValueSpecificationAction, value, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlValueSpecificationAction, value, DocumentationRole, QStringLiteral("Value specification to be evaluated."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlValueSpecificationAction, value, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlValueSpecificationAction, value, SubsettedPropertiesRole, QStringLiteral("Element-ownedElement"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlValueSpecificationAction, value, OppositeEndRole, QStringLiteral(""));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlvaluespecificationactionobject_p.h b/src/uml/qobjects/qumlvaluespecificationactionobject_p.h
index 28cd380a..374ab6e4 100644
--- a/src/uml/qobjects/qumlvaluespecificationactionobject_p.h
+++ b/src/uml/qobjects/qumlvaluespecificationactionobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlValueSpecificationAction;
-class Q_UML_EXPORT QUmlValueSpecificationActionObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlValueSpecificationActionObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlValueSpecificationActionObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -102,7 +105,7 @@ class Q_UML_EXPORT QUmlValueSpecificationActionObject : public QObject
     Q_PROPERTY(QObject * value READ value WRITE setValue)
 
 public:
-    Q_INVOKABLE explicit QUmlValueSpecificationActionObject(QUmlValueSpecificationAction *qModelingObject);
+    Q_INVOKABLE explicit QUmlValueSpecificationActionObject(QUmlValueSpecificationAction *qModelingElement);
     virtual ~QUmlValueSpecificationActionObject();
 
     // Owned attributes [Element]
@@ -224,6 +227,10 @@ public Q_SLOTS:
     // Slots for owned attributes [ValueSpecificationAction]
     void setResult(QObject *result = 0);
     void setValue(QObject *value = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlvariableobject.cpp b/src/uml/qobjects/qumlvariableobject.cpp
index 986a5cf5..f58a15eb 100644
--- a/src/uml/qobjects/qumlvariableobject.cpp
+++ b/src/uml/qobjects/qumlvariableobject.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "qumlvariableobject_p.h"
+#include "private/qmodelingobject_p.h"
 
 #include <QtUml/QUmlVariable>
 #include <QtUml/QUmlAction>
@@ -61,16 +62,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QUmlVariableObject::QUmlVariableObject(QUmlVariable *qModelingObject)
+QUmlVariableObject::QUmlVariableObject(QUmlVariable *qModelingElement)
 {
-    setProperty("modelingObject", QVariant::fromValue(static_cast<QModelingObject *>(qModelingObject)));
+    setProperty("modelingElement", QVariant::fromValue(static_cast<QModelingElement *>(qModelingElement)));
+    setGroupProperties();
+    setPropertyData();
 }
 
 QUmlVariableObject::~QUmlVariableObject()
 {
     if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingobjectproperty_cast<QUmlVariable *>(this)->deletingFromQObject = true;
-        delete qmodelingobjectproperty_cast<QUmlComment *>(this);
+        qmodelingelementproperty_cast<QUmlVariable *>(this)->deletingFromQModelingObject = true;
+        delete qmodelingelementproperty_cast<QUmlComment *>(this);
     }
 }
 
@@ -79,63 +82,63 @@ QUmlVariableObject::~QUmlVariableObject()
 const QSet<QObject *> QUmlVariableObject::ownedComments() const
 {
     QSet<QObject *> set;
-    foreach (QUmlComment *element, qmodelingobjectproperty_cast<QUmlVariable *>(this)->ownedComments())
-        set.insert(element->asQObject());
+    foreach (QUmlComment *element, qmodelingelementproperty_cast<QUmlVariable *>(this)->ownedComments())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 const QSet<QObject *> QUmlVariableObject::ownedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlVariable *>(this)->ownedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlVariable *>(this)->ownedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QObject *QUmlVariableObject::owner() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlVariable *>(this)->owner())
+    if (!qmodelingelementproperty_cast<QUmlVariable *>(this)->owner())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlVariable *>(this)->owner()->asQObject();
+        return qmodelingelementproperty_cast<QUmlVariable *>(this)->owner()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [MultiplicityElement]
 
 bool QUmlVariableObject::isOrdered() const
 {
-    return qmodelingobjectproperty_cast<QUmlVariable *>(this)->isOrdered();
+    return qmodelingelementproperty_cast<QUmlVariable *>(this)->isOrdered();
 }
 
 bool QUmlVariableObject::isUnique() const
 {
-    return qmodelingobjectproperty_cast<QUmlVariable *>(this)->isUnique();
+    return qmodelingelementproperty_cast<QUmlVariable *>(this)->isUnique();
 }
 
 int QUmlVariableObject::lower() const
 {
-    return qmodelingobjectproperty_cast<QUmlVariable *>(this)->lower();
+    return qmodelingelementproperty_cast<QUmlVariable *>(this)->lower();
 }
 
 QObject *QUmlVariableObject::lowerValue() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlVariable *>(this)->lowerValue())
+    if (!qmodelingelementproperty_cast<QUmlVariable *>(this)->lowerValue())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlVariable *>(this)->lowerValue()->asQObject();
+        return qmodelingelementproperty_cast<QUmlVariable *>(this)->lowerValue()->asQModelingObject();
 }
 
 int QUmlVariableObject::upper() const
 {
-    return qmodelingobjectproperty_cast<QUmlVariable *>(this)->upper();
+    return qmodelingelementproperty_cast<QUmlVariable *>(this)->upper();
 }
 
 QObject *QUmlVariableObject::upperValue() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlVariable *>(this)->upperValue())
+    if (!qmodelingelementproperty_cast<QUmlVariable *>(this)->upperValue())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlVariable *>(this)->upperValue()->asQObject();
+        return qmodelingelementproperty_cast<QUmlVariable *>(this)->upperValue()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [NamedElement]
@@ -143,60 +146,60 @@ QObject *QUmlVariableObject::upperValue() const
 const QSet<QObject *> QUmlVariableObject::clientDependencies() const
 {
     QSet<QObject *> set;
-    foreach (QUmlDependency *element, qmodelingobjectproperty_cast<QUmlVariable *>(this)->clientDependencies())
-        set.insert(element->asQObject());
+    foreach (QUmlDependency *element, qmodelingelementproperty_cast<QUmlVariable *>(this)->clientDependencies())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 QString QUmlVariableObject::name() const
 {
-    return qmodelingobjectproperty_cast<QUmlVariable *>(this)->name();
+    return qmodelingelementproperty_cast<QUmlVariable *>(this)->name();
 }
 
 QObject *QUmlVariableObject::nameExpression() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlVariable *>(this)->nameExpression())
+    if (!qmodelingelementproperty_cast<QUmlVariable *>(this)->nameExpression())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlVariable *>(this)->nameExpression()->asQObject();
+        return qmodelingelementproperty_cast<QUmlVariable *>(this)->nameExpression()->asQModelingObject();
 }
 
 QObject *QUmlVariableObject::namespace_() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlVariable *>(this)->namespace_())
+    if (!qmodelingelementproperty_cast<QUmlVariable *>(this)->namespace_())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlVariable *>(this)->namespace_()->asQObject();
+        return qmodelingelementproperty_cast<QUmlVariable *>(this)->namespace_()->asQModelingObject();
 }
 
 QString QUmlVariableObject::qualifiedName() const
 {
-    return qmodelingobjectproperty_cast<QUmlVariable *>(this)->qualifiedName();
+    return qmodelingelementproperty_cast<QUmlVariable *>(this)->qualifiedName();
 }
 
 QtUml::VisibilityKind QUmlVariableObject::visibility() const
 {
-    return qmodelingobjectproperty_cast<QUmlVariable *>(this)->visibility();
+    return qmodelingelementproperty_cast<QUmlVariable *>(this)->visibility();
 }
 
 // OWNED ATTRIBUTES [TypedElement]
 
 QObject *QUmlVariableObject::type() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlVariable *>(this)->type())
+    if (!qmodelingelementproperty_cast<QUmlVariable *>(this)->type())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlVariable *>(this)->type()->asQObject();
+        return qmodelingelementproperty_cast<QUmlVariable *>(this)->type()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ParameterableElement]
 
 QObject *QUmlVariableObject::owningTemplateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlVariable *>(this)->owningTemplateParameter())
+    if (!qmodelingelementproperty_cast<QUmlVariable *>(this)->owningTemplateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlVariable *>(this)->owningTemplateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlVariable *>(this)->owningTemplateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [ConnectableElement]
@@ -204,35 +207,35 @@ QObject *QUmlVariableObject::owningTemplateParameter() const
 const QList<QObject *> QUmlVariableObject::ends() const
 {
     QList<QObject *> list;
-    foreach (QUmlConnectorEnd *element, qmodelingobjectproperty_cast<QUmlVariable *>(this)->ends())
-        list.append(element->asQObject());
+    foreach (QUmlConnectorEnd *element, qmodelingelementproperty_cast<QUmlVariable *>(this)->ends())
+        list.append(element->asQModelingObject());
     return list;
 }
 
 QObject *QUmlVariableObject::templateParameter() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlVariable *>(this)->templateParameter())
+    if (!qmodelingelementproperty_cast<QUmlVariable *>(this)->templateParameter())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlVariable *>(this)->templateParameter()->asQObject();
+        return qmodelingelementproperty_cast<QUmlVariable *>(this)->templateParameter()->asQModelingObject();
 }
 
 // OWNED ATTRIBUTES [Variable]
 
 QObject *QUmlVariableObject::activityScope() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlVariable *>(this)->activityScope())
+    if (!qmodelingelementproperty_cast<QUmlVariable *>(this)->activityScope())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlVariable *>(this)->activityScope()->asQObject();
+        return qmodelingelementproperty_cast<QUmlVariable *>(this)->activityScope()->asQModelingObject();
 }
 
 QObject *QUmlVariableObject::scope() const
 {
-    if (!qmodelingobjectproperty_cast<QUmlVariable *>(this)->scope())
+    if (!qmodelingelementproperty_cast<QUmlVariable *>(this)->scope())
         return 0;
     else
-        return qmodelingobjectproperty_cast<QUmlVariable *>(this)->scope()->asQObject();
+        return qmodelingelementproperty_cast<QUmlVariable *>(this)->scope()->asQModelingObject();
 }
 
 // OPERATIONS [Element]
@@ -240,51 +243,51 @@ QObject *QUmlVariableObject::scope() const
 QSet<QObject *> QUmlVariableObject::allOwnedElements() const
 {
     QSet<QObject *> set;
-    foreach (QUmlElement *element, qmodelingobjectproperty_cast<QUmlVariable *>(this)->allOwnedElements())
-        set.insert(element->asQObject());
+    foreach (QUmlElement *element, qmodelingelementproperty_cast<QUmlVariable *>(this)->allOwnedElements())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlVariableObject::mustBeOwned() const
 {
-    return qmodelingobjectproperty_cast<QUmlVariable *>(this)->mustBeOwned();
+    return qmodelingelementproperty_cast<QUmlVariable *>(this)->mustBeOwned();
 }
 
 // OPERATIONS [MultiplicityElement]
 
 bool QUmlVariableObject::compatibleWith(QObject *other) const
 {
-    return qmodelingobjectproperty_cast<QUmlVariable *>(this)->compatibleWith(qmodelingobjectproperty_cast<QUmlMultiplicityElement *>(other));
+    return qmodelingelementproperty_cast<QUmlVariable *>(this)->compatibleWith(qmodelingelementproperty_cast<QUmlMultiplicityElement *>(other));
 }
 
 bool QUmlVariableObject::includesCardinality(int C) const
 {
-    return qmodelingobjectproperty_cast<QUmlVariable *>(this)->includesCardinality(C);
+    return qmodelingelementproperty_cast<QUmlVariable *>(this)->includesCardinality(C);
 }
 
 bool QUmlVariableObject::includesMultiplicity(QObject *M) const
 {
-    return qmodelingobjectproperty_cast<QUmlVariable *>(this)->includesMultiplicity(qmodelingobjectproperty_cast<QUmlMultiplicityElement *>(M));
+    return qmodelingelementproperty_cast<QUmlVariable *>(this)->includesMultiplicity(qmodelingelementproperty_cast<QUmlMultiplicityElement *>(M));
 }
 
 bool QUmlVariableObject::is(int lowerbound, int upperbound) const
 {
-    return qmodelingobjectproperty_cast<QUmlVariable *>(this)->is(lowerbound, upperbound);
+    return qmodelingelementproperty_cast<QUmlVariable *>(this)->is(lowerbound, upperbound);
 }
 
 bool QUmlVariableObject::isMultivalued() const
 {
-    return qmodelingobjectproperty_cast<QUmlVariable *>(this)->isMultivalued();
+    return qmodelingelementproperty_cast<QUmlVariable *>(this)->isMultivalued();
 }
 
 int QUmlVariableObject::lowerBound() const
 {
-    return qmodelingobjectproperty_cast<QUmlVariable *>(this)->lowerBound();
+    return qmodelingelementproperty_cast<QUmlVariable *>(this)->lowerBound();
 }
 
 //int QUmlVariableObject::upperBound() const
 //{
-//    return qmodelingobjectproperty_cast<QUmlVariable *>(this)->upperBound();
+//    return qmodelingelementproperty_cast<QUmlVariable *>(this)->upperBound();
 //}
 
 // OPERATIONS [NamedElement]
@@ -292,204 +295,275 @@ int QUmlVariableObject::lowerBound() const
 QList<QObject *> QUmlVariableObject::allNamespaces() const
 {
     QList<QObject *> set;
-    foreach (QUmlNamespace *element, qmodelingobjectproperty_cast<QUmlVariable *>(this)->allNamespaces())
-        set.append(element->asQObject());
+    foreach (QUmlNamespace *element, qmodelingelementproperty_cast<QUmlVariable *>(this)->allNamespaces())
+        set.append(element->asQModelingObject());
     return set;
 }
 
 QSet<QObject *> QUmlVariableObject::allOwningPackages() const
 {
     QSet<QObject *> set;
-    foreach (QUmlPackage *element, qmodelingobjectproperty_cast<QUmlVariable *>(this)->allOwningPackages())
-        set.insert(element->asQObject());
+    foreach (QUmlPackage *element, qmodelingelementproperty_cast<QUmlVariable *>(this)->allOwningPackages())
+        set.insert(element->asQModelingObject());
     return set;
 }
 
 bool QUmlVariableObject::isDistinguishableFrom(QObject *n, QObject *ns) const
 {
-    return qmodelingobjectproperty_cast<QUmlVariable *>(this)->isDistinguishableFrom(qmodelingobjectproperty_cast<QUmlNamedElement *>(n), qmodelingobjectproperty_cast<QUmlNamespace *>(ns));
+    return qmodelingelementproperty_cast<QUmlVariable *>(this)->isDistinguishableFrom(qmodelingelementproperty_cast<QUmlNamedElement *>(n), qmodelingelementproperty_cast<QUmlNamespace *>(ns));
 }
 
 QString QUmlVariableObject::separator() const
 {
-    return qmodelingobjectproperty_cast<QUmlVariable *>(this)->separator();
+    return qmodelingelementproperty_cast<QUmlVariable *>(this)->separator();
 }
 
 // OPERATIONS [ParameterableElement]
 
 bool QUmlVariableObject::isCompatibleWith(QObject *p) const
 {
-    return qmodelingobjectproperty_cast<QUmlVariable *>(this)->isCompatibleWith(qmodelingobjectproperty_cast<QUmlParameterableElement *>(p));
+    return qmodelingelementproperty_cast<QUmlVariable *>(this)->isCompatibleWith(qmodelingelementproperty_cast<QUmlParameterableElement *>(p));
 }
 
 bool QUmlVariableObject::isTemplateParameter() const
 {
-    return qmodelingobjectproperty_cast<QUmlVariable *>(this)->isTemplateParameter();
+    return qmodelingelementproperty_cast<QUmlVariable *>(this)->isTemplateParameter();
 }
 
 // OPERATIONS [Variable]
 
 bool QUmlVariableObject::isAccessibleBy(QObject *a) const
 {
-    return qmodelingobjectproperty_cast<QUmlVariable *>(this)->isAccessibleBy(qmodelingobjectproperty_cast<QUmlAction *>(a));
+    return qmodelingelementproperty_cast<QUmlVariable *>(this)->isAccessibleBy(qmodelingelementproperty_cast<QUmlAction *>(a));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Element]
 
 void QUmlVariableObject::addOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlVariable *>(this)->addOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlVariable *>(this)->addOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlVariableObject::removeOwnedComment(QObject *ownedComment)
 {
-    qmodelingobjectproperty_cast<QUmlVariable *>(this)->removeOwnedComment(qmodelingobjectproperty_cast<QUmlComment *>(ownedComment));
+    qmodelingelementproperty_cast<QUmlVariable *>(this)->removeOwnedComment(qmodelingelementproperty_cast<QUmlComment *>(ownedComment));
 }
 
 void QUmlVariableObject::addOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlVariable *>(this)->addOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlVariable *>(this)->addOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlVariableObject::removeOwnedElement(QObject *ownedElement)
 {
-    qmodelingobjectproperty_cast<QUmlVariable *>(this)->removeOwnedElement(qmodelingobjectproperty_cast<QUmlElement *>(ownedElement));
+    qmodelingelementproperty_cast<QUmlVariable *>(this)->removeOwnedElement(qmodelingelementproperty_cast<QUmlElement *>(ownedElement));
 }
 
 void QUmlVariableObject::setOwner(QObject *owner)
 {
-    qmodelingobjectproperty_cast<QUmlVariable *>(this)->setOwner(qmodelingobjectproperty_cast<QUmlElement *>(owner));
+    qmodelingelementproperty_cast<QUmlVariable *>(this)->setOwner(qmodelingelementproperty_cast<QUmlElement *>(owner));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [MultiplicityElement]
 
 void QUmlVariableObject::setOrdered(bool isOrdered)
 {
-    qmodelingobjectproperty_cast<QUmlVariable *>(this)->setOrdered(isOrdered);
+    qmodelingelementproperty_cast<QUmlVariable *>(this)->setOrdered(isOrdered);
 }
 
 void QUmlVariableObject::unsetOrdered()
 {
-    qmodelingobjectproperty_cast<QUmlVariable *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("ordered"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("ordered"));
 }
 
 void QUmlVariableObject::setUnique(bool isUnique)
 {
-    qmodelingobjectproperty_cast<QUmlVariable *>(this)->setUnique(isUnique);
+    qmodelingelementproperty_cast<QUmlVariable *>(this)->setUnique(isUnique);
 }
 
 void QUmlVariableObject::unsetUnique()
 {
-    qmodelingobjectproperty_cast<QUmlVariable *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("unique"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("unique"));
 }
 
 void QUmlVariableObject::setLower(int lower)
 {
-    qmodelingobjectproperty_cast<QUmlVariable *>(this)->setLower(lower);
+    qmodelingelementproperty_cast<QUmlVariable *>(this)->setLower(lower);
 }
 
 void QUmlVariableObject::unsetLower()
 {
-    qmodelingobjectproperty_cast<QUmlVariable *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("lower"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("lower"));
 }
 
 void QUmlVariableObject::setLowerValue(QObject *lowerValue)
 {
-    qmodelingobjectproperty_cast<QUmlVariable *>(this)->setLowerValue(qmodelingobjectproperty_cast<QUmlValueSpecification *>(lowerValue));
+    qmodelingelementproperty_cast<QUmlVariable *>(this)->setLowerValue(qmodelingelementproperty_cast<QUmlValueSpecification *>(lowerValue));
 }
 
 void QUmlVariableObject::setUpper(int upper)
 {
-    qmodelingobjectproperty_cast<QUmlVariable *>(this)->setUpper(upper);
+    qmodelingelementproperty_cast<QUmlVariable *>(this)->setUpper(upper);
 }
 
 void QUmlVariableObject::unsetUpper()
 {
-    qmodelingobjectproperty_cast<QUmlVariable *>(this)->modifiedResettableProperties().removeAll(QStringLiteral("upper"));
+    Q_D(QModelingObject);
+    d->modifiedResettableProperties.removeAll(QStringLiteral("upper"));
 }
 
 void QUmlVariableObject::setUpperValue(QObject *upperValue)
 {
-    qmodelingobjectproperty_cast<QUmlVariable *>(this)->setUpperValue(qmodelingobjectproperty_cast<QUmlValueSpecification *>(upperValue));
+    qmodelingelementproperty_cast<QUmlVariable *>(this)->setUpperValue(qmodelingelementproperty_cast<QUmlValueSpecification *>(upperValue));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [NamedElement]
 
 void QUmlVariableObject::addClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlVariable *>(this)->addClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlVariable *>(this)->addClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlVariableObject::removeClientDependency(QObject *clientDependency)
 {
-    qmodelingobjectproperty_cast<QUmlVariable *>(this)->removeClientDependency(qmodelingobjectproperty_cast<QUmlDependency *>(clientDependency));
+    qmodelingelementproperty_cast<QUmlVariable *>(this)->removeClientDependency(qmodelingelementproperty_cast<QUmlDependency *>(clientDependency));
 }
 
 void QUmlVariableObject::setName(QString name)
 {
-    qmodelingobjectproperty_cast<QUmlVariable *>(this)->setName(name);
+    qmodelingelementproperty_cast<QUmlVariable *>(this)->setName(name);
 }
 
 void QUmlVariableObject::setNameExpression(QObject *nameExpression)
 {
-    qmodelingobjectproperty_cast<QUmlVariable *>(this)->setNameExpression(qmodelingobjectproperty_cast<QUmlStringExpression *>(nameExpression));
+    qmodelingelementproperty_cast<QUmlVariable *>(this)->setNameExpression(qmodelingelementproperty_cast<QUmlStringExpression *>(nameExpression));
 }
 
 void QUmlVariableObject::setNamespace(QObject *namespace_)
 {
-    qmodelingobjectproperty_cast<QUmlVariable *>(this)->setNamespace(qmodelingobjectproperty_cast<QUmlNamespace *>(namespace_));
+    qmodelingelementproperty_cast<QUmlVariable *>(this)->setNamespace(qmodelingelementproperty_cast<QUmlNamespace *>(namespace_));
 }
 
 void QUmlVariableObject::setQualifiedName(QString qualifiedName)
 {
-    qmodelingobjectproperty_cast<QUmlVariable *>(this)->setQualifiedName(qualifiedName);
+    qmodelingelementproperty_cast<QUmlVariable *>(this)->setQualifiedName(qualifiedName);
 }
 
 void QUmlVariableObject::setVisibility(QtUml::VisibilityKind visibility)
 {
-    qmodelingobjectproperty_cast<QUmlVariable *>(this)->setVisibility(visibility);
+    qmodelingelementproperty_cast<QUmlVariable *>(this)->setVisibility(visibility);
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [TypedElement]
 
 void QUmlVariableObject::setType(QObject *type)
 {
-    qmodelingobjectproperty_cast<QUmlVariable *>(this)->setType(qmodelingobjectproperty_cast<QUmlType *>(type));
+    qmodelingelementproperty_cast<QUmlVariable *>(this)->setType(qmodelingelementproperty_cast<QUmlType *>(type));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [ParameterableElement]
 
 void QUmlVariableObject::setOwningTemplateParameter(QObject *owningTemplateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlVariable *>(this)->setOwningTemplateParameter(qmodelingobjectproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
+    qmodelingelementproperty_cast<QUmlVariable *>(this)->setOwningTemplateParameter(qmodelingelementproperty_cast<QUmlTemplateParameter *>(owningTemplateParameter));
 }
 // SLOTS FOR OWNED ATTRIBUTES [ConnectableElement]
 
 void QUmlVariableObject::addEnd(QObject *end)
 {
-    qmodelingobjectproperty_cast<QUmlVariable *>(this)->addEnd(qmodelingobjectproperty_cast<QUmlConnectorEnd *>(end));
+    qmodelingelementproperty_cast<QUmlVariable *>(this)->addEnd(qmodelingelementproperty_cast<QUmlConnectorEnd *>(end));
 }
 
 void QUmlVariableObject::removeEnd(QObject *end)
 {
-    qmodelingobjectproperty_cast<QUmlVariable *>(this)->removeEnd(qmodelingobjectproperty_cast<QUmlConnectorEnd *>(end));
+    qmodelingelementproperty_cast<QUmlVariable *>(this)->removeEnd(qmodelingelementproperty_cast<QUmlConnectorEnd *>(end));
 }
 
 void QUmlVariableObject::setTemplateParameter(QObject *templateParameter)
 {
-    qmodelingobjectproperty_cast<QUmlVariable *>(this)->setTemplateParameter(qmodelingobjectproperty_cast<QUmlConnectableElementTemplateParameter *>(templateParameter));
+    qmodelingelementproperty_cast<QUmlVariable *>(this)->setTemplateParameter(qmodelingelementproperty_cast<QUmlConnectableElementTemplateParameter *>(templateParameter));
 }
 
 // SLOTS FOR OWNED ATTRIBUTES [Variable]
 
 void QUmlVariableObject::setActivityScope(QObject *activityScope)
 {
-    qmodelingobjectproperty_cast<QUmlVariable *>(this)->setActivityScope(qmodelingobjectproperty_cast<QUmlActivity *>(activityScope));
+    qmodelingelementproperty_cast<QUmlVariable *>(this)->setActivityScope(qmodelingelementproperty_cast<QUmlActivity *>(activityScope));
 }
 
 void QUmlVariableObject::setScope(QObject *scope)
 {
-    qmodelingobjectproperty_cast<QUmlVariable *>(this)->setScope(qmodelingobjectproperty_cast<QUmlStructuredActivityNode *>(scope));
+    qmodelingelementproperty_cast<QUmlVariable *>(this)->setScope(qmodelingelementproperty_cast<QUmlStructuredActivityNode *>(scope));
+}
+
+
+void QUmlVariableObject::setGroupProperties()
+{
+    Q_D(QModelingObject);
+    const QMetaObject *metaObject = this->metaObject();
+
+    d->propertyGroups << QStringLiteral("QObject");
+    d->groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
+
+    d->propertyGroups << QStringLiteral("QUmlElement");
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
+    d->groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
+
+    d->propertyGroups << QStringLiteral("QUmlMultiplicityElement");
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isOrdered"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isUnique"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lower"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lowerValue"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upper"))));
+    d->groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperValue"))));
+
+    d->propertyGroups << QStringLiteral("QUmlNamedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
+    d->groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
+
+    d->propertyGroups << QStringLiteral("QUmlTypedElement");
+    d->groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
+
+    d->propertyGroups << QStringLiteral("QUmlParameterableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlConnectableElement");
+    d->groupProperties.insert(QStringLiteral("QUmlConnectableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ends"))));
+    d->groupProperties.insert(QStringLiteral("QUmlConnectableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
+
+    d->propertyGroups << QStringLiteral("QUmlVariable");
+    d->groupProperties.insert(QStringLiteral("QUmlVariable"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activityScope"))));
+    d->groupProperties.insert(QStringLiteral("QUmlVariable"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("scope"))));
+}
+
+void QUmlVariableObject::setPropertyData()
+{
+    Q_DECLARE_METAPROPERTY_INFO(QUmlVariable, activityScope, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlVariable, activityScope, PropertyClassRole, QStringLiteral("QUmlVariable"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlVariable, activityScope, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlVariable, activityScope, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlVariable, activityScope, DocumentationRole, QStringLiteral("An activity that owns the variable."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlVariable, activityScope, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlVariable, activityScope, SubsettedPropertiesRole, QStringLiteral("NamedElement-namespace"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlVariable, activityScope, OppositeEndRole, QStringLiteral("Activity-variable"));
+
+    Q_DECLARE_METAPROPERTY_INFO(QUmlVariable, scope, AggregationRole, QStringLiteral("none"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlVariable, scope, PropertyClassRole, QStringLiteral("QUmlVariable"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlVariable, scope, IsDerivedRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlVariable, scope, IsDerivedUnionRole, false);
+    Q_DECLARE_METAPROPERTY_INFO(QUmlVariable, scope, DocumentationRole, QStringLiteral("A structured activity node that owns the variable."));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlVariable, scope, RedefinedPropertiesRole, QStringLiteral(""));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlVariable, scope, SubsettedPropertiesRole, QStringLiteral("NamedElement-namespace"));
+    Q_DECLARE_METAPROPERTY_INFO(QUmlVariable, scope, OppositeEndRole, QStringLiteral("StructuredActivityNode-variable"));
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/qumlvariableobject_p.h b/src/uml/qobjects/qumlvariableobject_p.h
index e9c6cc76..7a0f7c5b 100644
--- a/src/uml/qobjects/qumlvariableobject_p.h
+++ b/src/uml/qobjects/qumlvariableobject_p.h
@@ -43,7 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(QtUml)
 
 class QUmlVariable;
-class Q_UML_EXPORT QUmlVariableObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlVariableObject : public QModelingObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(QUmlVariableObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
 
     // Properties [Element]
     Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -94,7 +97,7 @@ class Q_UML_EXPORT QUmlVariableObject : public QObject
     Q_PROPERTY(QObject * scope READ scope WRITE setScope)
 
 public:
-    Q_INVOKABLE explicit QUmlVariableObject(QUmlVariable *qModelingObject);
+    Q_INVOKABLE explicit QUmlVariableObject(QUmlVariable *qModelingElement);
     virtual ~QUmlVariableObject();
 
     // Owned attributes [Element]
@@ -202,6 +205,10 @@ public Q_SLOTS:
     // Slots for owned attributes [Variable]
     void setActivityScope(QObject *activityScope = 0);
     void setScope(QObject *scope = 0);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qobjects/teste.h b/src/uml/qobjects/teste.h
new file mode 100644
index 00000000..7903560a
--- /dev/null
+++ b/src/uml/qobjects/teste.h
@@ -0,0 +1,193 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org>
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtUml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#ifndef QUMLUSAGEOBJECT_H
+#define QUMLUSAGEOBJECT_H
+
+#include <QtUml/QtUmlGlobal>
+
+#include <QtModeling/QModelingObject>
+
+#include <QtUml/QtUmlNamespace>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(QtUml)
+
+class QUmlUsage;
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlUsageObject : public QModelingObject
+{
+    Q_OBJECT
+    Q_DISABLE_COPY(QUmlUsageObject)
+    Q_DECLARE_PRIVATE(QModelingObject)
+
+    // Properties [Element]
+    Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
+    Q_PROPERTY(QSet<QObject *> ownedElements READ ownedElements)
+    Q_PROPERTY(QObject * owner READ owner)
+
+    // Properties [ParameterableElement]
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
+
+    // Properties [NamedElement]
+    Q_PROPERTY(QSet<QObject *> clientDependencies READ clientDependencies)
+    Q_PROPERTY(QString name READ name WRITE setName)
+    Q_PROPERTY(QObject * nameExpression READ nameExpression WRITE setNameExpression)
+    Q_PROPERTY(QObject * namespace_ READ namespace_)
+    Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false)
+
+    // Properties [PackageableElement]
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
+
+    // Properties [Relationship]
+    Q_PROPERTY(QSet<QObject *> relatedElements READ relatedElements)
+
+    // Properties [DirectedRelationship]
+    Q_PROPERTY(QSet<QObject *> sources READ sources)
+    Q_PROPERTY(QSet<QObject *> targets READ targets)
+
+    // Properties [Dependency]
+    Q_PROPERTY(QSet<QObject *> clients READ clients)
+    Q_PROPERTY(QSet<QObject *> suppliers READ suppliers)
+
+public:
+    Q_INVOKABLE explicit QUmlUsageObject(QUmlUsage *qModelingElement);
+    virtual ~QUmlUsageObject();
+
+    // Owned attributes [Element]
+    Q_INVOKABLE const QSet<QObject *> ownedComments() const;
+    Q_INVOKABLE const QSet<QObject *> ownedElements() const;
+    Q_INVOKABLE QObject *owner() const;
+
+    // Owned attributes [ParameterableElement]
+    Q_INVOKABLE QObject *owningTemplateParameter() const;
+    Q_INVOKABLE QObject *templateParameter() const;
+
+    // Owned attributes [NamedElement]
+    Q_INVOKABLE const QSet<QObject *> clientDependencies() const;
+    Q_INVOKABLE QString name() const;
+    Q_INVOKABLE QObject *nameExpression() const;
+    Q_INVOKABLE QObject *namespace_() const;
+    Q_INVOKABLE QString qualifiedName() const;
+
+    // Owned attributes [PackageableElement]
+    Q_INVOKABLE QtUml::VisibilityKind visibility() const;
+
+    // Owned attributes [Relationship]
+    Q_INVOKABLE const QSet<QObject *> relatedElements() const;
+
+    // Owned attributes [DirectedRelationship]
+    Q_INVOKABLE const QSet<QObject *> sources() const;
+    Q_INVOKABLE const QSet<QObject *> targets() const;
+
+    // Owned attributes [Dependency]
+    Q_INVOKABLE const QSet<QObject *> clients() const;
+    Q_INVOKABLE const QSet<QObject *> suppliers() const;
+
+    // Operations [Element]
+    Q_INVOKABLE QSet<QObject *> allOwnedElements() const;
+    Q_INVOKABLE bool mustBeOwned() const;
+
+    // Operations [ParameterableElement]
+    Q_INVOKABLE bool isCompatibleWith(QObject *p) const;
+    Q_INVOKABLE bool isTemplateParameter() const;
+
+    // Operations [NamedElement]
+    Q_INVOKABLE QList<QObject *> allNamespaces() const;
+    Q_INVOKABLE QSet<QObject *> allOwningPackages() const;
+    Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
+    Q_INVOKABLE QString separator() const;
+
+public Q_SLOTS:
+
+    // Slots for owned attributes [Element]
+    void addOwnedComment(QObject *ownedComment);
+    void removeOwnedComment(QObject *ownedComment);
+    void Q_DECL_HIDDEN addOwnedElement(QObject *ownedElement);
+    void Q_DECL_HIDDEN removeOwnedElement(QObject *ownedElement);
+    void Q_DECL_HIDDEN setOwner(QObject *owner = 0);
+
+    // Slots for owned attributes [ParameterableElement]
+    void setOwningTemplateParameter(QObject *owningTemplateParameter = 0);
+    void setTemplateParameter(QObject *templateParameter = 0);
+
+    // Slots for owned attributes [NamedElement]
+    void addClientDependency(QObject *clientDependency);
+    void removeClientDependency(QObject *clientDependency);
+    void setName(QString name);
+    void setNameExpression(QObject *nameExpression = 0);
+    void Q_DECL_HIDDEN setNamespace(QObject *namespace_ = 0);
+    void Q_DECL_HIDDEN setQualifiedName(QString qualifiedName);
+
+    // Slots for owned attributes [PackageableElement]
+    void setVisibility(QtUml::VisibilityKind visibility);
+    void unsetVisibility();
+
+    // Slots for owned attributes [Relationship]
+    void Q_DECL_HIDDEN addRelatedElement(QObject *relatedElement);
+    void Q_DECL_HIDDEN removeRelatedElement(QObject *relatedElement);
+
+    // Slots for owned attributes [DirectedRelationship]
+    void Q_DECL_HIDDEN addSource(QObject *source);
+    void Q_DECL_HIDDEN removeSource(QObject *source);
+    void Q_DECL_HIDDEN addTarget(QObject *target);
+    void Q_DECL_HIDDEN removeTarget(QObject *target);
+
+    // Slots for owned attributes [Dependency]
+    void addClient(QObject *client);
+    void removeClient(QObject *client);
+    void addSupplier(QObject *supplier);
+    void removeSupplier(QObject *supplier);
+
+protected:
+    virtual void setGroupProperties();
+    virtual void setPropertyData();
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QUMLUSAGEOBJECT_H
+
diff --git a/src/uml/qumlabstraction.cpp b/src/uml/qumlabstraction.cpp
index f344039b..a4bf56ef 100644
--- a/src/uml/qumlabstraction.cpp
+++ b/src/uml/qumlabstraction.cpp
@@ -60,26 +60,24 @@
 
     \brief An abstraction is a relationship that relates two elements or sets of elements that represent the same concept at different levels of abstraction or from different viewpoints.
  */
-QUmlAbstraction::QUmlAbstraction(bool createQObject) :
+QUmlAbstraction::QUmlAbstraction(bool createQModelingObject) :
     QUmlDependency(false),
     _mapping(0)
 {
-    if (createQObject)
-        _qObject = new QUmlAbstractionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlAbstractionObject(this));
 }
 
 QUmlAbstraction::~QUmlAbstraction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlAbstraction::clone() const
+QModelingElement *QUmlAbstraction::clone() const
 {
     QUmlAbstraction *c = new QUmlAbstraction;
     foreach (QUmlComment *element, ownedComments())
@@ -124,9 +122,9 @@ void QUmlAbstraction::setMapping(QUmlOpaqueExpression *mapping)
         removeOwnedElement(_mapping);
 
         _mapping = mapping;
-        if (mapping && mapping->asQObject() && this->asQObject())
-            QObject::connect(mapping->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setMapping()));
-        mapping->asQObject()->setParent(this->asQObject());
+        if (mapping && mapping->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(mapping->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setMapping()));
+        mapping->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (mapping) {
@@ -135,57 +133,3 @@ void QUmlAbstraction::setMapping(QUmlOpaqueExpression *mapping)
     }
 }
 
-void QUmlAbstraction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _propertyGroups << QStringLiteral("QObject");
-    _groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
-
-    _propertyGroups << QStringLiteral("QUmlElement");
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-
-    _propertyGroups << QStringLiteral("QUmlParameterableElement");
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-
-    _propertyGroups << QStringLiteral("QUmlNamedElement");
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-
-    _propertyGroups << QStringLiteral("QUmlPackageableElement");
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-
-    _propertyGroups << QStringLiteral("QUmlRelationship");
-    _groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
-
-    _propertyGroups << QStringLiteral("QUmlDirectedRelationship");
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
-
-    _propertyGroups << QStringLiteral("QUmlDependency");
-    _groupProperties.insert(QStringLiteral("QUmlDependency"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clients"))));
-    _groupProperties.insert(QStringLiteral("QUmlDependency"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("suppliers"))));
-
-    _propertyGroups << QStringLiteral("QUmlAbstraction");
-    _groupProperties.insert(QStringLiteral("QUmlAbstraction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("mapping"))));
-}
-
-void QUmlAbstraction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAbstraction")][QStringLiteral("mapping")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAbstraction")][QStringLiteral("mapping")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAbstraction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAbstraction")][QStringLiteral("mapping")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAbstraction")][QStringLiteral("mapping")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAbstraction")][QStringLiteral("mapping")][QtModeling::DocumentationRole] = QStringLiteral("An composition of an Expression that states the abstraction relationship between the supplier and the client. In some cases, such as Derivation, it is usually formal and unidirectional; in other cases, such as Trace, it is usually informal and bidirectional. The mapping expression is optional and may be omitted if the precise relationship between the elements is not specified.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAbstraction")][QStringLiteral("mapping")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAbstraction")][QStringLiteral("mapping")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAbstraction")][QStringLiteral("mapping")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlabstraction.h b/src/uml/qumlabstraction.h
index 47b1efd5..7c7f4a89 100644
--- a/src/uml/qumlabstraction.h
+++ b/src/uml/qumlabstraction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlDependency>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlOpaqueExpression;
 class Q_UML_EXPORT QUmlAbstraction : public QUmlDependency
 {
 public:
-    explicit QUmlAbstraction(bool createQObject = true);
+    explicit QUmlAbstraction(bool createQModelingObject = true);
     virtual ~QUmlAbstraction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlOpaqueExpression *mapping() const;
@@ -68,9 +67,6 @@ public:
 
 protected:
     QUmlOpaqueExpression *_mapping;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlacceptcallaction.cpp b/src/uml/qumlacceptcallaction.cpp
index d7f9e055..3b6cb386 100644
--- a/src/uml/qumlacceptcallaction.cpp
+++ b/src/uml/qumlacceptcallaction.cpp
@@ -71,26 +71,24 @@
 
     \brief An accept call action is an accept event action representing the receipt of a synchronous call request. In addition to the normal operation parameters, the action produces an output that is needed later to supply the information to the reply action necessary to return control to the caller. This action is for synchronous calls. If it is used to handle an asynchronous call, execution of the subsequent reply action will complete immediately with no effects.
  */
-QUmlAcceptCallAction::QUmlAcceptCallAction(bool createQObject) :
+QUmlAcceptCallAction::QUmlAcceptCallAction(bool createQModelingObject) :
     QUmlAcceptEventAction(false),
     _returnInformation(0)
 {
-    if (createQObject)
-        _qObject = new QUmlAcceptCallActionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlAcceptCallActionObject(this));
 }
 
 QUmlAcceptCallAction::~QUmlAcceptCallAction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlAcceptCallAction::clone() const
+QModelingElement *QUmlAcceptCallAction::clone() const
 {
     QUmlAcceptCallAction *c = new QUmlAcceptCallAction;
     foreach (QUmlComment *element, ownedComments())
@@ -154,9 +152,9 @@ void QUmlAcceptCallAction::setReturnInformation(QUmlOutputPin *returnInformation
         removeOutput(_returnInformation);
 
         _returnInformation = returnInformation;
-        if (returnInformation && returnInformation->asQObject() && this->asQObject())
-            QObject::connect(returnInformation->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setReturnInformation()));
-        returnInformation->asQObject()->setParent(this->asQObject());
+        if (returnInformation && returnInformation->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(returnInformation->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setReturnInformation()));
+        returnInformation->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (returnInformation) {
@@ -165,53 +163,3 @@ void QUmlAcceptCallAction::setReturnInformation(QUmlOutputPin *returnInformation
     }
 }
 
-void QUmlAcceptCallAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAcceptEventAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isUnmarshall"))));
-    _groupProperties.insert(QStringLiteral("QUmlAcceptEventAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("results"))));
-    _groupProperties.insert(QStringLiteral("QUmlAcceptEventAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("triggers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAcceptCallAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("returnInformation"))));
-}
-
-void QUmlAcceptCallAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptCallAction")][QStringLiteral("returnInformation")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptCallAction")][QStringLiteral("returnInformation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAcceptCallAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptCallAction")][QStringLiteral("returnInformation")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptCallAction")][QStringLiteral("returnInformation")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptCallAction")][QStringLiteral("returnInformation")][QtModeling::DocumentationRole] = QStringLiteral("Pin where a value is placed containing sufficient information to perform a subsequent reply and return control to the caller. The contents of this value are opaque. It can be passed and copied but it cannot be manipulated by the model.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptCallAction")][QStringLiteral("returnInformation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptCallAction")][QStringLiteral("returnInformation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptCallAction")][QStringLiteral("returnInformation")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlacceptcallaction.h b/src/uml/qumlacceptcallaction.h
index e907de2d..81353a36 100644
--- a/src/uml/qumlacceptcallaction.h
+++ b/src/uml/qumlacceptcallaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlAcceptEventAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlOutputPin;
 class Q_UML_EXPORT QUmlAcceptCallAction : public QUmlAcceptEventAction
 {
 public:
-    explicit QUmlAcceptCallAction(bool createQObject = true);
+    explicit QUmlAcceptCallAction(bool createQModelingObject = true);
     virtual ~QUmlAcceptCallAction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlOutputPin *returnInformation() const;
@@ -68,9 +67,6 @@ public:
 
 protected:
     QUmlOutputPin *_returnInformation;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlaccepteventaction.cpp b/src/uml/qumlaccepteventaction.cpp
index 1e192d69..9620e767 100644
--- a/src/uml/qumlaccepteventaction.cpp
+++ b/src/uml/qumlaccepteventaction.cpp
@@ -71,25 +71,23 @@
 
     \brief A accept event action is an action that waits for the occurrence of an event meeting specified conditions.
  */
-QUmlAcceptEventAction::QUmlAcceptEventAction(bool createQObject) :
+QUmlAcceptEventAction::QUmlAcceptEventAction(bool createQModelingObject) :
     _isUnmarshall(false)
 {
-    if (createQObject)
-        _qObject = new QUmlAcceptEventActionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlAcceptEventActionObject(this));
 }
 
 QUmlAcceptEventAction::~QUmlAcceptEventAction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlAcceptEventAction::clone() const
+QModelingElement *QUmlAcceptEventAction::clone() const
 {
     QUmlAcceptEventAction *c = new QUmlAcceptEventAction;
     foreach (QUmlComment *element, ownedComments())
@@ -148,7 +146,7 @@ void QUmlAcceptEventAction::setUnmarshall(bool isUnmarshall)
 
     if (_isUnmarshall != isUnmarshall) {
         _isUnmarshall = isUnmarshall;
-        _modifiedResettableProperties << QStringLiteral("isUnmarshall");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isUnmarshall");
     }
 }
 
@@ -168,9 +166,9 @@ void QUmlAcceptEventAction::addResult(QUmlOutputPin *result)
 
     if (!_results.contains(result)) {
         _results.insert(result);
-        if (result && result->asQObject() && this->asQObject())
-            QObject::connect(result->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeResult(QObject *)));
-        result->asQObject()->setParent(this->asQObject());
+        if (result && result->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(result->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeResult(QObject *)));
+        result->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOutput(result);
@@ -183,8 +181,8 @@ void QUmlAcceptEventAction::removeResult(QUmlOutputPin *result)
 
     if (_results.contains(result)) {
         _results.remove(result);
-        if (result->asQObject())
-            result->asQObject()->setParent(0);
+        if (result->asQModelingObject())
+            result->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOutput(result);
@@ -207,9 +205,9 @@ void QUmlAcceptEventAction::addTrigger(QUmlTrigger *trigger)
 
     if (!_triggers.contains(trigger)) {
         _triggers.insert(trigger);
-        if (trigger && trigger->asQObject() && this->asQObject())
-            QObject::connect(trigger->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeTrigger(QObject *)));
-        trigger->asQObject()->setParent(this->asQObject());
+        if (trigger && trigger->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(trigger->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeTrigger(QObject *)));
+        trigger->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(trigger);
@@ -222,78 +220,11 @@ void QUmlAcceptEventAction::removeTrigger(QUmlTrigger *trigger)
 
     if (_triggers.contains(trigger)) {
         _triggers.remove(trigger);
-        if (trigger->asQObject())
-            trigger->asQObject()->setParent(0);
+        if (trigger->asQModelingObject())
+            trigger->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(trigger);
     }
 }
 
-void QUmlAcceptEventAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAcceptEventAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isUnmarshall"))));
-    _groupProperties.insert(QStringLiteral("QUmlAcceptEventAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("results"))));
-    _groupProperties.insert(QStringLiteral("QUmlAcceptEventAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("triggers"))));
-}
-
-void QUmlAcceptEventAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptEventAction")][QStringLiteral("isUnmarshall")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptEventAction")][QStringLiteral("isUnmarshall")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAcceptEventAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptEventAction")][QStringLiteral("isUnmarshall")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptEventAction")][QStringLiteral("isUnmarshall")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptEventAction")][QStringLiteral("isUnmarshall")][QtModeling::DocumentationRole] = QStringLiteral("Indicates whether there is a single output pin for the event, or multiple output pins for attributes of the event.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptEventAction")][QStringLiteral("isUnmarshall")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptEventAction")][QStringLiteral("isUnmarshall")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptEventAction")][QStringLiteral("isUnmarshall")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptEventAction")][QStringLiteral("results")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptEventAction")][QStringLiteral("results")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAcceptEventAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptEventAction")][QStringLiteral("results")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptEventAction")][QStringLiteral("results")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptEventAction")][QStringLiteral("results")][QtModeling::DocumentationRole] = QStringLiteral("Pins holding the received event objects or their attributes. Event objects may be copied in transmission, so identity might not be preserved.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptEventAction")][QStringLiteral("results")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptEventAction")][QStringLiteral("results")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptEventAction")][QStringLiteral("results")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptEventAction")][QStringLiteral("triggers")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptEventAction")][QStringLiteral("triggers")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAcceptEventAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptEventAction")][QStringLiteral("triggers")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptEventAction")][QStringLiteral("triggers")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptEventAction")][QStringLiteral("triggers")][QtModeling::DocumentationRole] = QStringLiteral("The type of events accepted by the action, as specified by triggers. For triggers with signal events, a signal of the specified type or any subtype of the specified signal type is accepted.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptEventAction")][QStringLiteral("triggers")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptEventAction")][QStringLiteral("triggers")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptEventAction")][QStringLiteral("triggers")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlaccepteventaction.h b/src/uml/qumlaccepteventaction.h
index 7be69b74..5ea683fe 100644
--- a/src/uml/qumlaccepteventaction.h
+++ b/src/uml/qumlaccepteventaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlTrigger;
 class Q_UML_EXPORT QUmlAcceptEventAction : public QUmlAction
 {
 public:
-    explicit QUmlAcceptEventAction(bool createQObject = true);
+    explicit QUmlAcceptEventAction(bool createQModelingObject = true);
     virtual ~QUmlAcceptEventAction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     bool isUnmarshall() const;
@@ -77,9 +76,6 @@ protected:
     bool _isUnmarshall;
     QSet<QUmlOutputPin *> _results;
     QSet<QUmlTrigger *> _triggers;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlaction.cpp b/src/uml/qumlaction.cpp
index 0d7308f4..dd0436ce 100644
--- a/src/uml/qumlaction.cpp
+++ b/src/uml/qumlaction.cpp
@@ -71,15 +71,13 @@
 QUmlAction::QUmlAction() :
     _isLocallyReentrant(false)
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlAction::~QUmlAction()
 {
 }
 
-QModelingObject *QUmlAction::clone() const
+QModelingElement *QUmlAction::clone() const
 {
     QUmlAction *c = new QUmlAction;
     foreach (QUmlComment *element, ownedComments())
@@ -157,9 +155,9 @@ void QUmlAction::addInput(QUmlInputPin *input)
 
     if (!_inputs.contains(input)) {
         _inputs.append(input);
-        if (input && input->asQObject() && this->asQObject())
-            QObject::connect(input->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeInput(QObject *)));
-        input->asQObject()->setParent(this->asQObject());
+        if (input && input->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(input->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeInput(QObject *)));
+        input->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(input);
@@ -172,8 +170,8 @@ void QUmlAction::removeInput(QUmlInputPin *input)
 
     if (_inputs.contains(input)) {
         _inputs.removeAll(input);
-        if (input->asQObject())
-            input->asQObject()->setParent(0);
+        if (input->asQModelingObject())
+            input->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(input);
@@ -196,7 +194,7 @@ void QUmlAction::setLocallyReentrant(bool isLocallyReentrant)
 
     if (_isLocallyReentrant != isLocallyReentrant) {
         _isLocallyReentrant = isLocallyReentrant;
-        _modifiedResettableProperties << QStringLiteral("isLocallyReentrant");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isLocallyReentrant");
     }
 }
 
@@ -216,9 +214,9 @@ void QUmlAction::addLocalPostcondition(QUmlConstraint *localPostcondition)
 
     if (!_localPostconditions.contains(localPostcondition)) {
         _localPostconditions.insert(localPostcondition);
-        if (localPostcondition && localPostcondition->asQObject() && this->asQObject())
-            QObject::connect(localPostcondition->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeLocalPostcondition(QObject *)));
-        localPostcondition->asQObject()->setParent(this->asQObject());
+        if (localPostcondition && localPostcondition->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(localPostcondition->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeLocalPostcondition(QObject *)));
+        localPostcondition->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(localPostcondition);
@@ -231,8 +229,8 @@ void QUmlAction::removeLocalPostcondition(QUmlConstraint *localPostcondition)
 
     if (_localPostconditions.contains(localPostcondition)) {
         _localPostconditions.remove(localPostcondition);
-        if (localPostcondition->asQObject())
-            localPostcondition->asQObject()->setParent(0);
+        if (localPostcondition->asQModelingObject())
+            localPostcondition->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(localPostcondition);
@@ -255,9 +253,9 @@ void QUmlAction::addLocalPrecondition(QUmlConstraint *localPrecondition)
 
     if (!_localPreconditions.contains(localPrecondition)) {
         _localPreconditions.insert(localPrecondition);
-        if (localPrecondition && localPrecondition->asQObject() && this->asQObject())
-            QObject::connect(localPrecondition->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeLocalPrecondition(QObject *)));
-        localPrecondition->asQObject()->setParent(this->asQObject());
+        if (localPrecondition && localPrecondition->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(localPrecondition->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeLocalPrecondition(QObject *)));
+        localPrecondition->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(localPrecondition);
@@ -270,8 +268,8 @@ void QUmlAction::removeLocalPrecondition(QUmlConstraint *localPrecondition)
 
     if (_localPreconditions.contains(localPrecondition)) {
         _localPreconditions.remove(localPrecondition);
-        if (localPrecondition->asQObject())
-            localPrecondition->asQObject()->setParent(0);
+        if (localPrecondition->asQModelingObject())
+            localPrecondition->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(localPrecondition);
@@ -294,9 +292,9 @@ void QUmlAction::addOutput(QUmlOutputPin *output)
 
     if (!_outputs.contains(output)) {
         _outputs.append(output);
-        if (output && output->asQObject() && this->asQObject())
-            QObject::connect(output->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeOutput(QObject *)));
-        output->asQObject()->setParent(this->asQObject());
+        if (output && output->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(output->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeOutput(QObject *)));
+        output->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(output);
@@ -309,102 +307,11 @@ void QUmlAction::removeOutput(QUmlOutputPin *output)
 
     if (_outputs.contains(output)) {
         _outputs.removeAll(output);
-        if (output->asQObject())
-            output->asQObject()->setParent(0);
+        if (output->asQModelingObject())
+            output->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(output);
     }
 }
 
-void QUmlAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-}
-
-void QUmlAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("context")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("context")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("context")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("context")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("context")][QtModeling::DocumentationRole] = QStringLiteral("The classifier that owns the behavior of which this action is a part.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("context")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("context")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("context")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("inputs")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("inputs")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("inputs")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("inputs")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("inputs")][QtModeling::DocumentationRole] = QStringLiteral("The ordered set of input pins connected to the Action. These are among the total set of inputs.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("inputs")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("inputs")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("inputs")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("isLocallyReentrant")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("isLocallyReentrant")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("isLocallyReentrant")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("isLocallyReentrant")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("isLocallyReentrant")][QtModeling::DocumentationRole] = QStringLiteral("If true, the action can begin a new, concurrent execution, even if there is already another execution of the action ongoing. If false, the action cannot begin a new execution until any previous execution has completed.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("isLocallyReentrant")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("isLocallyReentrant")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("isLocallyReentrant")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("localPostconditions")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("localPostconditions")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("localPostconditions")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("localPostconditions")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("localPostconditions")][QtModeling::DocumentationRole] = QStringLiteral("Constraint that must be satisfied when executed is completed.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("localPostconditions")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("localPostconditions")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("localPostconditions")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("localPreconditions")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("localPreconditions")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("localPreconditions")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("localPreconditions")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("localPreconditions")][QtModeling::DocumentationRole] = QStringLiteral("Constraint that must be satisfied when execution is started.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("localPreconditions")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("localPreconditions")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("localPreconditions")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("outputs")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("outputs")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("outputs")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("outputs")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("outputs")][QtModeling::DocumentationRole] = QStringLiteral("The ordered set of output pins connected to the Action. The action places its results onto pins in this set.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("outputs")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("outputs")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("outputs")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlaction.h b/src/uml/qumlaction.h
index 74491c69..138c36f8 100644
--- a/src/uml/qumlaction.h
+++ b/src/uml/qumlaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlExecutableNode>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -62,7 +61,7 @@ class Q_UML_EXPORT QUmlAction : public QUmlExecutableNode
 public:
     virtual ~QUmlAction();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlClassifier *context() const;
@@ -90,9 +89,6 @@ protected:
     QSet<QUmlConstraint *> _localPostconditions;
     QSet<QUmlConstraint *> _localPreconditions;
     QList<QUmlOutputPin *> _outputs;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlactionexecutionspecification.cpp b/src/uml/qumlactionexecutionspecification.cpp
index 085f6875..3908a0f4 100644
--- a/src/uml/qumlactionexecutionspecification.cpp
+++ b/src/uml/qumlactionexecutionspecification.cpp
@@ -63,25 +63,23 @@
 
     \brief An action execution specification is a kind of execution specification representing the execution of an action.
  */
-QUmlActionExecutionSpecification::QUmlActionExecutionSpecification(bool createQObject) :
+QUmlActionExecutionSpecification::QUmlActionExecutionSpecification(bool createQModelingObject) :
     _action(0)
 {
-    if (createQObject)
-        _qObject = new QUmlActionExecutionSpecificationObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlActionExecutionSpecificationObject(this));
 }
 
 QUmlActionExecutionSpecification::~QUmlActionExecutionSpecification()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlActionExecutionSpecification::clone() const
+QModelingElement *QUmlActionExecutionSpecification::clone() const
 {
     QUmlActionExecutionSpecification *c = new QUmlActionExecutionSpecification;
     foreach (QUmlComment *element, ownedComments())
@@ -127,43 +125,8 @@ void QUmlActionExecutionSpecification::setAction(QUmlAction *action)
 
     if (_action != action) {
         _action = action;
-        if (action && action->asQObject() && this->asQObject())
-            QObject::connect(action->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setAction()));
+        if (action && action->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(action->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setAction()));
     }
 }
 
-void QUmlActionExecutionSpecification::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("covered"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingInteraction"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingOperand"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalOrderings"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutionSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("finish"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutionSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("start"))));
-    _groupProperties.insert(QStringLiteral("QUmlActionExecutionSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("action"))));
-}
-
-void QUmlActionExecutionSpecification::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActionExecutionSpecification")][QStringLiteral("action")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActionExecutionSpecification")][QStringLiteral("action")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActionExecutionSpecification");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActionExecutionSpecification")][QStringLiteral("action")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActionExecutionSpecification")][QStringLiteral("action")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActionExecutionSpecification")][QStringLiteral("action")][QtModeling::DocumentationRole] = QStringLiteral("Action whose execution is occurring.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActionExecutionSpecification")][QStringLiteral("action")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActionExecutionSpecification")][QStringLiteral("action")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActionExecutionSpecification")][QStringLiteral("action")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlactionexecutionspecification.h b/src/uml/qumlactionexecutionspecification.h
index 17dc17ac..a3cfe9d6 100644
--- a/src/uml/qumlactionexecutionspecification.h
+++ b/src/uml/qumlactionexecutionspecification.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlExecutionSpecification>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlAction;
 class Q_UML_EXPORT QUmlActionExecutionSpecification : public QUmlExecutionSpecification
 {
 public:
-    explicit QUmlActionExecutionSpecification(bool createQObject = true);
+    explicit QUmlActionExecutionSpecification(bool createQModelingObject = true);
     virtual ~QUmlActionExecutionSpecification();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlAction *action() const;
@@ -68,9 +67,6 @@ public:
 
 protected:
     QUmlAction *_action;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlactioninputpin.cpp b/src/uml/qumlactioninputpin.cpp
index c9ba8375..0640573f 100644
--- a/src/uml/qumlactioninputpin.cpp
+++ b/src/uml/qumlactioninputpin.cpp
@@ -72,26 +72,24 @@
 
     \brief An action input pin is a kind of pin that executes an action to determine the values to input to another.
  */
-QUmlActionInputPin::QUmlActionInputPin(bool createQObject) :
+QUmlActionInputPin::QUmlActionInputPin(bool createQModelingObject) :
     QUmlInputPin(false),
     _fromAction(0)
 {
-    if (createQObject)
-        _qObject = new QUmlActionInputPinObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlActionInputPinObject(this));
 }
 
 QUmlActionInputPin::~QUmlActionInputPin()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlActionInputPin::clone() const
+QModelingElement *QUmlActionInputPin::clone() const
 {
     QUmlActionInputPin *c = new QUmlActionInputPin;
     foreach (QUmlComment *element, ownedComments())
@@ -160,9 +158,9 @@ void QUmlActionInputPin::setFromAction(QUmlAction *fromAction)
         removeOwnedElement(_fromAction);
 
         _fromAction = fromAction;
-        if (fromAction && fromAction->asQObject() && this->asQObject())
-            QObject::connect(fromAction->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setFromAction()));
-        fromAction->asQObject()->setParent(this->asQObject());
+        if (fromAction && fromAction->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(fromAction->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setFromAction()));
+        fromAction->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (fromAction) {
@@ -171,56 +169,3 @@ void QUmlActionInputPin::setFromAction(QUmlAction *fromAction)
     }
 }
 
-void QUmlActionInputPin::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isOrdered"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isUnique"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lower"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lowerValue"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upper"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperValue"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStates"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isControlType"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ordering"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("selection"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperBound"))));
-    _groupProperties.insert(QStringLiteral("QUmlPin"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isControl"))));
-    _groupProperties.insert(QStringLiteral("QUmlActionInputPin"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("fromAction"))));
-}
-
-void QUmlActionInputPin::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActionInputPin")][QStringLiteral("fromAction")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActionInputPin")][QStringLiteral("fromAction")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActionInputPin");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActionInputPin")][QStringLiteral("fromAction")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActionInputPin")][QStringLiteral("fromAction")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActionInputPin")][QStringLiteral("fromAction")][QtModeling::DocumentationRole] = QStringLiteral("The action used to provide values.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActionInputPin")][QStringLiteral("fromAction")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActionInputPin")][QStringLiteral("fromAction")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActionInputPin")][QStringLiteral("fromAction")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlactioninputpin.h b/src/uml/qumlactioninputpin.h
index fa26a040..a91d8828 100644
--- a/src/uml/qumlactioninputpin.h
+++ b/src/uml/qumlactioninputpin.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlInputPin>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlAction;
 class Q_UML_EXPORT QUmlActionInputPin : public QUmlInputPin
 {
 public:
-    explicit QUmlActionInputPin(bool createQObject = true);
+    explicit QUmlActionInputPin(bool createQModelingObject = true);
     virtual ~QUmlActionInputPin();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlAction *fromAction() const;
@@ -68,9 +67,6 @@ public:
 
 protected:
     QUmlAction *_fromAction;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlactivity.cpp b/src/uml/qumlactivity.cpp
index a6302648..86b1cd45 100644
--- a/src/uml/qumlactivity.cpp
+++ b/src/uml/qumlactivity.cpp
@@ -96,26 +96,24 @@
 
     \brief An activity is the specification of parameterized behavior as the coordinated sequencing of subordinate units whose individual elements are actions.
  */
-QUmlActivity::QUmlActivity(bool createQObject) :
+QUmlActivity::QUmlActivity(bool createQModelingObject) :
     _isReadOnly(false),
     _isSingleExecution(false)
 {
-    if (createQObject)
-        _qObject = new QUmlActivityObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlActivityObject(this));
 }
 
 QUmlActivity::~QUmlActivity()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlActivity::clone() const
+QModelingElement *QUmlActivity::clone() const
 {
     QUmlActivity *c = new QUmlActivity;
     foreach (QUmlComment *element, ownedComments())
@@ -226,9 +224,9 @@ void QUmlActivity::addEdge(QUmlActivityEdge *edge)
 
     if (!_edges.contains(edge)) {
         _edges.insert(edge);
-        if (edge && edge->asQObject() && this->asQObject())
-            QObject::connect(edge->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeEdge(QObject *)));
-        edge->asQObject()->setParent(this->asQObject());
+        if (edge && edge->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(edge->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeEdge(QObject *)));
+        edge->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(edge);
@@ -246,8 +244,8 @@ void QUmlActivity::removeEdge(QUmlActivityEdge *edge)
 
     if (_edges.contains(edge)) {
         _edges.remove(edge);
-        if (edge->asQObject())
-            edge->asQObject()->setParent(0);
+        if (edge->asQModelingObject())
+            edge->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(edge);
@@ -275,9 +273,9 @@ void QUmlActivity::addGroup(QUmlActivityGroup *group)
 
     if (!_groups.contains(group)) {
         _groups.insert(group);
-        if (group && group->asQObject() && this->asQObject())
-            QObject::connect(group->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeGroup(QObject *)));
-        group->asQObject()->setParent(this->asQObject());
+        if (group && group->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(group->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeGroup(QObject *)));
+        group->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(group);
@@ -295,8 +293,8 @@ void QUmlActivity::removeGroup(QUmlActivityGroup *group)
 
     if (_groups.contains(group)) {
         _groups.remove(group);
-        if (group->asQObject())
-            group->asQObject()->setParent(0);
+        if (group->asQModelingObject())
+            group->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(group);
@@ -324,7 +322,7 @@ void QUmlActivity::setReadOnly(bool isReadOnly)
 
     if (_isReadOnly != isReadOnly) {
         _isReadOnly = isReadOnly;
-        _modifiedResettableProperties << QStringLiteral("isReadOnly");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isReadOnly");
     }
 }
 
@@ -344,7 +342,7 @@ void QUmlActivity::setSingleExecution(bool isSingleExecution)
 
     if (_isSingleExecution != isSingleExecution) {
         _isSingleExecution = isSingleExecution;
-        _modifiedResettableProperties << QStringLiteral("isSingleExecution");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isSingleExecution");
     }
 }
 
@@ -364,9 +362,9 @@ void QUmlActivity::addNode(QUmlActivityNode *node)
 
     if (!_nodes.contains(node)) {
         _nodes.insert(node);
-        if (node && node->asQObject() && this->asQObject())
-            QObject::connect(node->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeNode(QObject *)));
-        node->asQObject()->setParent(this->asQObject());
+        if (node && node->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(node->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeNode(QObject *)));
+        node->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(node);
@@ -384,8 +382,8 @@ void QUmlActivity::removeNode(QUmlActivityNode *node)
 
     if (_nodes.contains(node)) {
         _nodes.remove(node);
-        if (node->asQObject())
-            node->asQObject()->setParent(0);
+        if (node->asQModelingObject())
+            node->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(node);
@@ -413,8 +411,8 @@ void QUmlActivity::addPartition(QUmlActivityPartition *partition)
 
     if (!_partitions.contains(partition)) {
         _partitions.insert(partition);
-        if (partition && partition->asQObject() && this->asQObject())
-            QObject::connect(partition->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removePartition(QObject *)));
+        if (partition && partition->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(partition->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removePartition(QObject *)));
 
         // Adjust subsetted properties
         addGroup(partition);
@@ -449,9 +447,9 @@ void QUmlActivity::addStructuredNode(QUmlStructuredActivityNode *structuredNode)
 
     if (!_structuredNodes.contains(structuredNode)) {
         _structuredNodes.insert(structuredNode);
-        if (structuredNode && structuredNode->asQObject() && this->asQObject())
-            QObject::connect(structuredNode->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeStructuredNode(QObject *)));
-        structuredNode->asQObject()->setParent(this->asQObject());
+        if (structuredNode && structuredNode->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(structuredNode->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeStructuredNode(QObject *)));
+        structuredNode->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addGroup(structuredNode);
@@ -470,8 +468,8 @@ void QUmlActivity::removeStructuredNode(QUmlStructuredActivityNode *structuredNo
 
     if (_structuredNodes.contains(structuredNode)) {
         _structuredNodes.remove(structuredNode);
-        if (structuredNode->asQObject())
-            structuredNode->asQObject()->setParent(0);
+        if (structuredNode->asQModelingObject())
+            structuredNode->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeGroup(structuredNode);
@@ -500,9 +498,9 @@ void QUmlActivity::addVariable(QUmlVariable *variable)
 
     if (!_variables.contains(variable)) {
         _variables.insert(variable);
-        if (variable && variable->asQObject() && this->asQObject())
-            QObject::connect(variable->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeVariable(QObject *)));
-        variable->asQObject()->setParent(this->asQObject());
+        if (variable && variable->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(variable->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeVariable(QObject *)));
+        variable->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedMember(variable);
@@ -520,8 +518,8 @@ void QUmlActivity::removeVariable(QUmlVariable *variable)
 
     if (_variables.contains(variable)) {
         _variables.remove(variable);
-        if (variable->asQObject())
-            variable->asQObject()->setParent(0);
+        if (variable->asQModelingObject())
+            variable->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedMember(variable);
@@ -533,151 +531,3 @@ void QUmlActivity::removeVariable(QUmlVariable *variable)
     }
 }
 
-void QUmlActivity::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedConnectors"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parts"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("roles"))));
-    _groupProperties.insert(QStringLiteral("QUmlEncapsulatedClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedPorts"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifierBehavior"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interfaceRealizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedBehaviors"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extensions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isActive"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedReceptions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superClasses"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameters"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameterSets"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("postconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("preconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedBehaviors"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("specification"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivity"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("edges"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivity"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("groups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivity"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isReadOnly"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivity"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isSingleExecution"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivity"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivity"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("partitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivity"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("structuredNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivity"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("variables"))));
-}
-
-void QUmlActivity::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("edges")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("edges")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivity");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("edges")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("edges")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("edges")][QtModeling::DocumentationRole] = QStringLiteral("Edges expressing flow between nodes of the activity.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("edges")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("edges")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("edges")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityEdge-activity");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("groups")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("groups")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivity");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("groups")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("groups")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("groups")][QtModeling::DocumentationRole] = QStringLiteral("Top-level groups in the activity.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("groups")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("groups")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("groups")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityGroup-inActivity");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("isReadOnly")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("isReadOnly")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivity");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("isReadOnly")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("isReadOnly")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("isReadOnly")][QtModeling::DocumentationRole] = QStringLiteral("If true, this activity must not make any changes to variables outside the activity or to objects. (This is an assertion, not an executable property. It may be used by an execution engine to optimize model execution. If the assertion is violated by the action, then the model is ill-formed.) The default is false (an activity may make nonlocal changes).");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("isReadOnly")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("isReadOnly")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("isReadOnly")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("isSingleExecution")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("isSingleExecution")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivity");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("isSingleExecution")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("isSingleExecution")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("isSingleExecution")][QtModeling::DocumentationRole] = QStringLiteral("If true, all invocations of the activity are handled by the same execution.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("isSingleExecution")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("isSingleExecution")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("isSingleExecution")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("nodes")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("nodes")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivity");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("nodes")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("nodes")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("nodes")][QtModeling::DocumentationRole] = QStringLiteral("Nodes coordinated by the activity.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("nodes")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("nodes")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("nodes")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityNode-activity");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("partitions")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("partitions")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivity");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("partitions")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("partitions")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("partitions")][QtModeling::DocumentationRole] = QStringLiteral("Top-level partitions in the activity.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("partitions")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("partitions")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Activity-group");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("partitions")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("structuredNodes")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("structuredNodes")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivity");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("structuredNodes")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("structuredNodes")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("structuredNodes")][QtModeling::DocumentationRole] = QStringLiteral("Top-level structured nodes in the activity.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("structuredNodes")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("structuredNodes")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Activity-group Activity-node");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("structuredNodes")][QtModeling::OppositeEndRole] = QStringLiteral("StructuredActivityNode-activity");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("variables")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("variables")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivity");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("variables")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("variables")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("variables")][QtModeling::DocumentationRole] = QStringLiteral("Top-level variables in the activity.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("variables")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("variables")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("variables")][QtModeling::OppositeEndRole] = QStringLiteral("Variable-activityScope");
-
-}
-
diff --git a/src/uml/qumlactivity.h b/src/uml/qumlactivity.h
index 2b657603..9db50db0 100644
--- a/src/uml/qumlactivity.h
+++ b/src/uml/qumlactivity.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlBehavior>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -62,10 +61,10 @@ class QUmlVariable;
 class Q_UML_EXPORT QUmlActivity : public QUmlBehavior
 {
 public:
-    explicit QUmlActivity(bool createQObject = true);
+    explicit QUmlActivity(bool createQModelingObject = true);
     virtual ~QUmlActivity();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlActivityEdge *> edges() const;
@@ -100,9 +99,6 @@ protected:
     QSet<QUmlActivityPartition *> _partitions;
     QSet<QUmlStructuredActivityNode *> _structuredNodes;
     QSet<QUmlVariable *> _variables;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlactivityedge.cpp b/src/uml/qumlactivityedge.cpp
index 7e9e3114..998a939e 100644
--- a/src/uml/qumlactivityedge.cpp
+++ b/src/uml/qumlactivityedge.cpp
@@ -73,15 +73,13 @@ QUmlActivityEdge::QUmlActivityEdge() :
     _target(0),
     _weight(0)
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlActivityEdge::~QUmlActivityEdge()
 {
 }
 
-QModelingObject *QUmlActivityEdge::clone() const
+QModelingElement *QUmlActivityEdge::clone() const
 {
     QUmlActivityEdge *c = new QUmlActivityEdge;
     foreach (QUmlComment *element, ownedComments())
@@ -134,8 +132,8 @@ void QUmlActivityEdge::setActivity(QUmlActivity *activity)
         // Adjust subsetted properties
 
         _activity = activity;
-        if (activity && activity->asQObject() && this->asQObject())
-            QObject::connect(activity->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setActivity()));
+        if (activity && activity->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(activity->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setActivity()));
 
         // Adjust subsetted properties
         setOwner(activity);
@@ -161,9 +159,9 @@ void QUmlActivityEdge::setGuard(QUmlValueSpecification *guard)
         removeOwnedElement(_guard);
 
         _guard = guard;
-        if (guard && guard->asQObject() && this->asQObject())
-            QObject::connect(guard->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setGuard()));
-        guard->asQObject()->setParent(this->asQObject());
+        if (guard && guard->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(guard->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setGuard()));
+        guard->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (guard) {
@@ -188,8 +186,8 @@ void QUmlActivityEdge::addInGroup(QUmlActivityGroup *inGroup)
 
     if (!_inGroups.contains(inGroup)) {
         _inGroups.insert(inGroup);
-        if (inGroup && inGroup->asQObject() && this->asQObject())
-            QObject::connect(inGroup->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeInGroup(QObject *)));
+        if (inGroup && inGroup->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(inGroup->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeInGroup(QObject *)));
 
         // Adjust opposite properties
         if (inGroup) {
@@ -228,8 +226,8 @@ void QUmlActivityEdge::addInPartition(QUmlActivityPartition *inPartition)
 
     if (!_inPartitions.contains(inPartition)) {
         _inPartitions.insert(inPartition);
-        if (inPartition && inPartition->asQObject() && this->asQObject())
-            QObject::connect(inPartition->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeInPartition(QObject *)));
+        if (inPartition && inPartition->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(inPartition->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeInPartition(QObject *)));
 
         // Adjust subsetted properties
         addInGroup(inPartition);
@@ -277,8 +275,8 @@ void QUmlActivityEdge::setInStructuredNode(QUmlStructuredActivityNode *inStructu
         removeInGroup(_inStructuredNode);
 
         _inStructuredNode = inStructuredNode;
-        if (inStructuredNode && inStructuredNode->asQObject() && this->asQObject())
-            QObject::connect(inStructuredNode->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setInStructuredNode()));
+        if (inStructuredNode && inStructuredNode->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(inStructuredNode->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setInStructuredNode()));
 
         // Adjust subsetted properties
         if (inStructuredNode) {
@@ -304,8 +302,8 @@ void QUmlActivityEdge::setInterrupts(QUmlInterruptibleActivityRegion *interrupts
 
     if (_interrupts != interrupts) {
         _interrupts = interrupts;
-        if (interrupts && interrupts->asQObject() && this->asQObject())
-            QObject::connect(interrupts->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setInterrupts()));
+        if (interrupts && interrupts->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(interrupts->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setInterrupts()));
     }
 }
 
@@ -325,8 +323,8 @@ void QUmlActivityEdge::addRedefinedEdge(QUmlActivityEdge *redefinedEdge)
 
     if (!_redefinedEdges.contains(redefinedEdge)) {
         _redefinedEdges.insert(redefinedEdge);
-        if (redefinedEdge && redefinedEdge->asQObject() && this->asQObject())
-            QObject::connect(redefinedEdge->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeRedefinedEdge(QObject *)));
+        if (redefinedEdge && redefinedEdge->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(redefinedEdge->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeRedefinedEdge(QObject *)));
 
         // Adjust subsetted properties
         addRedefinedElement(redefinedEdge);
@@ -361,8 +359,8 @@ void QUmlActivityEdge::setSource(QUmlActivityNode *source)
 
     if (_source != source) {
         _source = source;
-        if (source && source->asQObject() && this->asQObject())
-            QObject::connect(source->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setSource()));
+        if (source && source->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(source->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setSource()));
     }
 }
 
@@ -382,8 +380,8 @@ void QUmlActivityEdge::setTarget(QUmlActivityNode *target)
 
     if (_target != target) {
         _target = target;
-        if (target && target->asQObject() && this->asQObject())
-            QObject::connect(target->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setTarget()));
+        if (target && target->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(target->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setTarget()));
     }
 }
 
@@ -406,9 +404,9 @@ void QUmlActivityEdge::setWeight(QUmlValueSpecification *weight)
         removeOwnedElement(_weight);
 
         _weight = weight;
-        if (weight && weight->asQObject() && this->asQObject())
-            QObject::connect(weight->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setWeight()));
-        weight->asQObject()->setParent(this->asQObject());
+        if (weight && weight->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(weight->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setWeight()));
+        weight->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (weight) {
@@ -417,125 +415,3 @@ void QUmlActivityEdge::setWeight(QUmlValueSpecification *weight)
     }
 }
 
-void QUmlActivityEdge::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("guard"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interrupts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedEdges"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("source"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("target"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("weight"))));
-}
-
-void QUmlActivityEdge::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("activity")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("activity")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityEdge");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("activity")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("activity")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("activity")][QtModeling::DocumentationRole] = QStringLiteral("Activity containing the edge.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("activity")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("activity")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("activity")][QtModeling::OppositeEndRole] = QStringLiteral("Activity-edge");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("guard")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("guard")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityEdge");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("guard")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("guard")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("guard")][QtModeling::DocumentationRole] = QStringLiteral("Specification evaluated at runtime to determine if the edge can be traversed.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("guard")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("guard")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("guard")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inGroups")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inGroups")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityEdge");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inGroups")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inGroups")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inGroups")][QtModeling::DocumentationRole] = QStringLiteral("Groups containing the edge.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inGroups")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inGroups")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inGroups")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityGroup-containedEdge");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inPartitions")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inPartitions")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityEdge");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inPartitions")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inPartitions")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inPartitions")][QtModeling::DocumentationRole] = QStringLiteral("Partitions containing the edge.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inPartitions")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inPartitions")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("ActivityEdge-inGroup");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inPartitions")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityPartition-edge");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inStructuredNode")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inStructuredNode")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityEdge");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inStructuredNode")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inStructuredNode")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inStructuredNode")][QtModeling::DocumentationRole] = QStringLiteral("Structured activity node containing the edge.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inStructuredNode")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inStructuredNode")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("ActivityEdge-inGroup Element-owner");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inStructuredNode")][QtModeling::OppositeEndRole] = QStringLiteral("StructuredActivityNode-edge");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("interrupts")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("interrupts")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityEdge");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("interrupts")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("interrupts")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("interrupts")][QtModeling::DocumentationRole] = QStringLiteral("Region that the edge can interrupt.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("interrupts")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("interrupts")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("interrupts")][QtModeling::OppositeEndRole] = QStringLiteral("InterruptibleActivityRegion-interruptingEdge");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("redefinedEdges")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("redefinedEdges")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityEdge");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("redefinedEdges")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("redefinedEdges")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("redefinedEdges")][QtModeling::DocumentationRole] = QStringLiteral("Inherited edges replaced by this edge in a specialization of the activity.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("redefinedEdges")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("redefinedEdges")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("RedefinableElement-redefinedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("redefinedEdges")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("source")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("source")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityEdge");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("source")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("source")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("source")][QtModeling::DocumentationRole] = QStringLiteral("Node from which tokens are taken when they traverse the edge.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("source")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("source")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("source")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityNode-outgoing");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("target")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("target")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityEdge");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("target")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("target")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("target")][QtModeling::DocumentationRole] = QStringLiteral("Node to which tokens are put when they traverse the edge.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("target")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("target")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("target")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityNode-incoming");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("weight")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("weight")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityEdge");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("weight")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("weight")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("weight")][QtModeling::DocumentationRole] = QStringLiteral("The minimum number of tokens that must traverse the edge at the same time.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("weight")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("weight")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("weight")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlactivityedge.h b/src/uml/qumlactivityedge.h
index fb22e923..016098e8 100644
--- a/src/uml/qumlactivityedge.h
+++ b/src/uml/qumlactivityedge.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlRedefinableElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -65,7 +64,7 @@ class Q_UML_EXPORT QUmlActivityEdge : public QUmlRedefinableElement
 public:
     virtual ~QUmlActivityEdge();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlActivity *activity() const;
@@ -105,9 +104,6 @@ protected:
     QUmlActivityNode *_source;
     QUmlActivityNode *_target;
     QUmlValueSpecification *_weight;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlactivityfinalnode.cpp b/src/uml/qumlactivityfinalnode.cpp
index 244f76e2..ec6f1dfe 100644
--- a/src/uml/qumlactivityfinalnode.cpp
+++ b/src/uml/qumlactivityfinalnode.cpp
@@ -66,24 +66,22 @@
 
     \brief An activity final node is a final node that stops all flows in an activity.
  */
-QUmlActivityFinalNode::QUmlActivityFinalNode(bool createQObject)
+QUmlActivityFinalNode::QUmlActivityFinalNode(bool createQModelingObject)
 {
-    if (createQObject)
-        _qObject = new QUmlActivityFinalNodeObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlActivityFinalNodeObject(this));
 }
 
 QUmlActivityFinalNode::~QUmlActivityFinalNode()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlActivityFinalNode::clone() const
+QModelingElement *QUmlActivityFinalNode::clone() const
 {
     QUmlActivityFinalNode *c = new QUmlActivityFinalNode;
     foreach (QUmlComment *element, ownedComments())
@@ -112,33 +110,3 @@ QModelingObject *QUmlActivityFinalNode::clone() const
     return c;
 }
 
-void QUmlActivityFinalNode::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-}
-
-void QUmlActivityFinalNode::setPropertyData()
-{
-}
-
diff --git a/src/uml/qumlactivityfinalnode.h b/src/uml/qumlactivityfinalnode.h
index 5fa17d23..96b2324d 100644
--- a/src/uml/qumlactivityfinalnode.h
+++ b/src/uml/qumlactivityfinalnode.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlFinalNode>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,16 +54,13 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlActivityFinalNode : public QUmlFinalNode
 {
 public:
-    explicit QUmlActivityFinalNode(bool createQObject = true);
+    explicit QUmlActivityFinalNode(bool createQModelingObject = true);
     virtual ~QUmlActivityFinalNode();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
 
 protected:
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlactivitygroup.cpp b/src/uml/qumlactivitygroup.cpp
index f4df3a60..edb9433f 100644
--- a/src/uml/qumlactivitygroup.cpp
+++ b/src/uml/qumlactivitygroup.cpp
@@ -62,15 +62,13 @@ QUmlActivityGroup::QUmlActivityGroup() :
     _inActivity(0),
     _superGroup(0)
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlActivityGroup::~QUmlActivityGroup()
 {
 }
 
-QModelingObject *QUmlActivityGroup::clone() const
+QModelingElement *QUmlActivityGroup::clone() const
 {
     QUmlActivityGroup *c = new QUmlActivityGroup;
     foreach (QUmlComment *element, ownedComments())
@@ -104,8 +102,8 @@ void QUmlActivityGroup::addContainedEdge(QUmlActivityEdge *containedEdge)
 
     if (!_containedEdges.contains(containedEdge)) {
         _containedEdges.insert(containedEdge);
-        if (containedEdge && containedEdge->asQObject() && this->asQObject())
-            QObject::connect(containedEdge->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeContainedEdge(QObject *)));
+        if (containedEdge && containedEdge->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(containedEdge->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeContainedEdge(QObject *)));
 
         // Adjust opposite properties
         if (containedEdge) {
@@ -144,8 +142,8 @@ void QUmlActivityGroup::addContainedNode(QUmlActivityNode *containedNode)
 
     if (!_containedNodes.contains(containedNode)) {
         _containedNodes.insert(containedNode);
-        if (containedNode && containedNode->asQObject() && this->asQObject())
-            QObject::connect(containedNode->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeContainedNode(QObject *)));
+        if (containedNode && containedNode->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(containedNode->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeContainedNode(QObject *)));
 
         // Adjust opposite properties
         if (containedNode) {
@@ -186,8 +184,8 @@ void QUmlActivityGroup::setInActivity(QUmlActivity *inActivity)
         // Adjust subsetted properties
 
         _inActivity = inActivity;
-        if (inActivity && inActivity->asQObject() && this->asQObject())
-            QObject::connect(inActivity->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setInActivity()));
+        if (inActivity && inActivity->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(inActivity->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setInActivity()));
 
         // Adjust subsetted properties
         setOwner(inActivity);
@@ -210,9 +208,9 @@ void QUmlActivityGroup::addSubgroup(QUmlActivityGroup *subgroup)
 
     if (!_subgroups.contains(subgroup)) {
         _subgroups.insert(subgroup);
-        if (subgroup && subgroup->asQObject() && this->asQObject())
-            QObject::connect(subgroup->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeSubgroup(QObject *)));
-        subgroup->asQObject()->setParent(this->asQObject());
+        if (subgroup && subgroup->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(subgroup->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeSubgroup(QObject *)));
+        subgroup->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(subgroup);
@@ -225,8 +223,8 @@ void QUmlActivityGroup::removeSubgroup(QUmlActivityGroup *subgroup)
 
     if (_subgroups.contains(subgroup)) {
         _subgroups.remove(subgroup);
-        if (subgroup->asQObject())
-            subgroup->asQObject()->setParent(0);
+        if (subgroup->asQModelingObject())
+            subgroup->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(subgroup);
@@ -251,80 +249,11 @@ void QUmlActivityGroup::setSuperGroup(QUmlActivityGroup *superGroup)
         // Adjust subsetted properties
 
         _superGroup = superGroup;
-        if (superGroup && superGroup->asQObject() && this->asQObject())
-            QObject::connect(superGroup->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setSuperGroup()));
+        if (superGroup && superGroup->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(superGroup->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setSuperGroup()));
 
         // Adjust subsetted properties
         setOwner(superGroup);
     }
 }
 
-void QUmlActivityGroup::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("containedEdges"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("containedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inActivity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("subgroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superGroup"))));
-}
-
-void QUmlActivityGroup::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("containedEdges")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("containedEdges")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityGroup");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("containedEdges")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("containedEdges")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("containedEdges")][QtModeling::DocumentationRole] = QStringLiteral("Edges immediately contained in the group.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("containedEdges")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("containedEdges")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("containedEdges")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityEdge-inGroup");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("containedNodes")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("containedNodes")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityGroup");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("containedNodes")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("containedNodes")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("containedNodes")][QtModeling::DocumentationRole] = QStringLiteral("Nodes immediately contained in the group.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("containedNodes")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("containedNodes")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("containedNodes")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityNode-inGroup");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("inActivity")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("inActivity")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityGroup");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("inActivity")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("inActivity")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("inActivity")][QtModeling::DocumentationRole] = QStringLiteral("Activity containing the group.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("inActivity")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("inActivity")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("inActivity")][QtModeling::OppositeEndRole] = QStringLiteral("Activity-group");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("subgroups")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("subgroups")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityGroup");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("subgroups")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("subgroups")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("subgroups")][QtModeling::DocumentationRole] = QStringLiteral("Groups immediately contained in the group.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("subgroups")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("subgroups")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("subgroups")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityGroup-superGroup");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("superGroup")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("superGroup")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityGroup");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("superGroup")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("superGroup")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("superGroup")][QtModeling::DocumentationRole] = QStringLiteral("Group immediately containing the group.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("superGroup")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("superGroup")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("superGroup")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityGroup-subgroup");
-
-}
-
diff --git a/src/uml/qumlactivitygroup.h b/src/uml/qumlactivitygroup.h
index 79dad5dd..6421e5ee 100644
--- a/src/uml/qumlactivitygroup.h
+++ b/src/uml/qumlactivitygroup.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlNamedElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -61,7 +60,7 @@ class Q_UML_EXPORT QUmlActivityGroup : public virtual QUmlNamedElement
 public:
     virtual ~QUmlActivityGroup();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlActivityEdge *> containedEdges() const;
@@ -86,9 +85,6 @@ protected:
     QUmlActivity *_inActivity;
     QSet<QUmlActivityGroup *> _subgroups;
     QUmlActivityGroup *_superGroup;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlactivitynode.cpp b/src/uml/qumlactivitynode.cpp
index 84d17452..034a0d37 100644
--- a/src/uml/qumlactivitynode.cpp
+++ b/src/uml/qumlactivitynode.cpp
@@ -67,15 +67,13 @@ QUmlActivityNode::QUmlActivityNode() :
     _activity(0),
     _inStructuredNode(0)
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlActivityNode::~QUmlActivityNode()
 {
 }
 
-QModelingObject *QUmlActivityNode::clone() const
+QModelingElement *QUmlActivityNode::clone() const
 {
     QUmlActivityNode *c = new QUmlActivityNode;
     foreach (QUmlComment *element, ownedComments())
@@ -124,8 +122,8 @@ void QUmlActivityNode::setActivity(QUmlActivity *activity)
         // Adjust subsetted properties
 
         _activity = activity;
-        if (activity && activity->asQObject() && this->asQObject())
-            QObject::connect(activity->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setActivity()));
+        if (activity && activity->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(activity->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setActivity()));
 
         // Adjust subsetted properties
         setOwner(activity);
@@ -148,8 +146,8 @@ void QUmlActivityNode::addInGroup(QUmlActivityGroup *inGroup)
 
     if (!_inGroups.contains(inGroup)) {
         _inGroups.insert(inGroup);
-        if (inGroup && inGroup->asQObject() && this->asQObject())
-            QObject::connect(inGroup->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeInGroup(QObject *)));
+        if (inGroup && inGroup->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(inGroup->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeInGroup(QObject *)));
 
         // Adjust opposite properties
         if (inGroup) {
@@ -188,8 +186,8 @@ void QUmlActivityNode::addInInterruptibleRegion(QUmlInterruptibleActivityRegion
 
     if (!_inInterruptibleRegions.contains(inInterruptibleRegion)) {
         _inInterruptibleRegions.insert(inInterruptibleRegion);
-        if (inInterruptibleRegion && inInterruptibleRegion->asQObject() && this->asQObject())
-            QObject::connect(inInterruptibleRegion->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeInInterruptibleRegion(QObject *)));
+        if (inInterruptibleRegion && inInterruptibleRegion->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(inInterruptibleRegion->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeInInterruptibleRegion(QObject *)));
 
         // Adjust subsetted properties
         addInGroup(inInterruptibleRegion);
@@ -234,8 +232,8 @@ void QUmlActivityNode::addInPartition(QUmlActivityPartition *inPartition)
 
     if (!_inPartitions.contains(inPartition)) {
         _inPartitions.insert(inPartition);
-        if (inPartition && inPartition->asQObject() && this->asQObject())
-            QObject::connect(inPartition->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeInPartition(QObject *)));
+        if (inPartition && inPartition->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(inPartition->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeInPartition(QObject *)));
 
         // Adjust subsetted properties
         addInGroup(inPartition);
@@ -283,8 +281,8 @@ void QUmlActivityNode::setInStructuredNode(QUmlStructuredActivityNode *inStructu
         removeInGroup(_inStructuredNode);
 
         _inStructuredNode = inStructuredNode;
-        if (inStructuredNode && inStructuredNode->asQObject() && this->asQObject())
-            QObject::connect(inStructuredNode->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setInStructuredNode()));
+        if (inStructuredNode && inStructuredNode->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(inStructuredNode->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setInStructuredNode()));
 
         // Adjust subsetted properties
         if (inStructuredNode) {
@@ -310,8 +308,8 @@ void QUmlActivityNode::addIncoming(QUmlActivityEdge *incoming)
 
     if (!_incomings.contains(incoming)) {
         _incomings.insert(incoming);
-        if (incoming && incoming->asQObject() && this->asQObject())
-            QObject::connect(incoming->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeIncoming(QObject *)));
+        if (incoming && incoming->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(incoming->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeIncoming(QObject *)));
 
         // Adjust opposite properties
         if (incoming) {
@@ -350,8 +348,8 @@ void QUmlActivityNode::addOutgoing(QUmlActivityEdge *outgoing)
 
     if (!_outgoings.contains(outgoing)) {
         _outgoings.insert(outgoing);
-        if (outgoing && outgoing->asQObject() && this->asQObject())
-            QObject::connect(outgoing->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeOutgoing(QObject *)));
+        if (outgoing && outgoing->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(outgoing->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeOutgoing(QObject *)));
 
         // Adjust opposite properties
         if (outgoing) {
@@ -390,8 +388,8 @@ void QUmlActivityNode::addRedefinedNode(QUmlActivityNode *redefinedNode)
 
     if (!_redefinedNodes.contains(redefinedNode)) {
         _redefinedNodes.insert(redefinedNode);
-        if (redefinedNode && redefinedNode->asQObject() && this->asQObject())
-            QObject::connect(redefinedNode->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeRedefinedNode(QObject *)));
+        if (redefinedNode && redefinedNode->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(redefinedNode->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeRedefinedNode(QObject *)));
 
         // Adjust subsetted properties
         addRedefinedElement(redefinedNode);
@@ -410,105 +408,3 @@ void QUmlActivityNode::removeRedefinedNode(QUmlActivityNode *redefinedNode)
     }
 }
 
-void QUmlActivityNode::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-}
-
-void QUmlActivityNode::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("activity")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("activity")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("activity")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("activity")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("activity")][QtModeling::DocumentationRole] = QStringLiteral("Activity containing the node.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("activity")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("activity")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("activity")][QtModeling::OppositeEndRole] = QStringLiteral("Activity-node");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inGroups")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inGroups")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inGroups")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inGroups")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inGroups")][QtModeling::DocumentationRole] = QStringLiteral("Groups containing the node.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inGroups")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inGroups")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inGroups")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityGroup-containedNode");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inInterruptibleRegions")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inInterruptibleRegions")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inInterruptibleRegions")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inInterruptibleRegions")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inInterruptibleRegions")][QtModeling::DocumentationRole] = QStringLiteral("Interruptible regions containing the node.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inInterruptibleRegions")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inInterruptibleRegions")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("ActivityNode-inGroup");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inInterruptibleRegions")][QtModeling::OppositeEndRole] = QStringLiteral("InterruptibleActivityRegion-node");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inPartitions")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inPartitions")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inPartitions")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inPartitions")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inPartitions")][QtModeling::DocumentationRole] = QStringLiteral("Partitions containing the node.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inPartitions")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inPartitions")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("ActivityNode-inGroup");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inPartitions")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityPartition-node");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inStructuredNode")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inStructuredNode")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inStructuredNode")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inStructuredNode")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inStructuredNode")][QtModeling::DocumentationRole] = QStringLiteral("Structured activity node containing the node.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inStructuredNode")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inStructuredNode")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("ActivityNode-inGroup Element-owner");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inStructuredNode")][QtModeling::OppositeEndRole] = QStringLiteral("StructuredActivityNode-node");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("incomings")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("incomings")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("incomings")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("incomings")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("incomings")][QtModeling::DocumentationRole] = QStringLiteral("Edges that have the node as target.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("incomings")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("incomings")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("incomings")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityEdge-target");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("outgoings")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("outgoings")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("outgoings")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("outgoings")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("outgoings")][QtModeling::DocumentationRole] = QStringLiteral("Edges that have the node as source.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("outgoings")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("outgoings")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("outgoings")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityEdge-source");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("redefinedNodes")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("redefinedNodes")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("redefinedNodes")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("redefinedNodes")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("redefinedNodes")][QtModeling::DocumentationRole] = QStringLiteral("Inherited nodes replaced by this node in a specialization of the activity.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("redefinedNodes")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("redefinedNodes")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("RedefinableElement-redefinedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("redefinedNodes")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlactivitynode.h b/src/uml/qumlactivitynode.h
index c2f03cdd..0a7fe3dc 100644
--- a/src/uml/qumlactivitynode.h
+++ b/src/uml/qumlactivitynode.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlRedefinableElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -64,7 +63,7 @@ class Q_UML_EXPORT QUmlActivityNode : public QUmlRedefinableElement
 public:
     virtual ~QUmlActivityNode();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlActivity *activity() const;
@@ -101,9 +100,6 @@ protected:
     QSet<QUmlActivityEdge *> _incomings;
     QSet<QUmlActivityEdge *> _outgoings;
     QSet<QUmlActivityNode *> _redefinedNodes;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlactivityparameternode.cpp b/src/uml/qumlactivityparameternode.cpp
index dd0154aa..e968f376 100644
--- a/src/uml/qumlactivityparameternode.cpp
+++ b/src/uml/qumlactivityparameternode.cpp
@@ -71,25 +71,23 @@
 
     \brief An activity parameter node is an object node for inputs and outputs to activities.
  */
-QUmlActivityParameterNode::QUmlActivityParameterNode(bool createQObject) :
+QUmlActivityParameterNode::QUmlActivityParameterNode(bool createQModelingObject) :
     _parameter(0)
 {
-    if (createQObject)
-        _qObject = new QUmlActivityParameterNodeObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlActivityParameterNodeObject(this));
 }
 
 QUmlActivityParameterNode::~QUmlActivityParameterNode()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlActivityParameterNode::clone() const
+QModelingElement *QUmlActivityParameterNode::clone() const
 {
     QUmlActivityParameterNode *c = new QUmlActivityParameterNode;
     foreach (QUmlComment *element, ownedComments())
@@ -148,54 +146,8 @@ void QUmlActivityParameterNode::setParameter(QUmlParameter *parameter)
 
     if (_parameter != parameter) {
         _parameter = parameter;
-        if (parameter && parameter->asQObject() && this->asQObject())
-            QObject::connect(parameter->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setParameter()));
+        if (parameter && parameter->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(parameter->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setParameter()));
     }
 }
 
-void QUmlActivityParameterNode::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStates"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isControlType"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ordering"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("selection"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperBound"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityParameterNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parameter"))));
-}
-
-void QUmlActivityParameterNode::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityParameterNode")][QStringLiteral("parameter")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityParameterNode")][QStringLiteral("parameter")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityParameterNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityParameterNode")][QStringLiteral("parameter")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityParameterNode")][QStringLiteral("parameter")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityParameterNode")][QStringLiteral("parameter")][QtModeling::DocumentationRole] = QStringLiteral("The parameter the object node will be accepting or providing values for.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityParameterNode")][QStringLiteral("parameter")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityParameterNode")][QStringLiteral("parameter")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityParameterNode")][QStringLiteral("parameter")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlactivityparameternode.h b/src/uml/qumlactivityparameternode.h
index dd60566b..a5f89611 100644
--- a/src/uml/qumlactivityparameternode.h
+++ b/src/uml/qumlactivityparameternode.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlObjectNode>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlParameter;
 class Q_UML_EXPORT QUmlActivityParameterNode : public QUmlObjectNode
 {
 public:
-    explicit QUmlActivityParameterNode(bool createQObject = true);
+    explicit QUmlActivityParameterNode(bool createQModelingObject = true);
     virtual ~QUmlActivityParameterNode();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlParameter *parameter() const;
@@ -68,9 +67,6 @@ public:
 
 protected:
     QUmlParameter *_parameter;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlactivitypartition.cpp b/src/uml/qumlactivitypartition.cpp
index 0ad818d0..40b7de48 100644
--- a/src/uml/qumlactivitypartition.cpp
+++ b/src/uml/qumlactivitypartition.cpp
@@ -61,28 +61,26 @@
 
     \brief An activity partition is a kind of activity group for identifying actions that have some characteristic in common.
  */
-QUmlActivityPartition::QUmlActivityPartition(bool createQObject) :
+QUmlActivityPartition::QUmlActivityPartition(bool createQModelingObject) :
     _isDimension(false),
     _isExternal(false),
     _represents(0),
     _superPartition(0)
 {
-    if (createQObject)
-        _qObject = new QUmlActivityPartitionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlActivityPartitionObject(this));
 }
 
 QUmlActivityPartition::~QUmlActivityPartition()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlActivityPartition::clone() const
+QModelingElement *QUmlActivityPartition::clone() const
 {
     QUmlActivityPartition *c = new QUmlActivityPartition;
     foreach (QUmlComment *element, ownedComments())
@@ -128,8 +126,8 @@ void QUmlActivityPartition::addEdge(QUmlActivityEdge *edge)
 
     if (!_edges.contains(edge)) {
         _edges.insert(edge);
-        if (edge && edge->asQObject() && this->asQObject())
-            QObject::connect(edge->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeEdge(QObject *)));
+        if (edge && edge->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(edge->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeEdge(QObject *)));
 
         // Adjust subsetted properties
         addContainedEdge(edge);
@@ -174,7 +172,7 @@ void QUmlActivityPartition::setDimension(bool isDimension)
 
     if (_isDimension != isDimension) {
         _isDimension = isDimension;
-        _modifiedResettableProperties << QStringLiteral("isDimension");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isDimension");
     }
 }
 
@@ -194,7 +192,7 @@ void QUmlActivityPartition::setExternal(bool isExternal)
 
     if (_isExternal != isExternal) {
         _isExternal = isExternal;
-        _modifiedResettableProperties << QStringLiteral("isExternal");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isExternal");
     }
 }
 
@@ -214,8 +212,8 @@ void QUmlActivityPartition::addNode(QUmlActivityNode *node)
 
     if (!_nodes.contains(node)) {
         _nodes.insert(node);
-        if (node && node->asQObject() && this->asQObject())
-            QObject::connect(node->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeNode(QObject *)));
+        if (node && node->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(node->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeNode(QObject *)));
 
         // Adjust subsetted properties
         addContainedNode(node);
@@ -260,8 +258,8 @@ void QUmlActivityPartition::setRepresents(QUmlElement *represents)
 
     if (_represents != represents) {
         _represents = represents;
-        if (represents && represents->asQObject() && this->asQObject())
-            QObject::connect(represents->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setRepresents()));
+        if (represents && represents->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(represents->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setRepresents()));
     }
 }
 
@@ -281,9 +279,9 @@ void QUmlActivityPartition::addSubpartition(QUmlActivityPartition *subpartition)
 
     if (!_subpartitions.contains(subpartition)) {
         _subpartitions.insert(subpartition);
-        if (subpartition && subpartition->asQObject() && this->asQObject())
-            QObject::connect(subpartition->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeSubpartition(QObject *)));
-        subpartition->asQObject()->setParent(this->asQObject());
+        if (subpartition && subpartition->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(subpartition->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeSubpartition(QObject *)));
+        subpartition->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addSubgroup(subpartition);
@@ -296,8 +294,8 @@ void QUmlActivityPartition::removeSubpartition(QUmlActivityPartition *subpartiti
 
     if (_subpartitions.contains(subpartition)) {
         _subpartitions.remove(subpartition);
-        if (subpartition->asQObject())
-            subpartition->asQObject()->setParent(0);
+        if (subpartition->asQModelingObject())
+            subpartition->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeSubgroup(subpartition);
@@ -322,105 +320,11 @@ void QUmlActivityPartition::setSuperPartition(QUmlActivityPartition *superPartit
         // Adjust subsetted properties
 
         _superPartition = superPartition;
-        if (superPartition && superPartition->asQObject() && this->asQObject())
-            QObject::connect(superPartition->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setSuperPartition()));
+        if (superPartition && superPartition->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(superPartition->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setSuperPartition()));
 
         // Adjust subsetted properties
         setSuperGroup(superPartition);
     }
 }
 
-void QUmlActivityPartition::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("containedEdges"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("containedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inActivity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("subgroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superGroup"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityPartition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("edges"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityPartition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isDimension"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityPartition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isExternal"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityPartition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityPartition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("represents"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityPartition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("subpartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityPartition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superPartition"))));
-}
-
-void QUmlActivityPartition::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("edges")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("edges")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityPartition");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("edges")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("edges")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("edges")][QtModeling::DocumentationRole] = QStringLiteral("Edges immediately contained in the group.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("edges")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("edges")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("ActivityGroup-containedEdge");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("edges")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityEdge-inPartition");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("isDimension")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("isDimension")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityPartition");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("isDimension")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("isDimension")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("isDimension")][QtModeling::DocumentationRole] = QStringLiteral("Tells whether the partition groups other partitions along a dimension.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("isDimension")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("isDimension")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("isDimension")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("isExternal")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("isExternal")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityPartition");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("isExternal")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("isExternal")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("isExternal")][QtModeling::DocumentationRole] = QStringLiteral("Tells whether the partition represents an entity to which the partitioning structure does not apply.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("isExternal")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("isExternal")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("isExternal")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("nodes")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("nodes")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityPartition");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("nodes")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("nodes")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("nodes")][QtModeling::DocumentationRole] = QStringLiteral("Nodes immediately contained in the group.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("nodes")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("nodes")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("ActivityGroup-containedNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("nodes")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityNode-inPartition");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("represents")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("represents")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityPartition");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("represents")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("represents")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("represents")][QtModeling::DocumentationRole] = QStringLiteral("An element constraining behaviors invoked by nodes in the partition.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("represents")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("represents")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("represents")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("subpartitions")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("subpartitions")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityPartition");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("subpartitions")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("subpartitions")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("subpartitions")][QtModeling::DocumentationRole] = QStringLiteral("Partitions immediately contained in the partition.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("subpartitions")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("subpartitions")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("ActivityGroup-subgroup");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("subpartitions")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityPartition-superPartition");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("superPartition")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("superPartition")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityPartition");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("superPartition")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("superPartition")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("superPartition")][QtModeling::DocumentationRole] = QStringLiteral("Partition immediately containing the partition.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("superPartition")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("superPartition")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("ActivityGroup-superGroup");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("superPartition")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityPartition-subpartition");
-
-}
-
diff --git a/src/uml/qumlactivitypartition.h b/src/uml/qumlactivitypartition.h
index a6d24341..edf05540 100644
--- a/src/uml/qumlactivitypartition.h
+++ b/src/uml/qumlactivitypartition.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlActivityGroup>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -59,10 +58,10 @@ class QUmlElement;
 class Q_UML_EXPORT QUmlActivityPartition : public QUmlActivityGroup
 {
 public:
-    explicit QUmlActivityPartition(bool createQObject = true);
+    explicit QUmlActivityPartition(bool createQModelingObject = true);
     virtual ~QUmlActivityPartition();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlActivityEdge *> edges() const;
@@ -91,9 +90,6 @@ protected:
     QUmlElement *_represents;
     QSet<QUmlActivityPartition *> _subpartitions;
     QUmlActivityPartition *_superPartition;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlactor.cpp b/src/uml/qumlactor.cpp
index 7fe2af3d..a69cd508 100644
--- a/src/uml/qumlactor.cpp
+++ b/src/uml/qumlactor.cpp
@@ -79,24 +79,22 @@
 
     \brief An actor specifies a role played by a user or any other system that interacts with the subject.
  */
-QUmlActor::QUmlActor(bool createQObject)
+QUmlActor::QUmlActor(bool createQModelingObject)
 {
-    if (createQObject)
-        _qObject = new QUmlActorObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlActorObject(this));
 }
 
 QUmlActor::~QUmlActor()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlActor::clone() const
+QModelingElement *QUmlActor::clone() const
 {
     QUmlActor *c = new QUmlActor;
     foreach (QUmlComment *element, ownedComments())
@@ -151,53 +149,3 @@ QModelingObject *QUmlActor::clone() const
     return c;
 }
 
-void QUmlActor::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generals"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifierBehavior"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interfaceRealizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedBehaviors"))));
-}
-
-void QUmlActor::setPropertyData()
-{
-}
-
diff --git a/src/uml/qumlactor.h b/src/uml/qumlactor.h
index 008f5d93..8ceb14a7 100644
--- a/src/uml/qumlactor.h
+++ b/src/uml/qumlactor.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlBehavioredClassifier>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,16 +54,13 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlActor : public QUmlBehavioredClassifier
 {
 public:
-    explicit QUmlActor(bool createQObject = true);
+    explicit QUmlActor(bool createQModelingObject = true);
     virtual ~QUmlActor();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
 
 protected:
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumladdstructuralfeaturevalueaction.cpp b/src/uml/qumladdstructuralfeaturevalueaction.cpp
index 6b0f1b75..cf9eb73b 100644
--- a/src/uml/qumladdstructuralfeaturevalueaction.cpp
+++ b/src/uml/qumladdstructuralfeaturevalueaction.cpp
@@ -71,26 +71,24 @@
 
     \brief An add structural feature value action is a write structural feature action for adding values to a structural feature.
  */
-QUmlAddStructuralFeatureValueAction::QUmlAddStructuralFeatureValueAction(bool createQObject) :
+QUmlAddStructuralFeatureValueAction::QUmlAddStructuralFeatureValueAction(bool createQModelingObject) :
     _insertAt(0),
     _isReplaceAll(false)
 {
-    if (createQObject)
-        _qObject = new QUmlAddStructuralFeatureValueActionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlAddStructuralFeatureValueActionObject(this));
 }
 
 QUmlAddStructuralFeatureValueAction::~QUmlAddStructuralFeatureValueAction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlAddStructuralFeatureValueAction::clone() const
+QModelingElement *QUmlAddStructuralFeatureValueAction::clone() const
 {
     QUmlAddStructuralFeatureValueAction *c = new QUmlAddStructuralFeatureValueAction;
     foreach (QUmlComment *element, ownedComments())
@@ -158,9 +156,9 @@ void QUmlAddStructuralFeatureValueAction::setInsertAt(QUmlInputPin *insertAt)
         removeInput(_insertAt);
 
         _insertAt = insertAt;
-        if (insertAt && insertAt->asQObject() && this->asQObject())
-            QObject::connect(insertAt->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setInsertAt()));
-        insertAt->asQObject()->setParent(this->asQObject());
+        if (insertAt && insertAt->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(insertAt->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setInsertAt()));
+        insertAt->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (insertAt) {
@@ -185,68 +183,7 @@ void QUmlAddStructuralFeatureValueAction::setReplaceAll(bool isReplaceAll)
 
     if (_isReplaceAll != isReplaceAll) {
         _isReplaceAll = isReplaceAll;
-        _modifiedResettableProperties << QStringLiteral("isReplaceAll");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isReplaceAll");
     }
 }
 
-void QUmlAddStructuralFeatureValueAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuralFeatureAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("object"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuralFeatureAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("structuralFeature"))));
-    _groupProperties.insert(QStringLiteral("QUmlWriteStructuralFeatureAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("result"))));
-    _groupProperties.insert(QStringLiteral("QUmlWriteStructuralFeatureAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("value"))));
-    _groupProperties.insert(QStringLiteral("QUmlAddStructuralFeatureValueAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("insertAt"))));
-    _groupProperties.insert(QStringLiteral("QUmlAddStructuralFeatureValueAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isReplaceAll"))));
-}
-
-void QUmlAddStructuralFeatureValueAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAddStructuralFeatureValueAction")][QStringLiteral("insertAt")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAddStructuralFeatureValueAction")][QStringLiteral("insertAt")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAddStructuralFeatureValueAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAddStructuralFeatureValueAction")][QStringLiteral("insertAt")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAddStructuralFeatureValueAction")][QStringLiteral("insertAt")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAddStructuralFeatureValueAction")][QStringLiteral("insertAt")][QtModeling::DocumentationRole] = QStringLiteral("Gives the position at which to insert a new value or move an existing value in ordered structural features. The type of the pin is UnlimitedNatural, but the value cannot be zero. This pin is omitted for unordered structural features.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAddStructuralFeatureValueAction")][QStringLiteral("insertAt")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAddStructuralFeatureValueAction")][QStringLiteral("insertAt")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAddStructuralFeatureValueAction")][QStringLiteral("insertAt")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAddStructuralFeatureValueAction")][QStringLiteral("isReplaceAll")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAddStructuralFeatureValueAction")][QStringLiteral("isReplaceAll")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAddStructuralFeatureValueAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAddStructuralFeatureValueAction")][QStringLiteral("isReplaceAll")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAddStructuralFeatureValueAction")][QStringLiteral("isReplaceAll")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAddStructuralFeatureValueAction")][QStringLiteral("isReplaceAll")][QtModeling::DocumentationRole] = QStringLiteral("Specifies whether existing values of the structural feature of the object should be removed before adding the new value.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAddStructuralFeatureValueAction")][QStringLiteral("isReplaceAll")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAddStructuralFeatureValueAction")][QStringLiteral("isReplaceAll")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAddStructuralFeatureValueAction")][QStringLiteral("isReplaceAll")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumladdstructuralfeaturevalueaction.h b/src/uml/qumladdstructuralfeaturevalueaction.h
index 5dbbeb0a..cc79bb07 100644
--- a/src/uml/qumladdstructuralfeaturevalueaction.h
+++ b/src/uml/qumladdstructuralfeaturevalueaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlWriteStructuralFeatureAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlInputPin;
 class Q_UML_EXPORT QUmlAddStructuralFeatureValueAction : public QUmlWriteStructuralFeatureAction
 {
 public:
-    explicit QUmlAddStructuralFeatureValueAction(bool createQObject = true);
+    explicit QUmlAddStructuralFeatureValueAction(bool createQModelingObject = true);
     virtual ~QUmlAddStructuralFeatureValueAction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlInputPin *insertAt() const;
@@ -71,9 +70,6 @@ public:
 protected:
     QUmlInputPin *_insertAt;
     bool _isReplaceAll;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumladdvariablevalueaction.cpp b/src/uml/qumladdvariablevalueaction.cpp
index ccfd5739..b896dafa 100644
--- a/src/uml/qumladdvariablevalueaction.cpp
+++ b/src/uml/qumladdvariablevalueaction.cpp
@@ -71,26 +71,24 @@
 
     \brief An add variable value action is a write variable action for adding values to a variable.
  */
-QUmlAddVariableValueAction::QUmlAddVariableValueAction(bool createQObject) :
+QUmlAddVariableValueAction::QUmlAddVariableValueAction(bool createQModelingObject) :
     _insertAt(0),
     _isReplaceAll(false)
 {
-    if (createQObject)
-        _qObject = new QUmlAddVariableValueActionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlAddVariableValueActionObject(this));
 }
 
 QUmlAddVariableValueAction::~QUmlAddVariableValueAction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlAddVariableValueAction::clone() const
+QModelingElement *QUmlAddVariableValueAction::clone() const
 {
     QUmlAddVariableValueAction *c = new QUmlAddVariableValueAction;
     foreach (QUmlComment *element, ownedComments())
@@ -154,9 +152,9 @@ void QUmlAddVariableValueAction::setInsertAt(QUmlInputPin *insertAt)
         removeInput(_insertAt);
 
         _insertAt = insertAt;
-        if (insertAt && insertAt->asQObject() && this->asQObject())
-            QObject::connect(insertAt->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setInsertAt()));
-        insertAt->asQObject()->setParent(this->asQObject());
+        if (insertAt && insertAt->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(insertAt->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setInsertAt()));
+        insertAt->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (insertAt) {
@@ -181,66 +179,7 @@ void QUmlAddVariableValueAction::setReplaceAll(bool isReplaceAll)
 
     if (_isReplaceAll != isReplaceAll) {
         _isReplaceAll = isReplaceAll;
-        _modifiedResettableProperties << QStringLiteral("isReplaceAll");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isReplaceAll");
     }
 }
 
-void QUmlAddVariableValueAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlVariableAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("variable"))));
-    _groupProperties.insert(QStringLiteral("QUmlWriteVariableAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("value"))));
-    _groupProperties.insert(QStringLiteral("QUmlAddVariableValueAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("insertAt"))));
-    _groupProperties.insert(QStringLiteral("QUmlAddVariableValueAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isReplaceAll"))));
-}
-
-void QUmlAddVariableValueAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAddVariableValueAction")][QStringLiteral("insertAt")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAddVariableValueAction")][QStringLiteral("insertAt")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAddVariableValueAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAddVariableValueAction")][QStringLiteral("insertAt")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAddVariableValueAction")][QStringLiteral("insertAt")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAddVariableValueAction")][QStringLiteral("insertAt")][QtModeling::DocumentationRole] = QStringLiteral("Gives the position at which to insert a new value or move an existing value in ordered variables. The types is UnlimitedINatural, but the value cannot be zero. This pin is omitted for unordered variables.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAddVariableValueAction")][QStringLiteral("insertAt")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAddVariableValueAction")][QStringLiteral("insertAt")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAddVariableValueAction")][QStringLiteral("insertAt")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAddVariableValueAction")][QStringLiteral("isReplaceAll")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAddVariableValueAction")][QStringLiteral("isReplaceAll")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAddVariableValueAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAddVariableValueAction")][QStringLiteral("isReplaceAll")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAddVariableValueAction")][QStringLiteral("isReplaceAll")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAddVariableValueAction")][QStringLiteral("isReplaceAll")][QtModeling::DocumentationRole] = QStringLiteral("Specifies whether existing values of the variable should be removed before adding the new value.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAddVariableValueAction")][QStringLiteral("isReplaceAll")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAddVariableValueAction")][QStringLiteral("isReplaceAll")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAddVariableValueAction")][QStringLiteral("isReplaceAll")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumladdvariablevalueaction.h b/src/uml/qumladdvariablevalueaction.h
index fdea7bdb..2f4f273f 100644
--- a/src/uml/qumladdvariablevalueaction.h
+++ b/src/uml/qumladdvariablevalueaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlWriteVariableAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlInputPin;
 class Q_UML_EXPORT QUmlAddVariableValueAction : public QUmlWriteVariableAction
 {
 public:
-    explicit QUmlAddVariableValueAction(bool createQObject = true);
+    explicit QUmlAddVariableValueAction(bool createQModelingObject = true);
     virtual ~QUmlAddVariableValueAction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlInputPin *insertAt() const;
@@ -71,9 +70,6 @@ public:
 protected:
     QUmlInputPin *_insertAt;
     bool _isReplaceAll;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlanyreceiveevent.cpp b/src/uml/qumlanyreceiveevent.cpp
index 9944d502..64c0dda3 100644
--- a/src/uml/qumlanyreceiveevent.cpp
+++ b/src/uml/qumlanyreceiveevent.cpp
@@ -59,24 +59,22 @@
 
     \brief A trigger for an AnyReceiveEvent is triggered by the receipt of any message that is not explicitly handled by any related trigger.
  */
-QUmlAnyReceiveEvent::QUmlAnyReceiveEvent(bool createQObject)
+QUmlAnyReceiveEvent::QUmlAnyReceiveEvent(bool createQModelingObject)
 {
-    if (createQObject)
-        _qObject = new QUmlAnyReceiveEventObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlAnyReceiveEventObject(this));
 }
 
 QUmlAnyReceiveEvent::~QUmlAnyReceiveEvent()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlAnyReceiveEvent::clone() const
+QModelingElement *QUmlAnyReceiveEvent::clone() const
 {
     QUmlAnyReceiveEvent *c = new QUmlAnyReceiveEvent;
     foreach (QUmlComment *element, ownedComments())
@@ -94,24 +92,3 @@ QModelingObject *QUmlAnyReceiveEvent::clone() const
     return c;
 }
 
-void QUmlAnyReceiveEvent::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-}
-
-void QUmlAnyReceiveEvent::setPropertyData()
-{
-}
-
diff --git a/src/uml/qumlanyreceiveevent.h b/src/uml/qumlanyreceiveevent.h
index d5c804bb..ca2736c7 100644
--- a/src/uml/qumlanyreceiveevent.h
+++ b/src/uml/qumlanyreceiveevent.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlMessageEvent>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,16 +54,13 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlAnyReceiveEvent : public QUmlMessageEvent
 {
 public:
-    explicit QUmlAnyReceiveEvent(bool createQObject = true);
+    explicit QUmlAnyReceiveEvent(bool createQModelingObject = true);
     virtual ~QUmlAnyReceiveEvent();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
 
 protected:
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlartifact.cpp b/src/uml/qumlartifact.cpp
index 2fd1b3a3..9a4cd37d 100644
--- a/src/uml/qumlartifact.cpp
+++ b/src/uml/qumlartifact.cpp
@@ -79,24 +79,22 @@
 
     \brief An artifact is the source of a deployment to a node.An artifact is the specification of a physical piece of information that is used or produced by a software development process, or by deployment and operation of a system. Examples of artifacts include model files, source files, scripts, and binary executable files, a table in a database system, a development deliverable, or a word-processing document, a mail message.
  */
-QUmlArtifact::QUmlArtifact(bool createQObject)
+QUmlArtifact::QUmlArtifact(bool createQModelingObject)
 {
-    if (createQObject)
-        _qObject = new QUmlArtifactObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlArtifactObject(this));
 }
 
 QUmlArtifact::~QUmlArtifact()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlArtifact::clone() const
+QModelingElement *QUmlArtifact::clone() const
 {
     QUmlArtifact *c = new QUmlArtifact;
     foreach (QUmlComment *element, ownedComments())
@@ -191,9 +189,9 @@ void QUmlArtifact::addManifestation(QUmlManifestation *manifestation)
 
     if (!_manifestations.contains(manifestation)) {
         _manifestations.insert(manifestation);
-        if (manifestation && manifestation->asQObject() && this->asQObject())
-            QObject::connect(manifestation->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeManifestation(QObject *)));
-        manifestation->asQObject()->setParent(this->asQObject());
+        if (manifestation && manifestation->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(manifestation->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeManifestation(QObject *)));
+        manifestation->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(manifestation);
@@ -207,8 +205,8 @@ void QUmlArtifact::removeManifestation(QUmlManifestation *manifestation)
 
     if (_manifestations.contains(manifestation)) {
         _manifestations.remove(manifestation);
-        if (manifestation->asQObject())
-            manifestation->asQObject()->setParent(0);
+        if (manifestation->asQModelingObject())
+            manifestation->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(manifestation);
@@ -232,9 +230,9 @@ void QUmlArtifact::addNestedArtifact(QUmlArtifact *nestedArtifact)
 
     if (!_nestedArtifacts.contains(nestedArtifact)) {
         _nestedArtifacts.insert(nestedArtifact);
-        if (nestedArtifact && nestedArtifact->asQObject() && this->asQObject())
-            QObject::connect(nestedArtifact->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeNestedArtifact(QObject *)));
-        nestedArtifact->asQObject()->setParent(this->asQObject());
+        if (nestedArtifact && nestedArtifact->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(nestedArtifact->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeNestedArtifact(QObject *)));
+        nestedArtifact->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedMember(nestedArtifact);
@@ -247,8 +245,8 @@ void QUmlArtifact::removeNestedArtifact(QUmlArtifact *nestedArtifact)
 
     if (_nestedArtifacts.contains(nestedArtifact)) {
         _nestedArtifacts.remove(nestedArtifact);
-        if (nestedArtifact->asQObject())
-            nestedArtifact->asQObject()->setParent(0);
+        if (nestedArtifact->asQModelingObject())
+            nestedArtifact->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedMember(nestedArtifact);
@@ -271,9 +269,9 @@ void QUmlArtifact::addOwnedAttribute(QUmlProperty *ownedAttribute)
 
     if (!_ownedAttributes.contains(ownedAttribute)) {
         _ownedAttributes.append(ownedAttribute);
-        if (ownedAttribute && ownedAttribute->asQObject() && this->asQObject())
-            QObject::connect(ownedAttribute->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeOwnedAttribute(QObject *)));
-        ownedAttribute->asQObject()->setParent(this->asQObject());
+        if (ownedAttribute && ownedAttribute->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(ownedAttribute->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeOwnedAttribute(QObject *)));
+        ownedAttribute->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedMember(ownedAttribute);
@@ -287,8 +285,8 @@ void QUmlArtifact::removeOwnedAttribute(QUmlProperty *ownedAttribute)
 
     if (_ownedAttributes.contains(ownedAttribute)) {
         _ownedAttributes.removeAll(ownedAttribute);
-        if (ownedAttribute->asQObject())
-            ownedAttribute->asQObject()->setParent(0);
+        if (ownedAttribute->asQModelingObject())
+            ownedAttribute->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedMember(ownedAttribute);
@@ -312,9 +310,9 @@ void QUmlArtifact::addOwnedOperation(QUmlOperation *ownedOperation)
 
     if (!_ownedOperations.contains(ownedOperation)) {
         _ownedOperations.append(ownedOperation);
-        if (ownedOperation && ownedOperation->asQObject() && this->asQObject())
-            QObject::connect(ownedOperation->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeOwnedOperation(QObject *)));
-        ownedOperation->asQObject()->setParent(this->asQObject());
+        if (ownedOperation && ownedOperation->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(ownedOperation->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeOwnedOperation(QObject *)));
+        ownedOperation->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addFeature(ownedOperation);
@@ -328,8 +326,8 @@ void QUmlArtifact::removeOwnedOperation(QUmlOperation *ownedOperation)
 
     if (_ownedOperations.contains(ownedOperation)) {
         _ownedOperations.removeAll(ownedOperation);
-        if (ownedOperation->asQObject())
-            ownedOperation->asQObject()->setParent(0);
+        if (ownedOperation->asQModelingObject())
+            ownedOperation->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeFeature(ownedOperation);
@@ -337,100 +335,3 @@ void QUmlArtifact::removeOwnedOperation(QUmlOperation *ownedOperation)
     }
 }
 
-void QUmlArtifact::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generals"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlArtifact"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("fileName"))));
-    _groupProperties.insert(QStringLiteral("QUmlArtifact"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("manifestations"))));
-    _groupProperties.insert(QStringLiteral("QUmlArtifact"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedArtifacts"))));
-    _groupProperties.insert(QStringLiteral("QUmlArtifact"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlArtifact"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
-}
-
-void QUmlArtifact::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("fileName")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("fileName")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlArtifact");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("fileName")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("fileName")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("fileName")][QtModeling::DocumentationRole] = QStringLiteral("A concrete name that is used to refer to the Artifact in a physical context. Example: file system name, universal resource locator.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("fileName")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("fileName")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("fileName")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("manifestations")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("manifestations")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlArtifact");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("manifestations")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("manifestations")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("manifestations")][QtModeling::DocumentationRole] = QStringLiteral("The set of model elements that are manifested in the Artifact. That is, these model elements are utilized in the construction (or generation) of the artifact.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("manifestations")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("manifestations")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement NamedElement-clientDependency");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("manifestations")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("nestedArtifacts")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("nestedArtifacts")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlArtifact");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("nestedArtifacts")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("nestedArtifacts")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("nestedArtifacts")][QtModeling::DocumentationRole] = QStringLiteral("The Artifacts that are defined (nested) within the Artifact. The association is a specialization of the ownedMember association from Namespace to NamedElement.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("nestedArtifacts")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("nestedArtifacts")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("nestedArtifacts")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("ownedAttributes")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("ownedAttributes")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlArtifact");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("ownedAttributes")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("ownedAttributes")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("ownedAttributes")][QtModeling::DocumentationRole] = QStringLiteral("The attributes or association ends defined for the Artifact. The association is a specialization of the ownedMember association.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("ownedAttributes")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("ownedAttributes")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember Classifier-attribute");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("ownedAttributes")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("ownedOperations")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("ownedOperations")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlArtifact");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("ownedOperations")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("ownedOperations")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("ownedOperations")][QtModeling::DocumentationRole] = QStringLiteral("The Operations defined for the Artifact. The association is a specialization of the ownedMember association.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("ownedOperations")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("ownedOperations")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Classifier-feature A_redefinitionContext_redefinableElement-redefinableElement Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("ownedOperations")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlartifact.h b/src/uml/qumlartifact.h
index f2e2c761..cac46681 100644
--- a/src/uml/qumlartifact.h
+++ b/src/uml/qumlartifact.h
@@ -46,7 +46,6 @@
 #include <QtUml/QUmlDeployedArtifact>
 #include <QtUml/QUmlClassifier>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -60,10 +59,10 @@ class QUmlProperty;
 class Q_UML_EXPORT QUmlArtifact : public QUmlDeployedArtifact, public QUmlClassifier
 {
 public:
-    explicit QUmlArtifact(bool createQObject = true);
+    explicit QUmlArtifact(bool createQModelingObject = true);
     virtual ~QUmlArtifact();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QString fileName() const;
@@ -87,9 +86,6 @@ protected:
     QSet<QUmlArtifact *> _nestedArtifacts;
     QList<QUmlProperty *> _ownedAttributes;
     QList<QUmlOperation *> _ownedOperations;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlassociation.cpp b/src/uml/qumlassociation.cpp
index 41c6906c..bc9fa44c 100644
--- a/src/uml/qumlassociation.cpp
+++ b/src/uml/qumlassociation.cpp
@@ -77,25 +77,23 @@
 
     \brief An association describes a set of tuples whose values refer to typed instances. An instance of an association is called a link.A link is a tuple with one value for each end of the association, where each value is an instance of the type of the end.An association describes a set of tuples whose values refer to typed instances. An instance of an association is called a link. A link is a tuple with one value for each end of the association, where each value is an instance of the type of the end.
  */
-QUmlAssociation::QUmlAssociation(bool createQObject) :
+QUmlAssociation::QUmlAssociation(bool createQModelingObject) :
     _isDerived(false)
 {
-    if (createQObject)
-        _qObject = new QUmlAssociationObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlAssociationObject(this));
 }
 
 QUmlAssociation::~QUmlAssociation()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlAssociation::clone() const
+QModelingElement *QUmlAssociation::clone() const
 {
     QUmlAssociation *c = new QUmlAssociation;
     foreach (QUmlComment *element, ownedComments())
@@ -211,7 +209,7 @@ void QUmlAssociation::setDerived(bool isDerived)
 
     if (_isDerived != isDerived) {
         _isDerived = isDerived;
-        _modifiedResettableProperties << QStringLiteral("isDerived");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isDerived");
     }
 }
 
@@ -231,8 +229,8 @@ void QUmlAssociation::addMemberEnd(QUmlProperty *memberEnd)
 
     if (!_memberEnds.contains(memberEnd)) {
         _memberEnds.append(memberEnd);
-        if (memberEnd && memberEnd->asQObject() && this->asQObject())
-            QObject::connect(memberEnd->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeMemberEnd(QObject *)));
+        if (memberEnd && memberEnd->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(memberEnd->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeMemberEnd(QObject *)));
 
         // Adjust subsetted properties
         addMember(memberEnd);
@@ -277,8 +275,8 @@ void QUmlAssociation::addNavigableOwnedEnd(QUmlProperty *navigableOwnedEnd)
 
     if (!_navigableOwnedEnds.contains(navigableOwnedEnd)) {
         _navigableOwnedEnds.insert(navigableOwnedEnd);
-        if (navigableOwnedEnd && navigableOwnedEnd->asQObject() && this->asQObject())
-            QObject::connect(navigableOwnedEnd->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeNavigableOwnedEnd(QObject *)));
+        if (navigableOwnedEnd && navigableOwnedEnd->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(navigableOwnedEnd->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeNavigableOwnedEnd(QObject *)));
 
         // Adjust subsetted properties
         addOwnedEnd(navigableOwnedEnd);
@@ -313,9 +311,9 @@ void QUmlAssociation::addOwnedEnd(QUmlProperty *ownedEnd)
 
     if (!_ownedEnds.contains(ownedEnd)) {
         _ownedEnds.append(ownedEnd);
-        if (ownedEnd && ownedEnd->asQObject() && this->asQObject())
-            QObject::connect(ownedEnd->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeOwnedEnd(QObject *)));
-        ownedEnd->asQObject()->setParent(this->asQObject());
+        if (ownedEnd && ownedEnd->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(ownedEnd->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeOwnedEnd(QObject *)));
+        ownedEnd->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addMemberEnd(ownedEnd);
@@ -335,8 +333,8 @@ void QUmlAssociation::removeOwnedEnd(QUmlProperty *ownedEnd)
 
     if (_ownedEnds.contains(ownedEnd)) {
         _ownedEnds.removeAll(ownedEnd);
-        if (ownedEnd->asQObject())
-            ownedEnd->asQObject()->setParent(0);
+        if (ownedEnd->asQModelingObject())
+            ownedEnd->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeMemberEnd(ownedEnd);
@@ -350,101 +348,3 @@ void QUmlAssociation::removeOwnedEnd(QUmlProperty *ownedEnd)
     }
 }
 
-void QUmlAssociation::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generals"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlAssociation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("endTypes"))));
-    _groupProperties.insert(QStringLiteral("QUmlAssociation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isDerived"))));
-    _groupProperties.insert(QStringLiteral("QUmlAssociation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("memberEnds"))));
-    _groupProperties.insert(QStringLiteral("QUmlAssociation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("navigableOwnedEnds"))));
-    _groupProperties.insert(QStringLiteral("QUmlAssociation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedEnds"))));
-}
-
-void QUmlAssociation::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("endTypes")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("endTypes")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAssociation");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("endTypes")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("endTypes")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("endTypes")][QtModeling::DocumentationRole] = QStringLiteral("References the classifiers that are used as types of the ends of the association.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("endTypes")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("endTypes")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Relationship-relatedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("endTypes")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("isDerived")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("isDerived")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAssociation");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("isDerived")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("isDerived")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("isDerived")][QtModeling::DocumentationRole] = QStringLiteral("Specifies whether the association is derived from other model elements such as other associations or constraints.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("isDerived")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("isDerived")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("isDerived")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("memberEnds")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("memberEnds")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAssociation");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("memberEnds")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("memberEnds")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("memberEnds")][QtModeling::DocumentationRole] = QStringLiteral("Each end represents participation of instances of the classifier connected to the end in links of the association.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("memberEnds")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("memberEnds")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-member");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("memberEnds")][QtModeling::OppositeEndRole] = QStringLiteral("Property-association");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("navigableOwnedEnds")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("navigableOwnedEnds")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAssociation");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("navigableOwnedEnds")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("navigableOwnedEnds")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("navigableOwnedEnds")][QtModeling::DocumentationRole] = QStringLiteral("The navigable ends that are owned by the association itself.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("navigableOwnedEnds")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("navigableOwnedEnds")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Association-ownedEnd");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("navigableOwnedEnds")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("ownedEnds")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("ownedEnds")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAssociation");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("ownedEnds")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("ownedEnds")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("ownedEnds")][QtModeling::DocumentationRole] = QStringLiteral("The ends that are owned by the association itself.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("ownedEnds")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("ownedEnds")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Association-memberEnd Classifier-feature A_redefinitionContext_redefinableElement-redefinableElement Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("ownedEnds")][QtModeling::OppositeEndRole] = QStringLiteral("Property-owningAssociation");
-
-}
-
diff --git a/src/uml/qumlassociation.h b/src/uml/qumlassociation.h
index 7bad6d6d..4d5213f0 100644
--- a/src/uml/qumlassociation.h
+++ b/src/uml/qumlassociation.h
@@ -46,7 +46,6 @@
 #include <QtUml/QUmlClassifier>
 #include <QtUml/QUmlRelationship>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -59,10 +58,10 @@ class QUmlType;
 class Q_UML_EXPORT QUmlAssociation : public virtual QUmlClassifier, public QUmlRelationship
 {
 public:
-    explicit QUmlAssociation(bool createQObject = true);
+    explicit QUmlAssociation(bool createQModelingObject = true);
     virtual ~QUmlAssociation();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QList<QUmlType *> endTypes() const;
@@ -85,9 +84,6 @@ protected:
     QList<QUmlProperty *> _memberEnds;
     QSet<QUmlProperty *> _navigableOwnedEnds;
     QList<QUmlProperty *> _ownedEnds;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlassociationclass.cpp b/src/uml/qumlassociationclass.cpp
index 58702cdd..bcce6967 100644
--- a/src/uml/qumlassociationclass.cpp
+++ b/src/uml/qumlassociationclass.cpp
@@ -86,26 +86,24 @@
 
     \brief A model element that has both association and class properties. An AssociationClass can be seen as an association that also has class properties, or as a class that also has association properties. It not only connects a set of classifiers but also defines a set of features that belong to the relationship itself and not to any of the classifiers.
  */
-QUmlAssociationClass::QUmlAssociationClass(bool createQObject) :
+QUmlAssociationClass::QUmlAssociationClass(bool createQModelingObject) :
     QUmlClass(false),
     QUmlAssociation(false)
 {
-    if (createQObject)
-        _qObject = new QUmlAssociationClassObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlAssociationClassObject(this));
 }
 
 QUmlAssociationClass::~QUmlAssociationClass()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlAssociationClass::clone() const
+QModelingElement *QUmlAssociationClass::clone() const
 {
     QUmlAssociationClass *c = new QUmlAssociationClass;
     foreach (QUmlComment *element, ownedComments())
@@ -178,69 +176,3 @@ QModelingObject *QUmlAssociationClass::clone() const
     return c;
 }
 
-void QUmlAssociationClass::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedConnectors"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parts"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("roles"))));
-    _groupProperties.insert(QStringLiteral("QUmlEncapsulatedClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedPorts"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifierBehavior"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interfaceRealizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedBehaviors"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extensions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isActive"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedReceptions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superClasses"))));
-    _groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlAssociation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("endTypes"))));
-    _groupProperties.insert(QStringLiteral("QUmlAssociation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isDerived"))));
-    _groupProperties.insert(QStringLiteral("QUmlAssociation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("memberEnds"))));
-    _groupProperties.insert(QStringLiteral("QUmlAssociation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("navigableOwnedEnds"))));
-    _groupProperties.insert(QStringLiteral("QUmlAssociation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedEnds"))));
-}
-
-void QUmlAssociationClass::setPropertyData()
-{
-}
-
diff --git a/src/uml/qumlassociationclass.h b/src/uml/qumlassociationclass.h
index 61fabf25..60aba2c5 100644
--- a/src/uml/qumlassociationclass.h
+++ b/src/uml/qumlassociationclass.h
@@ -46,7 +46,6 @@
 #include <QtUml/QUmlClass>
 #include <QtUml/QUmlAssociation>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -56,16 +55,13 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlAssociationClass : public QUmlClass, public QUmlAssociation
 {
 public:
-    explicit QUmlAssociationClass(bool createQObject = true);
+    explicit QUmlAssociationClass(bool createQModelingObject = true);
     virtual ~QUmlAssociationClass();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
 
 protected:
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlbehavior.cpp b/src/uml/qumlbehavior.cpp
index a64fb140..22a15969 100644
--- a/src/uml/qumlbehavior.cpp
+++ b/src/uml/qumlbehavior.cpp
@@ -92,15 +92,13 @@ QUmlBehavior::QUmlBehavior() :
     _isReentrant(true),
     _specification(0)
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlBehavior::~QUmlBehavior()
 {
 }
 
-QModelingObject *QUmlBehavior::clone() const
+QModelingElement *QUmlBehavior::clone() const
 {
     QUmlBehavior *c = new QUmlBehavior;
     foreach (QUmlComment *element, ownedComments())
@@ -229,7 +227,7 @@ void QUmlBehavior::setReentrant(bool isReentrant)
 
     if (_isReentrant != isReentrant) {
         _isReentrant = isReentrant;
-        _modifiedResettableProperties << QStringLiteral("isReentrant");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isReentrant");
     }
 }
 
@@ -249,9 +247,9 @@ void QUmlBehavior::addOwnedParameter(QUmlParameter *ownedParameter)
 
     if (!_ownedParameters.contains(ownedParameter)) {
         _ownedParameters.append(ownedParameter);
-        if (ownedParameter && ownedParameter->asQObject() && this->asQObject())
-            QObject::connect(ownedParameter->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeOwnedParameter(QObject *)));
-        ownedParameter->asQObject()->setParent(this->asQObject());
+        if (ownedParameter && ownedParameter->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(ownedParameter->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeOwnedParameter(QObject *)));
+        ownedParameter->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedMember(ownedParameter);
@@ -264,8 +262,8 @@ void QUmlBehavior::removeOwnedParameter(QUmlParameter *ownedParameter)
 
     if (_ownedParameters.contains(ownedParameter)) {
         _ownedParameters.removeAll(ownedParameter);
-        if (ownedParameter->asQObject())
-            ownedParameter->asQObject()->setParent(0);
+        if (ownedParameter->asQModelingObject())
+            ownedParameter->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedMember(ownedParameter);
@@ -288,9 +286,9 @@ void QUmlBehavior::addOwnedParameterSet(QUmlParameterSet *ownedParameterSet)
 
     if (!_ownedParameterSets.contains(ownedParameterSet)) {
         _ownedParameterSets.insert(ownedParameterSet);
-        if (ownedParameterSet && ownedParameterSet->asQObject() && this->asQObject())
-            QObject::connect(ownedParameterSet->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeOwnedParameterSet(QObject *)));
-        ownedParameterSet->asQObject()->setParent(this->asQObject());
+        if (ownedParameterSet && ownedParameterSet->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(ownedParameterSet->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeOwnedParameterSet(QObject *)));
+        ownedParameterSet->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedMember(ownedParameterSet);
@@ -303,8 +301,8 @@ void QUmlBehavior::removeOwnedParameterSet(QUmlParameterSet *ownedParameterSet)
 
     if (_ownedParameterSets.contains(ownedParameterSet)) {
         _ownedParameterSets.remove(ownedParameterSet);
-        if (ownedParameterSet->asQObject())
-            ownedParameterSet->asQObject()->setParent(0);
+        if (ownedParameterSet->asQModelingObject())
+            ownedParameterSet->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedMember(ownedParameterSet);
@@ -327,9 +325,9 @@ void QUmlBehavior::addPostcondition(QUmlConstraint *postcondition)
 
     if (!_postconditions.contains(postcondition)) {
         _postconditions.insert(postcondition);
-        if (postcondition && postcondition->asQObject() && this->asQObject())
-            QObject::connect(postcondition->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removePostcondition(QObject *)));
-        postcondition->asQObject()->setParent(this->asQObject());
+        if (postcondition && postcondition->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(postcondition->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removePostcondition(QObject *)));
+        postcondition->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedRule(postcondition);
@@ -342,8 +340,8 @@ void QUmlBehavior::removePostcondition(QUmlConstraint *postcondition)
 
     if (_postconditions.contains(postcondition)) {
         _postconditions.remove(postcondition);
-        if (postcondition->asQObject())
-            postcondition->asQObject()->setParent(0);
+        if (postcondition->asQModelingObject())
+            postcondition->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedRule(postcondition);
@@ -366,9 +364,9 @@ void QUmlBehavior::addPrecondition(QUmlConstraint *precondition)
 
     if (!_preconditions.contains(precondition)) {
         _preconditions.insert(precondition);
-        if (precondition && precondition->asQObject() && this->asQObject())
-            QObject::connect(precondition->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removePrecondition(QObject *)));
-        precondition->asQObject()->setParent(this->asQObject());
+        if (precondition && precondition->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(precondition->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removePrecondition(QObject *)));
+        precondition->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedRule(precondition);
@@ -381,8 +379,8 @@ void QUmlBehavior::removePrecondition(QUmlConstraint *precondition)
 
     if (_preconditions.contains(precondition)) {
         _preconditions.remove(precondition);
-        if (precondition->asQObject())
-            precondition->asQObject()->setParent(0);
+        if (precondition->asQModelingObject())
+            precondition->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedRule(precondition);
@@ -405,8 +403,8 @@ void QUmlBehavior::addRedefinedBehavior(QUmlBehavior *redefinedBehavior)
 
     if (!_redefinedBehaviors.contains(redefinedBehavior)) {
         _redefinedBehaviors.insert(redefinedBehavior);
-        if (redefinedBehavior && redefinedBehavior->asQObject() && this->asQObject())
-            QObject::connect(redefinedBehavior->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeRedefinedBehavior(QObject *)));
+        if (redefinedBehavior && redefinedBehavior->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(redefinedBehavior->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeRedefinedBehavior(QObject *)));
 
         // Adjust subsetted properties
         addRedefinedClassifier(redefinedBehavior);
@@ -441,148 +439,8 @@ void QUmlBehavior::setSpecification(QUmlBehavioralFeature *specification)
 
     if (_specification != specification) {
         _specification = specification;
-        if (specification && specification->asQObject() && this->asQObject())
-            QObject::connect(specification->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setSpecification()));
+        if (specification && specification->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(specification->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setSpecification()));
     }
 }
 
-void QUmlBehavior::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedConnectors"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parts"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("roles"))));
-    _groupProperties.insert(QStringLiteral("QUmlEncapsulatedClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedPorts"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifierBehavior"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interfaceRealizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedBehaviors"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extensions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isActive"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedReceptions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superClasses"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameters"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameterSets"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("postconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("preconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedBehaviors"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("specification"))));
-}
-
-void QUmlBehavior::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("context")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("context")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavior");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("context")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("context")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("context")][QtModeling::DocumentationRole] = QStringLiteral("The classifier that is the context for the execution of the behavior. If the behavior is owned by a BehavioredClassifier, that classifier is the context. Otherwise, the context is the first BehavioredClassifier reached by following the chain of owner relationships. For example, following this algorithm, the context of an entry action in a state machine is the classifier that owns the state machine. The features of the context classifier as well as the elements visible to the context classifier are visible to the behavior.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("context")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("context")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("RedefinableElement-redefinitionContext");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("context")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("isReentrant")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("isReentrant")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavior");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("isReentrant")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("isReentrant")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("isReentrant")][QtModeling::DocumentationRole] = QStringLiteral("Tells whether the behavior can be invoked while it is still executing from a previous invocation.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("isReentrant")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("isReentrant")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("isReentrant")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("ownedParameters")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("ownedParameters")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavior");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("ownedParameters")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("ownedParameters")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("ownedParameters")][QtModeling::DocumentationRole] = QStringLiteral("References a list of parameters to the behavior which describes the order and type of arguments that can be given when the behavior is invoked and of the values which will be returned when the behavior completes its execution.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("ownedParameters")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("ownedParameters")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("ownedParameters")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("ownedParameterSets")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("ownedParameterSets")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavior");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("ownedParameterSets")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("ownedParameterSets")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("ownedParameterSets")][QtModeling::DocumentationRole] = QStringLiteral("The ParameterSets owned by this Behavior.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("ownedParameterSets")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("ownedParameterSets")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("ownedParameterSets")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("postconditions")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("postconditions")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavior");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("postconditions")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("postconditions")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("postconditions")][QtModeling::DocumentationRole] = QStringLiteral("An optional set of Constraints specifying what is fulfilled after the execution of the behavior is completed, if its precondition was fulfilled before its invocation.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("postconditions")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("postconditions")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedRule");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("postconditions")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("preconditions")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("preconditions")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavior");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("preconditions")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("preconditions")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("preconditions")][QtModeling::DocumentationRole] = QStringLiteral("An optional set of Constraints specifying what must be fulfilled when the behavior is invoked.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("preconditions")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("preconditions")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedRule");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("preconditions")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("redefinedBehaviors")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("redefinedBehaviors")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavior");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("redefinedBehaviors")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("redefinedBehaviors")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("redefinedBehaviors")][QtModeling::DocumentationRole] = QStringLiteral("References a behavior that this behavior redefines. A subtype of Behavior may redefine any other subtype of Behavior. If the behavior implements a behavioral feature, it replaces the redefined behavior. If the behavior is a classifier behavior, it extends the redefined behavior.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("redefinedBehaviors")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("redefinedBehaviors")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Classifier-redefinedClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("redefinedBehaviors")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("specification")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("specification")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavior");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("specification")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("specification")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("specification")][QtModeling::DocumentationRole] = QStringLiteral("Designates a behavioral feature that the behavior implements. The behavioral feature must be owned by the classifier that owns the behavior or be inherited by it. The parameters of the behavioral feature and the implementing behavior must match. A behavior does not need to have a specification, in which case it either is the classifer behavior of a BehavioredClassifier or it can only be invoked by another behavior of the classifier.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("specification")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("specification")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("specification")][QtModeling::OppositeEndRole] = QStringLiteral("BehavioralFeature-method");
-
-}
-
diff --git a/src/uml/qumlbehavior.h b/src/uml/qumlbehavior.h
index 503fe7a9..99812e8c 100644
--- a/src/uml/qumlbehavior.h
+++ b/src/uml/qumlbehavior.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlClass>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -63,7 +62,7 @@ class Q_UML_EXPORT QUmlBehavior : public QUmlClass
 public:
     virtual ~QUmlBehavior();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlBehavioredClassifier *context() const;
@@ -98,9 +97,6 @@ protected:
     QSet<QUmlConstraint *> _preconditions;
     QSet<QUmlBehavior *> _redefinedBehaviors;
     QUmlBehavioralFeature *_specification;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlbehavioralfeature.cpp b/src/uml/qumlbehavioralfeature.cpp
index 88ea1bc9..0bfc20a7 100644
--- a/src/uml/qumlbehavioralfeature.cpp
+++ b/src/uml/qumlbehavioralfeature.cpp
@@ -69,15 +69,13 @@ QUmlBehavioralFeature::QUmlBehavioralFeature() :
     _concurrency(QtUml::CallConcurrencyKindSequential),
     _isAbstract(false)
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlBehavioralFeature::~QUmlBehavioralFeature()
 {
 }
 
-QModelingObject *QUmlBehavioralFeature::clone() const
+QModelingElement *QUmlBehavioralFeature::clone() const
 {
     QUmlBehavioralFeature *c = new QUmlBehavioralFeature;
     foreach (QUmlComment *element, ownedComments())
@@ -127,7 +125,7 @@ void QUmlBehavioralFeature::setConcurrency(QtUml::CallConcurrencyKind concurrenc
 
     if (_concurrency != concurrency) {
         _concurrency = concurrency;
-        _modifiedResettableProperties << QStringLiteral("concurrency");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("concurrency");
     }
 }
 
@@ -147,7 +145,7 @@ void QUmlBehavioralFeature::setAbstract(bool isAbstract)
 
     if (_isAbstract != isAbstract) {
         _isAbstract = isAbstract;
-        _modifiedResettableProperties << QStringLiteral("isAbstract");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isAbstract");
     }
 }
 
@@ -167,8 +165,8 @@ void QUmlBehavioralFeature::addMethod(QUmlBehavior *method)
 
     if (!_methods.contains(method)) {
         _methods.insert(method);
-        if (method && method->asQObject() && this->asQObject())
-            QObject::connect(method->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeMethod(QObject *)));
+        if (method && method->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(method->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeMethod(QObject *)));
 
         // Adjust opposite properties
         if (method) {
@@ -207,9 +205,9 @@ void QUmlBehavioralFeature::addOwnedParameter(QUmlParameter *ownedParameter)
 
     if (!_ownedParameters.contains(ownedParameter)) {
         _ownedParameters.append(ownedParameter);
-        if (ownedParameter && ownedParameter->asQObject() && this->asQObject())
-            QObject::connect(ownedParameter->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeOwnedParameter(QObject *)));
-        ownedParameter->asQObject()->setParent(this->asQObject());
+        if (ownedParameter && ownedParameter->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(ownedParameter->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeOwnedParameter(QObject *)));
+        ownedParameter->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedMember(ownedParameter);
@@ -222,8 +220,8 @@ void QUmlBehavioralFeature::removeOwnedParameter(QUmlParameter *ownedParameter)
 
     if (_ownedParameters.contains(ownedParameter)) {
         _ownedParameters.removeAll(ownedParameter);
-        if (ownedParameter->asQObject())
-            ownedParameter->asQObject()->setParent(0);
+        if (ownedParameter->asQModelingObject())
+            ownedParameter->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedMember(ownedParameter);
@@ -246,9 +244,9 @@ void QUmlBehavioralFeature::addOwnedParameterSet(QUmlParameterSet *ownedParamete
 
     if (!_ownedParameterSets.contains(ownedParameterSet)) {
         _ownedParameterSets.insert(ownedParameterSet);
-        if (ownedParameterSet && ownedParameterSet->asQObject() && this->asQObject())
-            QObject::connect(ownedParameterSet->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeOwnedParameterSet(QObject *)));
-        ownedParameterSet->asQObject()->setParent(this->asQObject());
+        if (ownedParameterSet && ownedParameterSet->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(ownedParameterSet->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeOwnedParameterSet(QObject *)));
+        ownedParameterSet->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedMember(ownedParameterSet);
@@ -261,8 +259,8 @@ void QUmlBehavioralFeature::removeOwnedParameterSet(QUmlParameterSet *ownedParam
 
     if (_ownedParameterSets.contains(ownedParameterSet)) {
         _ownedParameterSets.remove(ownedParameterSet);
-        if (ownedParameterSet->asQObject())
-            ownedParameterSet->asQObject()->setParent(0);
+        if (ownedParameterSet->asQModelingObject())
+            ownedParameterSet->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedMember(ownedParameterSet);
@@ -285,8 +283,8 @@ void QUmlBehavioralFeature::addRaisedException(QUmlType *raisedException)
 
     if (!_raisedExceptions.contains(raisedException)) {
         _raisedExceptions.insert(raisedException);
-        if (raisedException && raisedException->asQObject() && this->asQObject())
-            QObject::connect(raisedException->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeRaisedException(QObject *)));
+        if (raisedException && raisedException->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(raisedException->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeRaisedException(QObject *)));
     }
 }
 
@@ -313,93 +311,3 @@ bool QUmlBehavioralFeature::isDistinguishableFrom(QUmlNamedElement *n, QUmlNames
     return bool ();
 }
 
-void QUmlBehavioralFeature::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("featuringClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isStatic"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioralFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("concurrency"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioralFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioralFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("methods"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioralFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameters"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioralFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameterSets"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioralFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("raisedExceptions"))));
-}
-
-void QUmlBehavioralFeature::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("concurrency")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("concurrency")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavioralFeature");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("concurrency")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("concurrency")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("concurrency")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the semantics of concurrent calls to the same passive instance (i.e., an instance originating from a class with isActive being false). Active instances control access to their own behavioral features.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("concurrency")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("concurrency")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("concurrency")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("isAbstract")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("isAbstract")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavioralFeature");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("isAbstract")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("isAbstract")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("isAbstract")][QtModeling::DocumentationRole] = QStringLiteral("If true, then the behavioral feature does not have an implementation, and one must be supplied by a more specific element. If false, the behavioral feature must have an implementation in the classifier or one must be inherited from a more general element.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("isAbstract")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("isAbstract")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("isAbstract")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("methods")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("methods")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavioralFeature");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("methods")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("methods")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("methods")][QtModeling::DocumentationRole] = QStringLiteral("A behavioral description that implements the behavioral feature. There may be at most one behavior for a particular pairing of a classifier (as owner of the behavior) and a behavioral feature (as specification of the behavior).");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("methods")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("methods")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("methods")][QtModeling::OppositeEndRole] = QStringLiteral("Behavior-specification");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("ownedParameters")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("ownedParameters")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavioralFeature");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("ownedParameters")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("ownedParameters")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("ownedParameters")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the ordered set of formal parameters of this BehavioralFeature.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("ownedParameters")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("ownedParameters")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("ownedParameters")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("ownedParameterSets")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("ownedParameterSets")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavioralFeature");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("ownedParameterSets")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("ownedParameterSets")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("ownedParameterSets")][QtModeling::DocumentationRole] = QStringLiteral("The ParameterSets owned by this BehavioralFeature.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("ownedParameterSets")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("ownedParameterSets")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("ownedParameterSets")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("raisedExceptions")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("raisedExceptions")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavioralFeature");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("raisedExceptions")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("raisedExceptions")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("raisedExceptions")][QtModeling::DocumentationRole] = QStringLiteral("References the Types representing exceptions that may be raised during an invocation of this feature.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("raisedExceptions")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("raisedExceptions")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("raisedExceptions")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlbehavioralfeature.h b/src/uml/qumlbehavioralfeature.h
index e8d81ddb..be48ad1b 100644
--- a/src/uml/qumlbehavioralfeature.h
+++ b/src/uml/qumlbehavioralfeature.h
@@ -48,7 +48,6 @@
 
 
 #include <QtUml/QtUmlNamespace>
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -66,7 +65,7 @@ class Q_UML_EXPORT QUmlBehavioralFeature : public QUmlNamespace, public QUmlFeat
 public:
     virtual ~QUmlBehavioralFeature();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     QtUml::CallConcurrencyKind concurrency() const;
@@ -98,9 +97,6 @@ protected:
     QList<QUmlParameter *> _ownedParameters;
     QSet<QUmlParameterSet *> _ownedParameterSets;
     QSet<QUmlType *> _raisedExceptions;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlbehavioredclassifier.cpp b/src/uml/qumlbehavioredclassifier.cpp
index efdac31d..83e4e052 100644
--- a/src/uml/qumlbehavioredclassifier.cpp
+++ b/src/uml/qumlbehavioredclassifier.cpp
@@ -80,15 +80,13 @@
 QUmlBehavioredClassifier::QUmlBehavioredClassifier() :
     _classifierBehavior(0)
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlBehavioredClassifier::~QUmlBehavioredClassifier()
 {
 }
 
-QModelingObject *QUmlBehavioredClassifier::clone() const
+QModelingElement *QUmlBehavioredClassifier::clone() const
 {
     QUmlBehavioredClassifier *c = new QUmlBehavioredClassifier;
     foreach (QUmlComment *element, ownedComments())
@@ -164,8 +162,8 @@ void QUmlBehavioredClassifier::setClassifierBehavior(QUmlBehavior *classifierBeh
         removeOwnedBehavior(_classifierBehavior);
 
         _classifierBehavior = classifierBehavior;
-        if (classifierBehavior && classifierBehavior->asQObject() && this->asQObject())
-            QObject::connect(classifierBehavior->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setClassifierBehavior()));
+        if (classifierBehavior && classifierBehavior->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(classifierBehavior->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setClassifierBehavior()));
 
         // Adjust subsetted properties
         if (classifierBehavior) {
@@ -190,9 +188,9 @@ void QUmlBehavioredClassifier::addInterfaceRealization(QUmlInterfaceRealization
 
     if (!_interfaceRealizations.contains(interfaceRealization)) {
         _interfaceRealizations.insert(interfaceRealization);
-        if (interfaceRealization && interfaceRealization->asQObject() && this->asQObject())
-            QObject::connect(interfaceRealization->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeInterfaceRealization(QObject *)));
-        interfaceRealization->asQObject()->setParent(this->asQObject());
+        if (interfaceRealization && interfaceRealization->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(interfaceRealization->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeInterfaceRealization(QObject *)));
+        interfaceRealization->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(interfaceRealization);
@@ -211,8 +209,8 @@ void QUmlBehavioredClassifier::removeInterfaceRealization(QUmlInterfaceRealizati
 
     if (_interfaceRealizations.contains(interfaceRealization)) {
         _interfaceRealizations.remove(interfaceRealization);
-        if (interfaceRealization->asQObject())
-            interfaceRealization->asQObject()->setParent(0);
+        if (interfaceRealization->asQModelingObject())
+            interfaceRealization->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(interfaceRealization);
@@ -241,9 +239,9 @@ void QUmlBehavioredClassifier::addOwnedBehavior(QUmlBehavior *ownedBehavior)
 
     if (!_ownedBehaviors.contains(ownedBehavior)) {
         _ownedBehaviors.insert(ownedBehavior);
-        if (ownedBehavior && ownedBehavior->asQObject() && this->asQObject())
-            QObject::connect(ownedBehavior->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeOwnedBehavior(QObject *)));
-        ownedBehavior->asQObject()->setParent(this->asQObject());
+        if (ownedBehavior && ownedBehavior->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(ownedBehavior->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeOwnedBehavior(QObject *)));
+        ownedBehavior->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedMember(ownedBehavior);
@@ -256,88 +254,11 @@ void QUmlBehavioredClassifier::removeOwnedBehavior(QUmlBehavior *ownedBehavior)
 
     if (_ownedBehaviors.contains(ownedBehavior)) {
         _ownedBehaviors.remove(ownedBehavior);
-        if (ownedBehavior->asQObject())
-            ownedBehavior->asQObject()->setParent(0);
+        if (ownedBehavior->asQModelingObject())
+            ownedBehavior->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedMember(ownedBehavior);
     }
 }
 
-void QUmlBehavioredClassifier::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generals"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifierBehavior"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interfaceRealizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedBehaviors"))));
-}
-
-void QUmlBehavioredClassifier::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioredClassifier")][QStringLiteral("classifierBehavior")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioredClassifier")][QStringLiteral("classifierBehavior")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavioredClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioredClassifier")][QStringLiteral("classifierBehavior")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioredClassifier")][QStringLiteral("classifierBehavior")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioredClassifier")][QStringLiteral("classifierBehavior")][QtModeling::DocumentationRole] = QStringLiteral("A behavior specification that specifies the behavior of the classifier itself.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioredClassifier")][QStringLiteral("classifierBehavior")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioredClassifier")][QStringLiteral("classifierBehavior")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("BehavioredClassifier-ownedBehavior");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioredClassifier")][QStringLiteral("classifierBehavior")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioredClassifier")][QStringLiteral("interfaceRealizations")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioredClassifier")][QStringLiteral("interfaceRealizations")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavioredClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioredClassifier")][QStringLiteral("interfaceRealizations")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioredClassifier")][QStringLiteral("interfaceRealizations")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioredClassifier")][QStringLiteral("interfaceRealizations")][QtModeling::DocumentationRole] = QStringLiteral("The set of InterfaceRealizations owned by the BehavioredClassifier. Interface realizations reference the Interfaces of which the BehavioredClassifier is an implementation.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioredClassifier")][QStringLiteral("interfaceRealizations")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioredClassifier")][QStringLiteral("interfaceRealizations")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement NamedElement-clientDependency");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioredClassifier")][QStringLiteral("interfaceRealizations")][QtModeling::OppositeEndRole] = QStringLiteral("InterfaceRealization-implementingClassifier");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioredClassifier")][QStringLiteral("ownedBehaviors")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioredClassifier")][QStringLiteral("ownedBehaviors")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavioredClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioredClassifier")][QStringLiteral("ownedBehaviors")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioredClassifier")][QStringLiteral("ownedBehaviors")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioredClassifier")][QStringLiteral("ownedBehaviors")][QtModeling::DocumentationRole] = QStringLiteral("References behavior specifications owned by a classifier.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioredClassifier")][QStringLiteral("ownedBehaviors")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioredClassifier")][QStringLiteral("ownedBehaviors")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioredClassifier")][QStringLiteral("ownedBehaviors")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlbehavioredclassifier.h b/src/uml/qumlbehavioredclassifier.h
index b658b05a..dd2bc0f3 100644
--- a/src/uml/qumlbehavioredclassifier.h
+++ b/src/uml/qumlbehavioredclassifier.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlClassifier>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -60,7 +59,7 @@ class Q_UML_EXPORT QUmlBehavioredClassifier : public virtual QUmlClassifier
 public:
     virtual ~QUmlBehavioredClassifier();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlBehavior *classifierBehavior() const;
@@ -78,9 +77,6 @@ protected:
     QUmlBehavior *_classifierBehavior;
     QSet<QUmlInterfaceRealization *> _interfaceRealizations;
     QSet<QUmlBehavior *> _ownedBehaviors;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlbehaviorexecutionspecification.cpp b/src/uml/qumlbehaviorexecutionspecification.cpp
index 1ad2d317..8c4186c4 100644
--- a/src/uml/qumlbehaviorexecutionspecification.cpp
+++ b/src/uml/qumlbehaviorexecutionspecification.cpp
@@ -63,25 +63,23 @@
 
     \brief A behavior execution specification is a kind of execution specification representing the execution of a behavior.
  */
-QUmlBehaviorExecutionSpecification::QUmlBehaviorExecutionSpecification(bool createQObject) :
+QUmlBehaviorExecutionSpecification::QUmlBehaviorExecutionSpecification(bool createQModelingObject) :
     _behavior(0)
 {
-    if (createQObject)
-        _qObject = new QUmlBehaviorExecutionSpecificationObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlBehaviorExecutionSpecificationObject(this));
 }
 
 QUmlBehaviorExecutionSpecification::~QUmlBehaviorExecutionSpecification()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlBehaviorExecutionSpecification::clone() const
+QModelingElement *QUmlBehaviorExecutionSpecification::clone() const
 {
     QUmlBehaviorExecutionSpecification *c = new QUmlBehaviorExecutionSpecification;
     foreach (QUmlComment *element, ownedComments())
@@ -127,43 +125,8 @@ void QUmlBehaviorExecutionSpecification::setBehavior(QUmlBehavior *behavior)
 
     if (_behavior != behavior) {
         _behavior = behavior;
-        if (behavior && behavior->asQObject() && this->asQObject())
-            QObject::connect(behavior->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setBehavior()));
+        if (behavior && behavior->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(behavior->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setBehavior()));
     }
 }
 
-void QUmlBehaviorExecutionSpecification::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("covered"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingInteraction"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingOperand"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalOrderings"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutionSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("finish"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutionSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("start"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehaviorExecutionSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("behavior"))));
-}
-
-void QUmlBehaviorExecutionSpecification::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehaviorExecutionSpecification")][QStringLiteral("behavior")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehaviorExecutionSpecification")][QStringLiteral("behavior")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehaviorExecutionSpecification");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehaviorExecutionSpecification")][QStringLiteral("behavior")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehaviorExecutionSpecification")][QStringLiteral("behavior")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehaviorExecutionSpecification")][QStringLiteral("behavior")][QtModeling::DocumentationRole] = QStringLiteral("Behavior whose execution is occurring.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehaviorExecutionSpecification")][QStringLiteral("behavior")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehaviorExecutionSpecification")][QStringLiteral("behavior")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehaviorExecutionSpecification")][QStringLiteral("behavior")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlbehaviorexecutionspecification.h b/src/uml/qumlbehaviorexecutionspecification.h
index cd309632..27515a65 100644
--- a/src/uml/qumlbehaviorexecutionspecification.h
+++ b/src/uml/qumlbehaviorexecutionspecification.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlExecutionSpecification>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlBehavior;
 class Q_UML_EXPORT QUmlBehaviorExecutionSpecification : public QUmlExecutionSpecification
 {
 public:
-    explicit QUmlBehaviorExecutionSpecification(bool createQObject = true);
+    explicit QUmlBehaviorExecutionSpecification(bool createQModelingObject = true);
     virtual ~QUmlBehaviorExecutionSpecification();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlBehavior *behavior() const;
@@ -68,9 +67,6 @@ public:
 
 protected:
     QUmlBehavior *_behavior;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlbroadcastsignalaction.cpp b/src/uml/qumlbroadcastsignalaction.cpp
index f221f4b8..13674ed2 100644
--- a/src/uml/qumlbroadcastsignalaction.cpp
+++ b/src/uml/qumlbroadcastsignalaction.cpp
@@ -72,25 +72,23 @@
 
     \brief A broadcast signal action is an action that transmits a signal instance to all the potential target objects in the system, which may cause the firing of a state machine transitions or the execution of associated activities of a target object. The argument values are available to the execution of associated behaviors. The requestor continues execution immediately after the signals are sent out. It does not wait for receipt. Any reply messages are ignored and are not transmitted to the requestor.
  */
-QUmlBroadcastSignalAction::QUmlBroadcastSignalAction(bool createQObject) :
+QUmlBroadcastSignalAction::QUmlBroadcastSignalAction(bool createQModelingObject) :
     _signal(0)
 {
-    if (createQObject)
-        _qObject = new QUmlBroadcastSignalActionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlBroadcastSignalActionObject(this));
 }
 
 QUmlBroadcastSignalAction::~QUmlBroadcastSignalAction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlBroadcastSignalAction::clone() const
+QModelingElement *QUmlBroadcastSignalAction::clone() const
 {
     QUmlBroadcastSignalAction *c = new QUmlBroadcastSignalAction;
     foreach (QUmlComment *element, ownedComments())
@@ -150,57 +148,8 @@ void QUmlBroadcastSignalAction::setSignal(QUmlSignal *signal)
 
     if (_signal != signal) {
         _signal = signal;
-        if (signal && signal->asQObject() && this->asQObject())
-            QObject::connect(signal->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setSignal()));
+        if (signal && signal->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(signal->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setSignal()));
     }
 }
 
-void QUmlBroadcastSignalAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlInvocationAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("arguments"))));
-    _groupProperties.insert(QStringLiteral("QUmlInvocationAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("onPort"))));
-    _groupProperties.insert(QStringLiteral("QUmlBroadcastSignalAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("signal"))));
-}
-
-void QUmlBroadcastSignalAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBroadcastSignalAction")][QStringLiteral("signal")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBroadcastSignalAction")][QStringLiteral("signal")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBroadcastSignalAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBroadcastSignalAction")][QStringLiteral("signal")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBroadcastSignalAction")][QStringLiteral("signal")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBroadcastSignalAction")][QStringLiteral("signal")][QtModeling::DocumentationRole] = QStringLiteral("The specification of signal object transmitted to the target objects.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBroadcastSignalAction")][QStringLiteral("signal")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBroadcastSignalAction")][QStringLiteral("signal")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlBroadcastSignalAction")][QStringLiteral("signal")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlbroadcastsignalaction.h b/src/uml/qumlbroadcastsignalaction.h
index ff600a36..99e399ed 100644
--- a/src/uml/qumlbroadcastsignalaction.h
+++ b/src/uml/qumlbroadcastsignalaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlInvocationAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlSignal;
 class Q_UML_EXPORT QUmlBroadcastSignalAction : public QUmlInvocationAction
 {
 public:
-    explicit QUmlBroadcastSignalAction(bool createQObject = true);
+    explicit QUmlBroadcastSignalAction(bool createQModelingObject = true);
     virtual ~QUmlBroadcastSignalAction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlSignal *signal() const;
@@ -68,9 +67,6 @@ public:
 
 protected:
     QUmlSignal *_signal;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlcallaction.cpp b/src/uml/qumlcallaction.cpp
index a232bb1f..869c2ee9 100644
--- a/src/uml/qumlcallaction.cpp
+++ b/src/uml/qumlcallaction.cpp
@@ -72,15 +72,13 @@
 QUmlCallAction::QUmlCallAction() :
     _isSynchronous(true)
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlCallAction::~QUmlCallAction()
 {
 }
 
-QModelingObject *QUmlCallAction::clone() const
+QModelingElement *QUmlCallAction::clone() const
 {
     QUmlCallAction *c = new QUmlCallAction;
     foreach (QUmlComment *element, ownedComments())
@@ -141,7 +139,7 @@ void QUmlCallAction::setSynchronous(bool isSynchronous)
 
     if (_isSynchronous != isSynchronous) {
         _isSynchronous = isSynchronous;
-        _modifiedResettableProperties << QStringLiteral("isSynchronous");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isSynchronous");
     }
 }
 
@@ -161,9 +159,9 @@ void QUmlCallAction::addResult(QUmlOutputPin *result)
 
     if (!_results.contains(result)) {
         _results.append(result);
-        if (result && result->asQObject() && this->asQObject())
-            QObject::connect(result->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeResult(QObject *)));
-        result->asQObject()->setParent(this->asQObject());
+        if (result && result->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(result->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeResult(QObject *)));
+        result->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOutput(result);
@@ -176,70 +174,11 @@ void QUmlCallAction::removeResult(QUmlOutputPin *result)
 
     if (_results.contains(result)) {
         _results.removeAll(result);
-        if (result->asQObject())
-            result->asQObject()->setParent(0);
+        if (result->asQModelingObject())
+            result->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOutput(result);
     }
 }
 
-void QUmlCallAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlInvocationAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("arguments"))));
-    _groupProperties.insert(QStringLiteral("QUmlInvocationAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("onPort"))));
-    _groupProperties.insert(QStringLiteral("QUmlCallAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isSynchronous"))));
-    _groupProperties.insert(QStringLiteral("QUmlCallAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("results"))));
-}
-
-void QUmlCallAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallAction")][QStringLiteral("isSynchronous")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallAction")][QStringLiteral("isSynchronous")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlCallAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallAction")][QStringLiteral("isSynchronous")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallAction")][QStringLiteral("isSynchronous")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallAction")][QStringLiteral("isSynchronous")][QtModeling::DocumentationRole] = QStringLiteral("If true, the call is synchronous and the caller waits for completion of the invoked behavior. If false, the call is asynchronous and the caller proceeds immediately and does not expect a return values.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallAction")][QStringLiteral("isSynchronous")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallAction")][QStringLiteral("isSynchronous")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallAction")][QStringLiteral("isSynchronous")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallAction")][QStringLiteral("results")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallAction")][QStringLiteral("results")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlCallAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallAction")][QStringLiteral("results")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallAction")][QStringLiteral("results")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallAction")][QStringLiteral("results")][QtModeling::DocumentationRole] = QStringLiteral("A list of output pins where the results of performing the invocation are placed.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallAction")][QStringLiteral("results")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallAction")][QStringLiteral("results")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallAction")][QStringLiteral("results")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlcallaction.h b/src/uml/qumlcallaction.h
index 9bd7554f..0b781610 100644
--- a/src/uml/qumlcallaction.h
+++ b/src/uml/qumlcallaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlInvocationAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -59,7 +58,7 @@ class Q_UML_EXPORT QUmlCallAction : public QUmlInvocationAction
 public:
     virtual ~QUmlCallAction();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     bool isSynchronous() const;
@@ -73,9 +72,6 @@ protected:
 
     bool _isSynchronous;
     QList<QUmlOutputPin *> _results;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlcallbehavioraction.cpp b/src/uml/qumlcallbehavioraction.cpp
index e9ceb14b..8fc491ea 100644
--- a/src/uml/qumlcallbehavioraction.cpp
+++ b/src/uml/qumlcallbehavioraction.cpp
@@ -72,25 +72,23 @@
 
     \brief A call behavior action is a call action that invokes a behavior directly rather than invoking a behavioral feature that, in turn, results in the invocation of that behavior. The argument values of the action are available to the execution of the invoked behavior. For synchronous calls the execution of the call behavior action waits until the execution of the invoked behavior completes and a result is returned on its output pin. The action completes immediately without a result, if the call is asynchronous. In particular, the invoked behavior may be an activity.
  */
-QUmlCallBehaviorAction::QUmlCallBehaviorAction(bool createQObject) :
+QUmlCallBehaviorAction::QUmlCallBehaviorAction(bool createQModelingObject) :
     _behavior(0)
 {
-    if (createQObject)
-        _qObject = new QUmlCallBehaviorActionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlCallBehaviorActionObject(this));
 }
 
 QUmlCallBehaviorAction::~QUmlCallBehaviorAction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlCallBehaviorAction::clone() const
+QModelingElement *QUmlCallBehaviorAction::clone() const
 {
     QUmlCallBehaviorAction *c = new QUmlCallBehaviorAction;
     foreach (QUmlComment *element, ownedComments())
@@ -153,59 +151,8 @@ void QUmlCallBehaviorAction::setBehavior(QUmlBehavior *behavior)
 
     if (_behavior != behavior) {
         _behavior = behavior;
-        if (behavior && behavior->asQObject() && this->asQObject())
-            QObject::connect(behavior->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setBehavior()));
+        if (behavior && behavior->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(behavior->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setBehavior()));
     }
 }
 
-void QUmlCallBehaviorAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlInvocationAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("arguments"))));
-    _groupProperties.insert(QStringLiteral("QUmlInvocationAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("onPort"))));
-    _groupProperties.insert(QStringLiteral("QUmlCallAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isSynchronous"))));
-    _groupProperties.insert(QStringLiteral("QUmlCallAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("results"))));
-    _groupProperties.insert(QStringLiteral("QUmlCallBehaviorAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("behavior"))));
-}
-
-void QUmlCallBehaviorAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallBehaviorAction")][QStringLiteral("behavior")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallBehaviorAction")][QStringLiteral("behavior")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlCallBehaviorAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallBehaviorAction")][QStringLiteral("behavior")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallBehaviorAction")][QStringLiteral("behavior")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallBehaviorAction")][QStringLiteral("behavior")][QtModeling::DocumentationRole] = QStringLiteral("The invoked behavior. It must be capable of accepting and returning control.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallBehaviorAction")][QStringLiteral("behavior")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallBehaviorAction")][QStringLiteral("behavior")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallBehaviorAction")][QStringLiteral("behavior")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlcallbehavioraction.h b/src/uml/qumlcallbehavioraction.h
index 74e97cf6..c6e38e7d 100644
--- a/src/uml/qumlcallbehavioraction.h
+++ b/src/uml/qumlcallbehavioraction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlCallAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlBehavior;
 class Q_UML_EXPORT QUmlCallBehaviorAction : public QUmlCallAction
 {
 public:
-    explicit QUmlCallBehaviorAction(bool createQObject = true);
+    explicit QUmlCallBehaviorAction(bool createQModelingObject = true);
     virtual ~QUmlCallBehaviorAction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlBehavior *behavior() const;
@@ -68,9 +67,6 @@ public:
 
 protected:
     QUmlBehavior *_behavior;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlcallevent.cpp b/src/uml/qumlcallevent.cpp
index 673f8686..a50fce03 100644
--- a/src/uml/qumlcallevent.cpp
+++ b/src/uml/qumlcallevent.cpp
@@ -60,25 +60,23 @@
 
     \brief A call event models the receipt by an object of a message invoking a call of an operation.
  */
-QUmlCallEvent::QUmlCallEvent(bool createQObject) :
+QUmlCallEvent::QUmlCallEvent(bool createQModelingObject) :
     _operation(0)
 {
-    if (createQObject)
-        _qObject = new QUmlCallEventObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlCallEventObject(this));
 }
 
 QUmlCallEvent::~QUmlCallEvent()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlCallEvent::clone() const
+QModelingElement *QUmlCallEvent::clone() const
 {
     QUmlCallEvent *c = new QUmlCallEvent;
     foreach (QUmlComment *element, ownedComments())
@@ -116,39 +114,8 @@ void QUmlCallEvent::setOperation(QUmlOperation *operation)
 
     if (_operation != operation) {
         _operation = operation;
-        if (operation && operation->asQObject() && this->asQObject())
-            QObject::connect(operation->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setOperation()));
+        if (operation && operation->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(operation->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setOperation()));
     }
 }
 
-void QUmlCallEvent::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlCallEvent"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("operation"))));
-}
-
-void QUmlCallEvent::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallEvent")][QStringLiteral("operation")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallEvent")][QStringLiteral("operation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlCallEvent");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallEvent")][QStringLiteral("operation")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallEvent")][QStringLiteral("operation")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallEvent")][QStringLiteral("operation")][QtModeling::DocumentationRole] = QStringLiteral("Designates the operation whose invocation raised the call event.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallEvent")][QStringLiteral("operation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallEvent")][QStringLiteral("operation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallEvent")][QStringLiteral("operation")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlcallevent.h b/src/uml/qumlcallevent.h
index d05a54c1..ec53da9a 100644
--- a/src/uml/qumlcallevent.h
+++ b/src/uml/qumlcallevent.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlMessageEvent>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlOperation;
 class Q_UML_EXPORT QUmlCallEvent : public QUmlMessageEvent
 {
 public:
-    explicit QUmlCallEvent(bool createQObject = true);
+    explicit QUmlCallEvent(bool createQModelingObject = true);
     virtual ~QUmlCallEvent();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlOperation *operation() const;
@@ -68,9 +67,6 @@ public:
 
 protected:
     QUmlOperation *_operation;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlcalloperationaction.cpp b/src/uml/qumlcalloperationaction.cpp
index 775882b4..e7891e07 100644
--- a/src/uml/qumlcalloperationaction.cpp
+++ b/src/uml/qumlcalloperationaction.cpp
@@ -72,26 +72,24 @@
 
     \brief A call operation action is an action that transmits an operation call request to the target object, where it may cause the invocation of associated behavior. The argument values of the action are available to the execution of the invoked behavior. If the action is marked synchronous, the execution of the call operation action waits until the execution of the invoked behavior completes and a reply transmission is returned to the caller; otherwise execution of the action is complete when the invocation of the operation is established and the execution of the invoked operation proceeds concurrently with the execution of the calling behavior. Any values returned as part of the reply transmission are put on the result output pins of the call operation action. Upon receipt of the reply transmission, execution of the call operation action is complete.
  */
-QUmlCallOperationAction::QUmlCallOperationAction(bool createQObject) :
+QUmlCallOperationAction::QUmlCallOperationAction(bool createQModelingObject) :
     _operation(0),
     _target(0)
 {
-    if (createQObject)
-        _qObject = new QUmlCallOperationActionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlCallOperationActionObject(this));
 }
 
 QUmlCallOperationAction::~QUmlCallOperationAction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlCallOperationAction::clone() const
+QModelingElement *QUmlCallOperationAction::clone() const
 {
     QUmlCallOperationAction *c = new QUmlCallOperationAction;
     foreach (QUmlComment *element, ownedComments())
@@ -156,8 +154,8 @@ void QUmlCallOperationAction::setOperation(QUmlOperation *operation)
 
     if (_operation != operation) {
         _operation = operation;
-        if (operation && operation->asQObject() && this->asQObject())
-            QObject::connect(operation->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setOperation()));
+        if (operation && operation->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(operation->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setOperation()));
     }
 }
 
@@ -180,9 +178,9 @@ void QUmlCallOperationAction::setTarget(QUmlInputPin *target)
         removeInput(_target);
 
         _target = target;
-        if (target && target->asQObject() && this->asQObject())
-            QObject::connect(target->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setTarget()));
-        target->asQObject()->setParent(this->asQObject());
+        if (target && target->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(target->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setTarget()));
+        target->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (target) {
@@ -191,64 +189,3 @@ void QUmlCallOperationAction::setTarget(QUmlInputPin *target)
     }
 }
 
-void QUmlCallOperationAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlInvocationAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("arguments"))));
-    _groupProperties.insert(QStringLiteral("QUmlInvocationAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("onPort"))));
-    _groupProperties.insert(QStringLiteral("QUmlCallAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isSynchronous"))));
-    _groupProperties.insert(QStringLiteral("QUmlCallAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("results"))));
-    _groupProperties.insert(QStringLiteral("QUmlCallOperationAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("operation"))));
-    _groupProperties.insert(QStringLiteral("QUmlCallOperationAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("target"))));
-}
-
-void QUmlCallOperationAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallOperationAction")][QStringLiteral("operation")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallOperationAction")][QStringLiteral("operation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlCallOperationAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallOperationAction")][QStringLiteral("operation")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallOperationAction")][QStringLiteral("operation")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallOperationAction")][QStringLiteral("operation")][QtModeling::DocumentationRole] = QStringLiteral("The operation to be invoked by the action execution.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallOperationAction")][QStringLiteral("operation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallOperationAction")][QStringLiteral("operation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallOperationAction")][QStringLiteral("operation")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallOperationAction")][QStringLiteral("target")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallOperationAction")][QStringLiteral("target")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlCallOperationAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallOperationAction")][QStringLiteral("target")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallOperationAction")][QStringLiteral("target")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallOperationAction")][QStringLiteral("target")][QtModeling::DocumentationRole] = QStringLiteral("The target object to which the request is sent. The classifier of the target object is used to dynamically determine a behavior to invoke. This object constitutes the context of the execution of the operation.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallOperationAction")][QStringLiteral("target")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallOperationAction")][QStringLiteral("target")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallOperationAction")][QStringLiteral("target")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlcalloperationaction.h b/src/uml/qumlcalloperationaction.h
index a841d298..045b90e4 100644
--- a/src/uml/qumlcalloperationaction.h
+++ b/src/uml/qumlcalloperationaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlCallAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlOperation;
 class Q_UML_EXPORT QUmlCallOperationAction : public QUmlCallAction
 {
 public:
-    explicit QUmlCallOperationAction(bool createQObject = true);
+    explicit QUmlCallOperationAction(bool createQModelingObject = true);
     virtual ~QUmlCallOperationAction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlOperation *operation() const;
@@ -72,9 +71,6 @@ public:
 protected:
     QUmlOperation *_operation;
     QUmlInputPin *_target;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlcentralbuffernode.cpp b/src/uml/qumlcentralbuffernode.cpp
index a1c4e369..ef5fc6ee 100644
--- a/src/uml/qumlcentralbuffernode.cpp
+++ b/src/uml/qumlcentralbuffernode.cpp
@@ -70,24 +70,22 @@
 
     \brief A central buffer node is an object node for managing flows from multiple sources and destinations.
  */
-QUmlCentralBufferNode::QUmlCentralBufferNode(bool createQObject)
+QUmlCentralBufferNode::QUmlCentralBufferNode(bool createQModelingObject)
 {
-    if (createQObject)
-        _qObject = new QUmlCentralBufferNodeObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlCentralBufferNodeObject(this));
 }
 
 QUmlCentralBufferNode::~QUmlCentralBufferNode()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlCentralBufferNode::clone() const
+QModelingElement *QUmlCentralBufferNode::clone() const
 {
     QUmlCentralBufferNode *c = new QUmlCentralBufferNode;
     foreach (QUmlComment *element, ownedComments())
@@ -126,39 +124,3 @@ QModelingObject *QUmlCentralBufferNode::clone() const
     return c;
 }
 
-void QUmlCentralBufferNode::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStates"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isControlType"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ordering"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("selection"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperBound"))));
-}
-
-void QUmlCentralBufferNode::setPropertyData()
-{
-}
-
diff --git a/src/uml/qumlcentralbuffernode.h b/src/uml/qumlcentralbuffernode.h
index 291700fa..efe743fe 100644
--- a/src/uml/qumlcentralbuffernode.h
+++ b/src/uml/qumlcentralbuffernode.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlObjectNode>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,16 +54,13 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlCentralBufferNode : public QUmlObjectNode
 {
 public:
-    explicit QUmlCentralBufferNode(bool createQObject = true);
+    explicit QUmlCentralBufferNode(bool createQModelingObject = true);
     virtual ~QUmlCentralBufferNode();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
 
 protected:
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlchangeevent.cpp b/src/uml/qumlchangeevent.cpp
index 1b874649..1b73a74d 100644
--- a/src/uml/qumlchangeevent.cpp
+++ b/src/uml/qumlchangeevent.cpp
@@ -60,25 +60,23 @@
 
     \brief A change event models a change in the system configuration that makes a condition true.
  */
-QUmlChangeEvent::QUmlChangeEvent(bool createQObject) :
+QUmlChangeEvent::QUmlChangeEvent(bool createQModelingObject) :
     _changeExpression(0)
 {
-    if (createQObject)
-        _qObject = new QUmlChangeEventObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlChangeEventObject(this));
 }
 
 QUmlChangeEvent::~QUmlChangeEvent()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlChangeEvent::clone() const
+QModelingElement *QUmlChangeEvent::clone() const
 {
     QUmlChangeEvent *c = new QUmlChangeEvent;
     foreach (QUmlComment *element, ownedComments())
@@ -119,9 +117,9 @@ void QUmlChangeEvent::setChangeExpression(QUmlValueSpecification *changeExpressi
         removeOwnedElement(_changeExpression);
 
         _changeExpression = changeExpression;
-        if (changeExpression && changeExpression->asQObject() && this->asQObject())
-            QObject::connect(changeExpression->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setChangeExpression()));
-        changeExpression->asQObject()->setParent(this->asQObject());
+        if (changeExpression && changeExpression->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(changeExpression->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setChangeExpression()));
+        changeExpression->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (changeExpression) {
@@ -130,34 +128,3 @@ void QUmlChangeEvent::setChangeExpression(QUmlValueSpecification *changeExpressi
     }
 }
 
-void QUmlChangeEvent::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlChangeEvent"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("changeExpression"))));
-}
-
-void QUmlChangeEvent::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlChangeEvent")][QStringLiteral("changeExpression")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlChangeEvent")][QStringLiteral("changeExpression")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlChangeEvent");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlChangeEvent")][QStringLiteral("changeExpression")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlChangeEvent")][QStringLiteral("changeExpression")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlChangeEvent")][QStringLiteral("changeExpression")][QtModeling::DocumentationRole] = QStringLiteral("A Boolean-valued expression that will result in a change event whenever its value changes from false to true.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlChangeEvent")][QStringLiteral("changeExpression")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlChangeEvent")][QStringLiteral("changeExpression")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlChangeEvent")][QStringLiteral("changeExpression")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlchangeevent.h b/src/uml/qumlchangeevent.h
index 584de9ef..60708cf3 100644
--- a/src/uml/qumlchangeevent.h
+++ b/src/uml/qumlchangeevent.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlEvent>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlValueSpecification;
 class Q_UML_EXPORT QUmlChangeEvent : public QUmlEvent
 {
 public:
-    explicit QUmlChangeEvent(bool createQObject = true);
+    explicit QUmlChangeEvent(bool createQModelingObject = true);
     virtual ~QUmlChangeEvent();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlValueSpecification *changeExpression() const;
@@ -68,9 +67,6 @@ public:
 
 protected:
     QUmlValueSpecification *_changeExpression;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlclass.cpp b/src/uml/qumlclass.cpp
index 2f6aa16e..5a55be6d 100644
--- a/src/uml/qumlclass.cpp
+++ b/src/uml/qumlclass.cpp
@@ -85,26 +85,24 @@
 
     \brief A class may be designated as active (i.e., each of its instances having its own thread of control) or passive (i.e., each of its instances executing within the context of some other object). A class may also specify which signals the instances of this class handle.A class describes a set of objects that share the same specifications of features, constraints, and semantics.A class has the capability to have an internal structure and ports.Class has derived association that indicates how it may be extended through one or more stereotypes. Stereotype is the only kind of metaclass that cannot be extended by stereotypes.
  */
-QUmlClass::QUmlClass(bool createQObject) :
+QUmlClass::QUmlClass(bool createQModelingObject) :
     _isAbstract(false),
     _isActive(false)
 {
-    if (createQObject)
-        _qObject = new QUmlClassObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlClassObject(this));
 }
 
 QUmlClass::~QUmlClass()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlClass::clone() const
+QModelingElement *QUmlClass::clone() const
 {
     QUmlClass *c = new QUmlClass;
     foreach (QUmlComment *element, ownedComments())
@@ -234,7 +232,7 @@ void QUmlClass::setAbstract(bool isAbstract)
 
     if (_isAbstract != isAbstract) {
         _isAbstract = isAbstract;
-        _modifiedResettableProperties << QStringLiteral("isAbstract");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isAbstract");
     }
 }
 
@@ -254,7 +252,7 @@ void QUmlClass::setActive(bool isActive)
 
     if (_isActive != isActive) {
         _isActive = isActive;
-        _modifiedResettableProperties << QStringLiteral("isActive");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isActive");
     }
 }
 
@@ -274,9 +272,9 @@ void QUmlClass::addNestedClassifier(QUmlClassifier *nestedClassifier)
 
     if (!_nestedClassifiers.contains(nestedClassifier)) {
         _nestedClassifiers.append(nestedClassifier);
-        if (nestedClassifier && nestedClassifier->asQObject() && this->asQObject())
-            QObject::connect(nestedClassifier->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeNestedClassifier(QObject *)));
-        nestedClassifier->asQObject()->setParent(this->asQObject());
+        if (nestedClassifier && nestedClassifier->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(nestedClassifier->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeNestedClassifier(QObject *)));
+        nestedClassifier->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedMember(nestedClassifier);
@@ -289,8 +287,8 @@ void QUmlClass::removeNestedClassifier(QUmlClassifier *nestedClassifier)
 
     if (_nestedClassifiers.contains(nestedClassifier)) {
         _nestedClassifiers.removeAll(nestedClassifier);
-        if (nestedClassifier->asQObject())
-            nestedClassifier->asQObject()->setParent(0);
+        if (nestedClassifier->asQModelingObject())
+            nestedClassifier->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedMember(nestedClassifier);
@@ -313,9 +311,9 @@ void QUmlClass::addOwnedAttribute(QUmlProperty *ownedAttribute)
 
     if (!_ownedAttributes.contains(ownedAttribute)) {
         _ownedAttributes.append(ownedAttribute);
-        if (ownedAttribute && ownedAttribute->asQObject() && this->asQObject())
-            QObject::connect(ownedAttribute->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeOwnedAttribute(QObject *)));
-        ownedAttribute->asQObject()->setParent(this->asQObject());
+        if (ownedAttribute && ownedAttribute->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(ownedAttribute->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeOwnedAttribute(QObject *)));
+        ownedAttribute->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedMember(ownedAttribute);
@@ -334,8 +332,8 @@ void QUmlClass::removeOwnedAttribute(QUmlProperty *ownedAttribute)
 
     if (_ownedAttributes.contains(ownedAttribute)) {
         _ownedAttributes.removeAll(ownedAttribute);
-        if (ownedAttribute->asQObject())
-            ownedAttribute->asQObject()->setParent(0);
+        if (ownedAttribute->asQModelingObject())
+            ownedAttribute->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedMember(ownedAttribute);
@@ -364,9 +362,9 @@ void QUmlClass::addOwnedOperation(QUmlOperation *ownedOperation)
 
     if (!_ownedOperations.contains(ownedOperation)) {
         _ownedOperations.append(ownedOperation);
-        if (ownedOperation && ownedOperation->asQObject() && this->asQObject())
-            QObject::connect(ownedOperation->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeOwnedOperation(QObject *)));
-        ownedOperation->asQObject()->setParent(this->asQObject());
+        if (ownedOperation && ownedOperation->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(ownedOperation->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeOwnedOperation(QObject *)));
+        ownedOperation->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addFeature(ownedOperation);
@@ -385,8 +383,8 @@ void QUmlClass::removeOwnedOperation(QUmlOperation *ownedOperation)
 
     if (_ownedOperations.contains(ownedOperation)) {
         _ownedOperations.removeAll(ownedOperation);
-        if (ownedOperation->asQObject())
-            ownedOperation->asQObject()->setParent(0);
+        if (ownedOperation->asQModelingObject())
+            ownedOperation->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeFeature(ownedOperation);
@@ -415,9 +413,9 @@ void QUmlClass::addOwnedReception(QUmlReception *ownedReception)
 
     if (!_ownedReceptions.contains(ownedReception)) {
         _ownedReceptions.insert(ownedReception);
-        if (ownedReception && ownedReception->asQObject() && this->asQObject())
-            QObject::connect(ownedReception->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeOwnedReception(QObject *)));
-        ownedReception->asQObject()->setParent(this->asQObject());
+        if (ownedReception && ownedReception->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(ownedReception->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeOwnedReception(QObject *)));
+        ownedReception->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addFeature(ownedReception);
@@ -431,8 +429,8 @@ void QUmlClass::removeOwnedReception(QUmlReception *ownedReception)
 
     if (_ownedReceptions.contains(ownedReception)) {
         _ownedReceptions.remove(ownedReception);
-        if (ownedReception->asQObject())
-            ownedReception->asQObject()->setParent(0);
+        if (ownedReception->asQModelingObject())
+            ownedReception->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeFeature(ownedReception);
@@ -489,135 +487,3 @@ QSet<QUmlNamedElement *> QUmlClass::inherit(QSet<QUmlNamedElement *> inhs) const
     return QSet<QUmlNamedElement *> ();
 }
 
-void QUmlClass::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedConnectors"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parts"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("roles"))));
-    _groupProperties.insert(QStringLiteral("QUmlEncapsulatedClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedPorts"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifierBehavior"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interfaceRealizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedBehaviors"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extensions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isActive"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedReceptions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superClasses"))));
-}
-
-void QUmlClass::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("extensions")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("extensions")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClass");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("extensions")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("extensions")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("extensions")][QtModeling::DocumentationRole] = QStringLiteral("References the Extensions that specify additional properties of the metaclass. The property is derived from the extensions whose memberEnds are typed by the Class.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("extensions")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("extensions")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("extensions")][QtModeling::OppositeEndRole] = QStringLiteral("Extension-metaclass");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("isAbstract")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("isAbstract")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClass");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("isAbstract")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("isAbstract")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("isAbstract")][QtModeling::DocumentationRole] = QStringLiteral("If true, the Classifier does not provide a complete declaration and can typically not be instantiated. An abstract classifier is intended to be used by other classifiers e.g. as the target of general metarelationships or generalization relationships.True when a class is abstract.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("isAbstract")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("Classifier-isAbstract");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("isAbstract")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("isAbstract")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("isActive")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("isActive")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClass");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("isActive")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("isActive")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("isActive")][QtModeling::DocumentationRole] = QStringLiteral("Determines whether an object specified by this class is active or not. If true, then the owning class is referred to as an active class. If false, then such a class is referred to as a passive class.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("isActive")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("isActive")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("isActive")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("nestedClassifiers")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("nestedClassifiers")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClass");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("nestedClassifiers")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("nestedClassifiers")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("nestedClassifiers")][QtModeling::DocumentationRole] = QStringLiteral("References all the Classifiers that are defined (nested) within the Class.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("nestedClassifiers")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("nestedClassifiers")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_redefinitionContext_redefinableElement-redefinableElement Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("nestedClassifiers")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedAttributes")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedAttributes")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClass");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedAttributes")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedAttributes")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedAttributes")][QtModeling::DocumentationRole] = QStringLiteral("The attributes (i.e. the properties) owned by the class.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedAttributes")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("StructuredClassifier-ownedAttribute");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedAttributes")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember Classifier-attribute");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedAttributes")][QtModeling::OppositeEndRole] = QStringLiteral("Property-class");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedOperations")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedOperations")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClass");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedOperations")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedOperations")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedOperations")][QtModeling::DocumentationRole] = QStringLiteral("The operations owned by the class.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedOperations")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedOperations")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Classifier-feature A_redefinitionContext_redefinableElement-redefinableElement Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedOperations")][QtModeling::OppositeEndRole] = QStringLiteral("Operation-class");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedReceptions")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedReceptions")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClass");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedReceptions")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedReceptions")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedReceptions")][QtModeling::DocumentationRole] = QStringLiteral("Receptions that objects of this class are willing to accept.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedReceptions")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedReceptions")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Classifier-feature Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedReceptions")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("superClasses")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("superClasses")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClass");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("superClasses")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("superClasses")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("superClasses")][QtModeling::DocumentationRole] = QStringLiteral("This gives the superclasses of a class.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("superClasses")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("Classifier-general");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("superClasses")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("superClasses")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlclass.h b/src/uml/qumlclass.h
index 6c536248..e2c71bea 100644
--- a/src/uml/qumlclass.h
+++ b/src/uml/qumlclass.h
@@ -46,7 +46,6 @@
 #include <QtUml/QUmlEncapsulatedClassifier>
 #include <QtUml/QUmlBehavioredClassifier>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -63,10 +62,10 @@ class QUmlReception;
 class Q_UML_EXPORT QUmlClass : public QUmlEncapsulatedClassifier, public QUmlBehavioredClassifier
 {
 public:
-    explicit QUmlClass(bool createQObject = true);
+    explicit QUmlClass(bool createQModelingObject = true);
     virtual ~QUmlClass();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlExtension *> extensions() const;
@@ -102,9 +101,6 @@ protected:
     QList<QUmlProperty *> _ownedAttributes;
     QList<QUmlOperation *> _ownedOperations;
     QSet<QUmlReception *> _ownedReceptions;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlclassifier.cpp b/src/uml/qumlclassifier.cpp
index 2ebce15f..7a4243a2 100644
--- a/src/uml/qumlclassifier.cpp
+++ b/src/uml/qumlclassifier.cpp
@@ -81,15 +81,13 @@ QUmlClassifier::QUmlClassifier() :
     _representation(0),
     _templateParameter(0)
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlClassifier::~QUmlClassifier()
 {
 }
 
-QModelingObject *QUmlClassifier::clone() const
+QModelingElement *QUmlClassifier::clone() const
 {
     QUmlClassifier *c = new QUmlClassifier;
     foreach (QUmlComment *element, ownedComments())
@@ -156,8 +154,8 @@ void QUmlClassifier::addAttribute(QUmlProperty *attribute)
 
     if (!_attributes.contains(attribute)) {
         _attributes.insert(attribute);
-        if (attribute && attribute->asQObject() && this->asQObject())
-            QObject::connect(attribute->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeAttribute(QObject *)));
+        if (attribute && attribute->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(attribute->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeAttribute(QObject *)));
 
         // Adjust subsetted properties
         addFeature(attribute);
@@ -192,9 +190,9 @@ void QUmlClassifier::addCollaborationUse(QUmlCollaborationUse *collaborationUse)
 
     if (!_collaborationUses.contains(collaborationUse)) {
         _collaborationUses.insert(collaborationUse);
-        if (collaborationUse && collaborationUse->asQObject() && this->asQObject())
-            QObject::connect(collaborationUse->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeCollaborationUse(QObject *)));
-        collaborationUse->asQObject()->setParent(this->asQObject());
+        if (collaborationUse && collaborationUse->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(collaborationUse->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeCollaborationUse(QObject *)));
+        collaborationUse->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(collaborationUse);
@@ -207,8 +205,8 @@ void QUmlClassifier::removeCollaborationUse(QUmlCollaborationUse *collaborationU
 
     if (_collaborationUses.contains(collaborationUse)) {
         _collaborationUses.remove(collaborationUse);
-        if (collaborationUse->asQObject())
-            collaborationUse->asQObject()->setParent(0);
+        if (collaborationUse->asQModelingObject())
+            collaborationUse->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(collaborationUse);
@@ -231,8 +229,8 @@ void QUmlClassifier::addFeature(QUmlFeature *feature)
 
     if (!_features.contains(feature)) {
         _features.insert(feature);
-        if (feature && feature->asQObject() && this->asQObject())
-            QObject::connect(feature->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeFeature(QObject *)));
+        if (feature && feature->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(feature->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeFeature(QObject *)));
 
         // Adjust subsetted properties
         addMember(feature);
@@ -313,9 +311,9 @@ void QUmlClassifier::addGeneralization(QUmlGeneralization *generalization)
 
     if (!_generalizations.contains(generalization)) {
         _generalizations.insert(generalization);
-        if (generalization && generalization->asQObject() && this->asQObject())
-            QObject::connect(generalization->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeGeneralization(QObject *)));
-        generalization->asQObject()->setParent(this->asQObject());
+        if (generalization && generalization->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(generalization->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeGeneralization(QObject *)));
+        generalization->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(generalization);
@@ -333,8 +331,8 @@ void QUmlClassifier::removeGeneralization(QUmlGeneralization *generalization)
 
     if (_generalizations.contains(generalization)) {
         _generalizations.remove(generalization);
-        if (generalization->asQObject())
-            generalization->asQObject()->setParent(0);
+        if (generalization->asQModelingObject())
+            generalization->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(generalization);
@@ -404,7 +402,7 @@ void QUmlClassifier::setAbstract(bool isAbstract)
 
     if (_isAbstract != isAbstract) {
         _isAbstract = isAbstract;
-        _modifiedResettableProperties << QStringLiteral("isAbstract");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isAbstract");
     }
 }
 
@@ -424,7 +422,7 @@ void QUmlClassifier::setFinalSpecialization(bool isFinalSpecialization)
 
     if (_isFinalSpecialization != isFinalSpecialization) {
         _isFinalSpecialization = isFinalSpecialization;
-        _modifiedResettableProperties << QStringLiteral("isFinalSpecialization");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isFinalSpecialization");
     }
 }
 
@@ -444,9 +442,9 @@ void QUmlClassifier::setOwnedTemplateSignature(QUmlRedefinableTemplateSignature
 
     if (_ownedTemplateSignature != ownedTemplateSignature) {
         _ownedTemplateSignature = ownedTemplateSignature;
-        if (ownedTemplateSignature && ownedTemplateSignature->asQObject() && this->asQObject())
-            QObject::connect(ownedTemplateSignature->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setOwnedTemplateSignature()));
-        ownedTemplateSignature->asQObject()->setParent(this->asQObject());
+        if (ownedTemplateSignature && ownedTemplateSignature->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(ownedTemplateSignature->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setOwnedTemplateSignature()));
+        ownedTemplateSignature->asQModelingObject()->setParent(this->asQModelingObject());
     }
 }
 
@@ -466,9 +464,9 @@ void QUmlClassifier::addOwnedUseCase(QUmlUseCase *ownedUseCase)
 
     if (!_ownedUseCases.contains(ownedUseCase)) {
         _ownedUseCases.insert(ownedUseCase);
-        if (ownedUseCase && ownedUseCase->asQObject() && this->asQObject())
-            QObject::connect(ownedUseCase->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeOwnedUseCase(QObject *)));
-        ownedUseCase->asQObject()->setParent(this->asQObject());
+        if (ownedUseCase && ownedUseCase->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(ownedUseCase->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeOwnedUseCase(QObject *)));
+        ownedUseCase->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedMember(ownedUseCase);
@@ -481,8 +479,8 @@ void QUmlClassifier::removeOwnedUseCase(QUmlUseCase *ownedUseCase)
 
     if (_ownedUseCases.contains(ownedUseCase)) {
         _ownedUseCases.remove(ownedUseCase);
-        if (ownedUseCase->asQObject())
-            ownedUseCase->asQObject()->setParent(0);
+        if (ownedUseCase->asQModelingObject())
+            ownedUseCase->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedMember(ownedUseCase);
@@ -505,8 +503,8 @@ void QUmlClassifier::addPowertypeExtent(QUmlGeneralizationSet *powertypeExtent)
 
     if (!_powertypeExtents.contains(powertypeExtent)) {
         _powertypeExtents.insert(powertypeExtent);
-        if (powertypeExtent && powertypeExtent->asQObject() && this->asQObject())
-            QObject::connect(powertypeExtent->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removePowertypeExtent(QObject *)));
+        if (powertypeExtent && powertypeExtent->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(powertypeExtent->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removePowertypeExtent(QObject *)));
 
         // Adjust opposite properties
         if (powertypeExtent) {
@@ -545,8 +543,8 @@ void QUmlClassifier::addRedefinedClassifier(QUmlClassifier *redefinedClassifier)
 
     if (!_redefinedClassifiers.contains(redefinedClassifier)) {
         _redefinedClassifiers.insert(redefinedClassifier);
-        if (redefinedClassifier && redefinedClassifier->asQObject() && this->asQObject())
-            QObject::connect(redefinedClassifier->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeRedefinedClassifier(QObject *)));
+        if (redefinedClassifier && redefinedClassifier->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(redefinedClassifier->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeRedefinedClassifier(QObject *)));
 
         // Adjust subsetted properties
         addRedefinedElement(redefinedClassifier);
@@ -584,8 +582,8 @@ void QUmlClassifier::setRepresentation(QUmlCollaborationUse *representation)
         removeCollaborationUse(_representation);
 
         _representation = representation;
-        if (representation && representation->asQObject() && this->asQObject())
-            QObject::connect(representation->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setRepresentation()));
+        if (representation && representation->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(representation->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setRepresentation()));
 
         // Adjust subsetted properties
         if (representation) {
@@ -610,9 +608,9 @@ void QUmlClassifier::addSubstitution(QUmlSubstitution *substitution)
 
     if (!_substitutions.contains(substitution)) {
         _substitutions.insert(substitution);
-        if (substitution && substitution->asQObject() && this->asQObject())
-            QObject::connect(substitution->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeSubstitution(QObject *)));
-        substitution->asQObject()->setParent(this->asQObject());
+        if (substitution && substitution->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(substitution->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeSubstitution(QObject *)));
+        substitution->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(substitution);
@@ -631,8 +629,8 @@ void QUmlClassifier::removeSubstitution(QUmlSubstitution *substitution)
 
     if (_substitutions.contains(substitution)) {
         _substitutions.remove(substitution);
-        if (substitution->asQObject())
-            substitution->asQObject()->setParent(0);
+        if (substitution->asQModelingObject())
+            substitution->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(substitution);
@@ -661,8 +659,8 @@ void QUmlClassifier::setTemplateParameter(QUmlClassifierTemplateParameter *templ
 
     if (_templateParameter != templateParameter) {
         _templateParameter = templateParameter;
-        if (templateParameter && templateParameter->asQObject() && this->asQObject())
-            QObject::connect(templateParameter->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setTemplateParameter()));
+        if (templateParameter && templateParameter->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(templateParameter->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setTemplateParameter()));
     }
 }
 
@@ -682,8 +680,8 @@ void QUmlClassifier::addUseCase(QUmlUseCase *useCase)
 
     if (!_useCases.contains(useCase)) {
         _useCases.insert(useCase);
-        if (useCase && useCase->asQObject() && this->asQObject())
-            QObject::connect(useCase->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeUseCase(QObject *)));
+        if (useCase && useCase->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(useCase->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeUseCase(QObject *)));
 
         // Adjust opposite properties
         if (useCase) {
@@ -803,194 +801,3 @@ QSet<QUmlClassifier *> QUmlClassifier::parents() const
     return QSet<QUmlClassifier *> ();
 }
 
-void QUmlClassifier::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generals"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
-}
-
-void QUmlClassifier::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("attributes")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("attributes")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("attributes")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("attributes")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("attributes")][QtModeling::DocumentationRole] = QStringLiteral("Refers to all of the Properties that are direct (i.e. not inherited or imported) attributes of the classifier.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("attributes")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("attributes")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Classifier-feature A_redefinitionContext_redefinableElement-redefinableElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("attributes")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("collaborationUses")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("collaborationUses")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("collaborationUses")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("collaborationUses")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("collaborationUses")][QtModeling::DocumentationRole] = QStringLiteral("References the collaboration uses owned by the classifier.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("collaborationUses")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("collaborationUses")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("collaborationUses")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("features")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("features")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("features")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("features")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("features")][QtModeling::DocumentationRole] = QStringLiteral("Specifies each feature defined in the classifier.Note that there may be members of the Classifier that are of the type Feature but are not included in this association, e.g. inherited features.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("features")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("features")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-member");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("features")][QtModeling::OppositeEndRole] = QStringLiteral("Feature-featuringClassifier");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("generals")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("generals")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("generals")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("generals")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("generals")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the general Classifiers for this Classifier.References the general classifier in the Generalization relationship.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("generals")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("generals")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("generals")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("generalizations")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("generalizations")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("generalizations")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("generalizations")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("generalizations")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the Generalization relationships for this Classifier. These Generalizations navigaten to more general classifiers in the generalization hierarchy.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("generalizations")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("generalizations")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_source_directedRelationship-directedRelationship Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("generalizations")][QtModeling::OppositeEndRole] = QStringLiteral("Generalization-specific");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("inheritedMembers")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("inheritedMembers")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("inheritedMembers")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("inheritedMembers")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("inheritedMembers")][QtModeling::DocumentationRole] = QStringLiteral("Specifies all elements inherited by this classifier from the general classifiers.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("inheritedMembers")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("inheritedMembers")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-member");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("inheritedMembers")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("isAbstract")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("isAbstract")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("isAbstract")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("isAbstract")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("isAbstract")][QtModeling::DocumentationRole] = QStringLiteral("If true, the Classifier does not provide a complete declaration and can typically not be instantiated. An abstract classifier is intended to be used by other classifiers e.g. as the target of general metarelationships or generalization relationships.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("isAbstract")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("isAbstract")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("isAbstract")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("isFinalSpecialization")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("isFinalSpecialization")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("isFinalSpecialization")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("isFinalSpecialization")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("isFinalSpecialization")][QtModeling::DocumentationRole] = QStringLiteral("If true, the Classifier cannot be specialized by generalization. Note that this property is preserved through package merge operations; that is, the capability to specialize a Classifier (i.e., isFinalSpecialization =false) must be preserved in the resulting Classifier of a package merge operation where a Classifier with isFinalSpecialization =false is merged with a matching Classifier with isFinalSpecialization =true: the resulting Classifier will have isFinalSpecialization =false.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("isFinalSpecialization")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("isFinalSpecialization")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("isFinalSpecialization")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("ownedTemplateSignature")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("ownedTemplateSignature")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("ownedTemplateSignature")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("ownedTemplateSignature")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("ownedTemplateSignature")][QtModeling::DocumentationRole] = QStringLiteral("The optional template signature specifying the formal template parameters.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("ownedTemplateSignature")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("TemplateableElement-ownedTemplateSignature");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("ownedTemplateSignature")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_redefinitionContext_redefinableElement-redefinableElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("ownedTemplateSignature")][QtModeling::OppositeEndRole] = QStringLiteral("RedefinableTemplateSignature-classifier");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("ownedUseCases")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("ownedUseCases")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("ownedUseCases")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("ownedUseCases")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("ownedUseCases")][QtModeling::DocumentationRole] = QStringLiteral("References the use cases owned by this classifier.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("ownedUseCases")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("ownedUseCases")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("ownedUseCases")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("powertypeExtents")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("powertypeExtents")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("powertypeExtents")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("powertypeExtents")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("powertypeExtents")][QtModeling::DocumentationRole] = QStringLiteral("Designates the GeneralizationSet of which the associated Classifier is a power type.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("powertypeExtents")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("powertypeExtents")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("powertypeExtents")][QtModeling::OppositeEndRole] = QStringLiteral("GeneralizationSet-powertype");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("redefinedClassifiers")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("redefinedClassifiers")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("redefinedClassifiers")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("redefinedClassifiers")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("redefinedClassifiers")][QtModeling::DocumentationRole] = QStringLiteral("References the Classifiers that are redefined by this Classifier.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("redefinedClassifiers")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("redefinedClassifiers")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("RedefinableElement-redefinedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("redefinedClassifiers")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("representation")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("representation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("representation")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("representation")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("representation")][QtModeling::DocumentationRole] = QStringLiteral("References a collaboration use which indicates the collaboration that represents this classifier.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("representation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("representation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Classifier-collaborationUse");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("representation")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("substitutions")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("substitutions")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("substitutions")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("substitutions")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("substitutions")][QtModeling::DocumentationRole] = QStringLiteral("References the substitutions that are owned by this Classifier.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("substitutions")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("substitutions")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement NamedElement-clientDependency");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("substitutions")][QtModeling::OppositeEndRole] = QStringLiteral("Substitution-substitutingClassifier");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("templateParameter")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("templateParameter")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("templateParameter")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("templateParameter")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("templateParameter")][QtModeling::DocumentationRole] = QStringLiteral("The template parameter that exposes this element as a formal parameter.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("templateParameter")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("ParameterableElement-templateParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("templateParameter")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("templateParameter")][QtModeling::OppositeEndRole] = QStringLiteral("ClassifierTemplateParameter-parameteredElement");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("useCases")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("useCases")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("useCases")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("useCases")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("useCases")][QtModeling::DocumentationRole] = QStringLiteral("The set of use cases for which this Classifier is the subject.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("useCases")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("useCases")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("useCases")][QtModeling::OppositeEndRole] = QStringLiteral("UseCase-subject");
-
-}
-
diff --git a/src/uml/qumlclassifier.h b/src/uml/qumlclassifier.h
index 4032c70a..c9b69848 100644
--- a/src/uml/qumlclassifier.h
+++ b/src/uml/qumlclassifier.h
@@ -48,7 +48,6 @@
 #include <QtUml/QUmlRedefinableElement>
 #include <QtUml/QUmlTemplateableElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -71,7 +70,7 @@ class Q_UML_EXPORT QUmlClassifier : public QUmlNamespace, public QUmlType, publi
 public:
     virtual ~QUmlClassifier();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlProperty *> attributes() const;
@@ -146,9 +145,6 @@ protected:
     QSet<QUmlSubstitution *> _substitutions;
     QUmlClassifierTemplateParameter *_templateParameter;
     QSet<QUmlUseCase *> _useCases;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlclassifiertemplateparameter.cpp b/src/uml/qumlclassifiertemplateparameter.cpp
index cefb285a..fb7940f9 100644
--- a/src/uml/qumlclassifiertemplateparameter.cpp
+++ b/src/uml/qumlclassifiertemplateparameter.cpp
@@ -55,27 +55,25 @@
 
     \brief A classifier template parameter exposes a classifier as a formal template parameter.
  */
-QUmlClassifierTemplateParameter::QUmlClassifierTemplateParameter(bool createQObject) :
+QUmlClassifierTemplateParameter::QUmlClassifierTemplateParameter(bool createQModelingObject) :
     QUmlTemplateParameter(false),
     _allowSubstitutable(true),
     _parameteredElement(0)
 {
-    if (createQObject)
-        _qObject = new QUmlClassifierTemplateParameterObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlClassifierTemplateParameterObject(this));
 }
 
 QUmlClassifierTemplateParameter::~QUmlClassifierTemplateParameter()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlClassifierTemplateParameter::clone() const
+QModelingElement *QUmlClassifierTemplateParameter::clone() const
 {
     QUmlClassifierTemplateParameter *c = new QUmlClassifierTemplateParameter;
     foreach (QUmlComment *element, ownedComments())
@@ -114,7 +112,7 @@ void QUmlClassifierTemplateParameter::setAllowSubstitutable(bool allowSubstituta
 
     if (_allowSubstitutable != allowSubstitutable) {
         _allowSubstitutable = allowSubstitutable;
-        _modifiedResettableProperties << QStringLiteral("allowSubstitutable");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("allowSubstitutable");
     }
 }
 
@@ -134,8 +132,8 @@ void QUmlClassifierTemplateParameter::addConstrainingClassifier(QUmlClassifier *
 
     if (!_constrainingClassifiers.contains(constrainingClassifier)) {
         _constrainingClassifiers.insert(constrainingClassifier);
-        if (constrainingClassifier && constrainingClassifier->asQObject() && this->asQObject())
-            QObject::connect(constrainingClassifier->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeConstrainingClassifier(QObject *)));
+        if (constrainingClassifier && constrainingClassifier->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(constrainingClassifier->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeConstrainingClassifier(QObject *)));
     }
 }
 
@@ -164,55 +162,8 @@ void QUmlClassifierTemplateParameter::setParameteredElement(QUmlClassifier *para
 
     if (_parameteredElement != parameteredElement) {
         _parameteredElement = parameteredElement;
-        if (parameteredElement && parameteredElement->asQObject() && this->asQObject())
-            QObject::connect(parameteredElement->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setParameteredElement()));
+        if (parameteredElement && parameteredElement->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(parameteredElement->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setParameteredElement()));
     }
 }
 
-void QUmlClassifierTemplateParameter::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("default_"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedDefault"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameteredElement"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("signature"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifierTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("allowSubstitutable"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifierTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("constrainingClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifierTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parameteredElement"))));
-}
-
-void QUmlClassifierTemplateParameter::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifierTemplateParameter")][QStringLiteral("allowSubstitutable")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifierTemplateParameter")][QStringLiteral("allowSubstitutable")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifierTemplateParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifierTemplateParameter")][QStringLiteral("allowSubstitutable")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifierTemplateParameter")][QStringLiteral("allowSubstitutable")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifierTemplateParameter")][QStringLiteral("allowSubstitutable")][QtModeling::DocumentationRole] = QStringLiteral("Constrains the required relationship between an actual parameter and the parameteredElement for this formal parameter.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifierTemplateParameter")][QStringLiteral("allowSubstitutable")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifierTemplateParameter")][QStringLiteral("allowSubstitutable")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifierTemplateParameter")][QStringLiteral("allowSubstitutable")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifierTemplateParameter")][QStringLiteral("constrainingClassifiers")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifierTemplateParameter")][QStringLiteral("constrainingClassifiers")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifierTemplateParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifierTemplateParameter")][QStringLiteral("constrainingClassifiers")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifierTemplateParameter")][QStringLiteral("constrainingClassifiers")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifierTemplateParameter")][QStringLiteral("constrainingClassifiers")][QtModeling::DocumentationRole] = QStringLiteral("The classifiers that constrain the argument that can be used for the parameter. If the allowSubstitutable attribute is true, then any classifier that is compatible with this constraining classifier can be substituted; otherwise, it must be either this classifier or one of its subclasses. If this property is empty, there are no constraints on the classifier that can be used as an argument.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifierTemplateParameter")][QStringLiteral("constrainingClassifiers")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifierTemplateParameter")][QStringLiteral("constrainingClassifiers")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifierTemplateParameter")][QStringLiteral("constrainingClassifiers")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifierTemplateParameter")][QStringLiteral("parameteredElement")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifierTemplateParameter")][QStringLiteral("parameteredElement")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifierTemplateParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifierTemplateParameter")][QStringLiteral("parameteredElement")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifierTemplateParameter")][QStringLiteral("parameteredElement")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifierTemplateParameter")][QStringLiteral("parameteredElement")][QtModeling::DocumentationRole] = QStringLiteral("The parameterable classifier for this template parameter.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifierTemplateParameter")][QStringLiteral("parameteredElement")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("TemplateParameter-parameteredElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifierTemplateParameter")][QStringLiteral("parameteredElement")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifierTemplateParameter")][QStringLiteral("parameteredElement")][QtModeling::OppositeEndRole] = QStringLiteral("Classifier-templateParameter");
-
-}
-
diff --git a/src/uml/qumlclassifiertemplateparameter.h b/src/uml/qumlclassifiertemplateparameter.h
index 337937b3..47ce3f02 100644
--- a/src/uml/qumlclassifiertemplateparameter.h
+++ b/src/uml/qumlclassifiertemplateparameter.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlTemplateParameter>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlClassifier;
 class Q_UML_EXPORT QUmlClassifierTemplateParameter : public QUmlTemplateParameter
 {
 public:
-    explicit QUmlClassifierTemplateParameter(bool createQObject = true);
+    explicit QUmlClassifierTemplateParameter(bool createQModelingObject = true);
     virtual ~QUmlClassifierTemplateParameter();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     bool allowSubstitutable() const;
@@ -75,9 +74,6 @@ protected:
     bool _allowSubstitutable;
     QSet<QUmlClassifier *> _constrainingClassifiers;
     QUmlClassifier *_parameteredElement;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlclause.cpp b/src/uml/qumlclause.cpp
index 98d739ab..b528cbb1 100644
--- a/src/uml/qumlclause.cpp
+++ b/src/uml/qumlclause.cpp
@@ -54,25 +54,23 @@
 
     \brief A clause is an element that represents a single branch of a conditional construct, including a test and a body section. The body section is executed only if (but not necessarily if) the test section evaluates true.
  */
-QUmlClause::QUmlClause(bool createQObject) :
+QUmlClause::QUmlClause(bool createQModelingObject) :
     _decider(0)
 {
-    if (createQObject)
-        _qObject = new QUmlClauseObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlClauseObject(this));
 }
 
 QUmlClause::~QUmlClause()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlClause::clone() const
+QModelingElement *QUmlClause::clone() const
 {
     QUmlClause *c = new QUmlClause;
     foreach (QUmlComment *element, ownedComments())
@@ -110,8 +108,8 @@ void QUmlClause::addBody(QUmlExecutableNode *body)
 
     if (!_bodies.contains(body)) {
         _bodies.insert(body);
-        if (body && body->asQObject() && this->asQObject())
-            QObject::connect(body->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeBody(QObject *)));
+        if (body && body->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(body->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeBody(QObject *)));
     }
 }
 
@@ -140,8 +138,8 @@ void QUmlClause::addBodyOutput(QUmlOutputPin *bodyOutput)
 
     if (!_bodyOutputs.contains(bodyOutput)) {
         _bodyOutputs.append(bodyOutput);
-        if (bodyOutput && bodyOutput->asQObject() && this->asQObject())
-            QObject::connect(bodyOutput->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeBodyOutput(QObject *)));
+        if (bodyOutput && bodyOutput->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(bodyOutput->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeBodyOutput(QObject *)));
     }
 }
 
@@ -170,8 +168,8 @@ void QUmlClause::setDecider(QUmlOutputPin *decider)
 
     if (_decider != decider) {
         _decider = decider;
-        if (decider && decider->asQObject() && this->asQObject())
-            QObject::connect(decider->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setDecider()));
+        if (decider && decider->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(decider->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setDecider()));
     }
 }
 
@@ -191,8 +189,8 @@ void QUmlClause::addPredecessorClause(QUmlClause *predecessorClause)
 
     if (!_predecessorClauses.contains(predecessorClause)) {
         _predecessorClauses.insert(predecessorClause);
-        if (predecessorClause && predecessorClause->asQObject() && this->asQObject())
-            QObject::connect(predecessorClause->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removePredecessorClause(QObject *)));
+        if (predecessorClause && predecessorClause->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(predecessorClause->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removePredecessorClause(QObject *)));
     }
 }
 
@@ -221,8 +219,8 @@ void QUmlClause::addSuccessorClause(QUmlClause *successorClause)
 
     if (!_successorClauses.contains(successorClause)) {
         _successorClauses.insert(successorClause);
-        if (successorClause && successorClause->asQObject() && this->asQObject())
-            QObject::connect(successorClause->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeSuccessorClause(QObject *)));
+        if (successorClause && successorClause->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(successorClause->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeSuccessorClause(QObject *)));
     }
 }
 
@@ -251,8 +249,8 @@ void QUmlClause::addTest(QUmlExecutableNode *test)
 
     if (!_tests.contains(test)) {
         _tests.insert(test);
-        if (test && test->asQObject() && this->asQObject())
-            QObject::connect(test->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeTest(QObject *)));
+        if (test && test->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(test->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeTest(QObject *)));
     }
 }
 
@@ -265,76 +263,3 @@ void QUmlClause::removeTest(QUmlExecutableNode *test)
     }
 }
 
-void QUmlClause::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlClause"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("bodies"))));
-    _groupProperties.insert(QStringLiteral("QUmlClause"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("bodyOutputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlClause"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("decider"))));
-    _groupProperties.insert(QStringLiteral("QUmlClause"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("predecessorClauses"))));
-    _groupProperties.insert(QStringLiteral("QUmlClause"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("successorClauses"))));
-    _groupProperties.insert(QStringLiteral("QUmlClause"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("tests"))));
-}
-
-void QUmlClause::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("bodies")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("bodies")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClause");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("bodies")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("bodies")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("bodies")][QtModeling::DocumentationRole] = QStringLiteral("A nested activity fragment that is executed if the test evaluates to true and the clause is chosen over any concurrent clauses that also evaluate to true.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("bodies")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("bodies")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("bodies")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("bodyOutputs")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("bodyOutputs")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClause");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("bodyOutputs")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("bodyOutputs")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("bodyOutputs")][QtModeling::DocumentationRole] = QStringLiteral("A list of output pins within the body fragment whose values are moved to the result pins of the containing conditional node after execution of the clause body.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("bodyOutputs")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("bodyOutputs")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("bodyOutputs")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("decider")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("decider")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClause");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("decider")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("decider")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("decider")][QtModeling::DocumentationRole] = QStringLiteral("An output pin within the test fragment the value of which is examined after execution of the test to determine whether the body should be executed.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("decider")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("decider")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("decider")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("predecessorClauses")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("predecessorClauses")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClause");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("predecessorClauses")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("predecessorClauses")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("predecessorClauses")][QtModeling::DocumentationRole] = QStringLiteral("A set of clauses whose tests must all evaluate false before the current clause can be tested.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("predecessorClauses")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("predecessorClauses")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("predecessorClauses")][QtModeling::OppositeEndRole] = QStringLiteral("Clause-successorClause");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("successorClauses")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("successorClauses")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClause");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("successorClauses")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("successorClauses")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("successorClauses")][QtModeling::DocumentationRole] = QStringLiteral("A set of clauses which may not be tested unless the current clause tests false.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("successorClauses")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("successorClauses")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("successorClauses")][QtModeling::OppositeEndRole] = QStringLiteral("Clause-predecessorClause");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("tests")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("tests")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClause");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("tests")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("tests")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("tests")][QtModeling::DocumentationRole] = QStringLiteral("A nested activity fragment with a designated output pin that specifies the result of the test.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("tests")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("tests")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("tests")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlclause.h b/src/uml/qumlclause.h
index 5c20464f..5840052b 100644
--- a/src/uml/qumlclause.h
+++ b/src/uml/qumlclause.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlOutputPin;
 class Q_UML_EXPORT QUmlClause : public QUmlElement
 {
 public:
-    explicit QUmlClause(bool createQObject = true);
+    explicit QUmlClause(bool createQModelingObject = true);
     virtual ~QUmlClause();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlExecutableNode *> bodies() const;
@@ -89,9 +88,6 @@ protected:
     QSet<QUmlClause *> _predecessorClauses;
     QSet<QUmlClause *> _successorClauses;
     QSet<QUmlExecutableNode *> _tests;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlclearassociationaction.cpp b/src/uml/qumlclearassociationaction.cpp
index 99e0aef3..1c179e79 100644
--- a/src/uml/qumlclearassociationaction.cpp
+++ b/src/uml/qumlclearassociationaction.cpp
@@ -71,26 +71,24 @@
 
     \brief A clear association action is an action that destroys all links of an association in which a particular object participates.
  */
-QUmlClearAssociationAction::QUmlClearAssociationAction(bool createQObject) :
+QUmlClearAssociationAction::QUmlClearAssociationAction(bool createQModelingObject) :
     _association(0),
     _object(0)
 {
-    if (createQObject)
-        _qObject = new QUmlClearAssociationActionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlClearAssociationActionObject(this));
 }
 
 QUmlClearAssociationAction::~QUmlClearAssociationAction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlClearAssociationAction::clone() const
+QModelingElement *QUmlClearAssociationAction::clone() const
 {
     QUmlClearAssociationAction *c = new QUmlClearAssociationAction;
     foreach (QUmlComment *element, ownedComments())
@@ -148,8 +146,8 @@ void QUmlClearAssociationAction::setAssociation(QUmlAssociation *association)
 
     if (_association != association) {
         _association = association;
-        if (association && association->asQObject() && this->asQObject())
-            QObject::connect(association->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setAssociation()));
+        if (association && association->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(association->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setAssociation()));
     }
 }
 
@@ -172,9 +170,9 @@ void QUmlClearAssociationAction::setObject(QUmlInputPin *object)
         removeInput(_object);
 
         _object = object;
-        if (object && object->asQObject() && this->asQObject())
-            QObject::connect(object->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setObject()));
-        object->asQObject()->setParent(this->asQObject());
+        if (object && object->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(object->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setObject()));
+        object->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (object) {
@@ -183,60 +181,3 @@ void QUmlClearAssociationAction::setObject(QUmlInputPin *object)
     }
 }
 
-void QUmlClearAssociationAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlClearAssociationAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("association"))));
-    _groupProperties.insert(QStringLiteral("QUmlClearAssociationAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("object"))));
-}
-
-void QUmlClearAssociationAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClearAssociationAction")][QStringLiteral("association")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClearAssociationAction")][QStringLiteral("association")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClearAssociationAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClearAssociationAction")][QStringLiteral("association")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClearAssociationAction")][QStringLiteral("association")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClearAssociationAction")][QStringLiteral("association")][QtModeling::DocumentationRole] = QStringLiteral("Association to be cleared.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClearAssociationAction")][QStringLiteral("association")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClearAssociationAction")][QStringLiteral("association")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClearAssociationAction")][QStringLiteral("association")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClearAssociationAction")][QStringLiteral("object")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClearAssociationAction")][QStringLiteral("object")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClearAssociationAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClearAssociationAction")][QStringLiteral("object")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClearAssociationAction")][QStringLiteral("object")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClearAssociationAction")][QStringLiteral("object")][QtModeling::DocumentationRole] = QStringLiteral("Gives the input pin from which is obtained the object whose participation in the association is to be cleared.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClearAssociationAction")][QStringLiteral("object")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClearAssociationAction")][QStringLiteral("object")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClearAssociationAction")][QStringLiteral("object")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlclearassociationaction.h b/src/uml/qumlclearassociationaction.h
index b510791b..b6dd601a 100644
--- a/src/uml/qumlclearassociationaction.h
+++ b/src/uml/qumlclearassociationaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlInputPin;
 class Q_UML_EXPORT QUmlClearAssociationAction : public QUmlAction
 {
 public:
-    explicit QUmlClearAssociationAction(bool createQObject = true);
+    explicit QUmlClearAssociationAction(bool createQModelingObject = true);
     virtual ~QUmlClearAssociationAction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlAssociation *association() const;
@@ -72,9 +71,6 @@ public:
 protected:
     QUmlAssociation *_association;
     QUmlInputPin *_object;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlclearstructuralfeatureaction.cpp b/src/uml/qumlclearstructuralfeatureaction.cpp
index 57e38b96..04fb8694 100644
--- a/src/uml/qumlclearstructuralfeatureaction.cpp
+++ b/src/uml/qumlclearstructuralfeatureaction.cpp
@@ -71,25 +71,23 @@
 
     \brief A clear structural feature action is a structural feature action that removes all values of a structural feature.
  */
-QUmlClearStructuralFeatureAction::QUmlClearStructuralFeatureAction(bool createQObject) :
+QUmlClearStructuralFeatureAction::QUmlClearStructuralFeatureAction(bool createQModelingObject) :
     _result(0)
 {
-    if (createQObject)
-        _qObject = new QUmlClearStructuralFeatureActionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlClearStructuralFeatureActionObject(this));
 }
 
 QUmlClearStructuralFeatureAction::~QUmlClearStructuralFeatureAction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlClearStructuralFeatureAction::clone() const
+QModelingElement *QUmlClearStructuralFeatureAction::clone() const
 {
     QUmlClearStructuralFeatureAction *c = new QUmlClearStructuralFeatureAction;
     foreach (QUmlComment *element, ownedComments())
@@ -152,9 +150,9 @@ void QUmlClearStructuralFeatureAction::setResult(QUmlOutputPin *result)
         removeOutput(_result);
 
         _result = result;
-        if (result && result->asQObject() && this->asQObject())
-            QObject::connect(result->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setResult()));
-        result->asQObject()->setParent(this->asQObject());
+        if (result && result->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(result->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setResult()));
+        result->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (result) {
@@ -163,52 +161,3 @@ void QUmlClearStructuralFeatureAction::setResult(QUmlOutputPin *result)
     }
 }
 
-void QUmlClearStructuralFeatureAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuralFeatureAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("object"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuralFeatureAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("structuralFeature"))));
-    _groupProperties.insert(QStringLiteral("QUmlClearStructuralFeatureAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("result"))));
-}
-
-void QUmlClearStructuralFeatureAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClearStructuralFeatureAction")][QStringLiteral("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClearStructuralFeatureAction")][QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClearStructuralFeatureAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClearStructuralFeatureAction")][QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClearStructuralFeatureAction")][QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClearStructuralFeatureAction")][QStringLiteral("result")][QtModeling::DocumentationRole] = QStringLiteral("Gives the output pin on which the result is put.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClearStructuralFeatureAction")][QStringLiteral("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClearStructuralFeatureAction")][QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlClearStructuralFeatureAction")][QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlclearstructuralfeatureaction.h b/src/uml/qumlclearstructuralfeatureaction.h
index 2a9e0b16..32cf43c6 100644
--- a/src/uml/qumlclearstructuralfeatureaction.h
+++ b/src/uml/qumlclearstructuralfeatureaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlStructuralFeatureAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlOutputPin;
 class Q_UML_EXPORT QUmlClearStructuralFeatureAction : public QUmlStructuralFeatureAction
 {
 public:
-    explicit QUmlClearStructuralFeatureAction(bool createQObject = true);
+    explicit QUmlClearStructuralFeatureAction(bool createQModelingObject = true);
     virtual ~QUmlClearStructuralFeatureAction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlOutputPin *result() const;
@@ -68,9 +67,6 @@ public:
 
 protected:
     QUmlOutputPin *_result;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlclearvariableaction.cpp b/src/uml/qumlclearvariableaction.cpp
index 3a7e019b..b510a077 100644
--- a/src/uml/qumlclearvariableaction.cpp
+++ b/src/uml/qumlclearvariableaction.cpp
@@ -71,24 +71,22 @@
 
     \brief A clear variable action is a variable action that removes all values of a variable.
  */
-QUmlClearVariableAction::QUmlClearVariableAction(bool createQObject)
+QUmlClearVariableAction::QUmlClearVariableAction(bool createQModelingObject)
 {
-    if (createQObject)
-        _qObject = new QUmlClearVariableActionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlClearVariableActionObject(this));
 }
 
 QUmlClearVariableAction::~QUmlClearVariableAction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlClearVariableAction::clone() const
+QModelingElement *QUmlClearVariableAction::clone() const
 {
     QUmlClearVariableAction *c = new QUmlClearVariableAction;
     foreach (QUmlComment *element, ownedComments())
@@ -126,41 +124,3 @@ QModelingObject *QUmlClearVariableAction::clone() const
     return c;
 }
 
-void QUmlClearVariableAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlVariableAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("variable"))));
-}
-
-void QUmlClearVariableAction::setPropertyData()
-{
-}
-
diff --git a/src/uml/qumlclearvariableaction.h b/src/uml/qumlclearvariableaction.h
index 111ed44b..59768890 100644
--- a/src/uml/qumlclearvariableaction.h
+++ b/src/uml/qumlclearvariableaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlVariableAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,16 +54,13 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlClearVariableAction : public QUmlVariableAction
 {
 public:
-    explicit QUmlClearVariableAction(bool createQObject = true);
+    explicit QUmlClearVariableAction(bool createQModelingObject = true);
     virtual ~QUmlClearVariableAction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
 
 protected:
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlcollaboration.cpp b/src/uml/qumlcollaboration.cpp
index 303e4600..15854f97 100644
--- a/src/uml/qumlcollaboration.cpp
+++ b/src/uml/qumlcollaboration.cpp
@@ -81,24 +81,22 @@
 
     \brief A collaboration use represents the application of the pattern described by a collaboration to a specific situation involving specific classes or instances playing the roles of the collaboration.
  */
-QUmlCollaboration::QUmlCollaboration(bool createQObject)
+QUmlCollaboration::QUmlCollaboration(bool createQModelingObject)
 {
-    if (createQObject)
-        _qObject = new QUmlCollaborationObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlCollaborationObject(this));
 }
 
 QUmlCollaboration::~QUmlCollaboration()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlCollaboration::clone() const
+QModelingElement *QUmlCollaboration::clone() const
 {
     QUmlCollaboration *c = new QUmlCollaboration;
     foreach (QUmlComment *element, ownedComments())
@@ -177,8 +175,8 @@ void QUmlCollaboration::addCollaborationRole(QUmlConnectableElement *collaborati
 
     if (!_collaborationRoles.contains(collaborationRole)) {
         _collaborationRoles.insert(collaborationRole);
-        if (collaborationRole && collaborationRole->asQObject() && this->asQObject())
-            QObject::connect(collaborationRole->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeCollaborationRole(QObject *)));
+        if (collaborationRole && collaborationRole->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(collaborationRole->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeCollaborationRole(QObject *)));
 
         // Adjust subsetted properties
         addRole(collaborationRole);
@@ -197,67 +195,3 @@ void QUmlCollaboration::removeCollaborationRole(QUmlConnectableElement *collabor
     }
 }
 
-void QUmlCollaboration::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generals"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedConnectors"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parts"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("roles"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifierBehavior"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interfaceRealizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedBehaviors"))));
-    _groupProperties.insert(QStringLiteral("QUmlCollaboration"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationRoles"))));
-}
-
-void QUmlCollaboration::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCollaboration")][QStringLiteral("collaborationRoles")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCollaboration")][QStringLiteral("collaborationRoles")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlCollaboration");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCollaboration")][QStringLiteral("collaborationRoles")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCollaboration")][QStringLiteral("collaborationRoles")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCollaboration")][QStringLiteral("collaborationRoles")][QtModeling::DocumentationRole] = QStringLiteral("References connectable elements (possibly owned by other classifiers) which represent roles that instances may play in this collaboration.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCollaboration")][QStringLiteral("collaborationRoles")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCollaboration")][QStringLiteral("collaborationRoles")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("StructuredClassifier-role");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCollaboration")][QStringLiteral("collaborationRoles")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlcollaboration.h b/src/uml/qumlcollaboration.h
index 60332f5f..55ff39d9 100644
--- a/src/uml/qumlcollaboration.h
+++ b/src/uml/qumlcollaboration.h
@@ -46,7 +46,6 @@
 #include <QtUml/QUmlStructuredClassifier>
 #include <QtUml/QUmlBehavioredClassifier>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlConnectableElement;
 class Q_UML_EXPORT QUmlCollaboration : public QUmlStructuredClassifier, public QUmlBehavioredClassifier
 {
 public:
-    explicit QUmlCollaboration(bool createQObject = true);
+    explicit QUmlCollaboration(bool createQModelingObject = true);
     virtual ~QUmlCollaboration();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlConnectableElement *> collaborationRoles() const;
@@ -70,9 +69,6 @@ public:
 
 protected:
     QSet<QUmlConnectableElement *> _collaborationRoles;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlcollaborationuse.cpp b/src/uml/qumlcollaborationuse.cpp
index 4a2b4f99..51f80ab6 100644
--- a/src/uml/qumlcollaborationuse.cpp
+++ b/src/uml/qumlcollaborationuse.cpp
@@ -58,25 +58,23 @@
 
     \brief A collaboration use represents one particular use of a collaboration to explain the relationships between the properties of a classifier. A collaboration use shows how the pattern described by a collaboration is applied in a given context, by binding specific entities from that context to the roles of the collaboration. Depending on the context, these entities could be structural features of a classifier, instance specifications, or even roles in some containing collaboration. There may be multiple occurrences of a given collaboration within a classifier, each involving a different set of roles and connectors. A given role or connector may be involved in multiple occurrences of the same or different collaborations. Associated dependencies map features of the collaboration type to features in the classifier. These dependencies indicate which role in the classifier plays which role in the collaboration.
  */
-QUmlCollaborationUse::QUmlCollaborationUse(bool createQObject) :
+QUmlCollaborationUse::QUmlCollaborationUse(bool createQModelingObject) :
     _type(0)
 {
-    if (createQObject)
-        _qObject = new QUmlCollaborationUseObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlCollaborationUseObject(this));
 }
 
 QUmlCollaborationUse::~QUmlCollaborationUse()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlCollaborationUse::clone() const
+QModelingElement *QUmlCollaborationUse::clone() const
 {
     QUmlCollaborationUse *c = new QUmlCollaborationUse;
     foreach (QUmlComment *element, ownedComments())
@@ -112,9 +110,9 @@ void QUmlCollaborationUse::addRoleBinding(QUmlDependency *roleBinding)
 
     if (!_roleBindings.contains(roleBinding)) {
         _roleBindings.insert(roleBinding);
-        if (roleBinding && roleBinding->asQObject() && this->asQObject())
-            QObject::connect(roleBinding->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeRoleBinding(QObject *)));
-        roleBinding->asQObject()->setParent(this->asQObject());
+        if (roleBinding && roleBinding->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(roleBinding->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeRoleBinding(QObject *)));
+        roleBinding->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(roleBinding);
@@ -127,8 +125,8 @@ void QUmlCollaborationUse::removeRoleBinding(QUmlDependency *roleBinding)
 
     if (_roleBindings.contains(roleBinding)) {
         _roleBindings.remove(roleBinding);
-        if (roleBinding->asQObject())
-            roleBinding->asQObject()->setParent(0);
+        if (roleBinding->asQModelingObject())
+            roleBinding->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(roleBinding);
@@ -151,47 +149,8 @@ void QUmlCollaborationUse::setType(QUmlCollaboration *type)
 
     if (_type != type) {
         _type = type;
-        if (type && type->asQObject() && this->asQObject())
-            QObject::connect(type->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setType()));
+        if (type && type->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(type->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setType()));
     }
 }
 
-void QUmlCollaborationUse::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlCollaborationUse"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("roleBindings"))));
-    _groupProperties.insert(QStringLiteral("QUmlCollaborationUse"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
-}
-
-void QUmlCollaborationUse::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCollaborationUse")][QStringLiteral("roleBindings")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCollaborationUse")][QStringLiteral("roleBindings")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlCollaborationUse");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCollaborationUse")][QStringLiteral("roleBindings")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCollaborationUse")][QStringLiteral("roleBindings")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCollaborationUse")][QStringLiteral("roleBindings")][QtModeling::DocumentationRole] = QStringLiteral("A mapping between features of the collaboration type and features of the owning classifier. This mapping indicates which connectable element of the classifier plays which role(s) in the collaboration. A connectable element may be bound to multiple roles in the same collaboration use (that is, it may play multiple roles).");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCollaborationUse")][QStringLiteral("roleBindings")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCollaborationUse")][QStringLiteral("roleBindings")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCollaborationUse")][QStringLiteral("roleBindings")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCollaborationUse")][QStringLiteral("type")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCollaborationUse")][QStringLiteral("type")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlCollaborationUse");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCollaborationUse")][QStringLiteral("type")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCollaborationUse")][QStringLiteral("type")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCollaborationUse")][QStringLiteral("type")][QtModeling::DocumentationRole] = QStringLiteral("The collaboration which is used in this occurrence. The collaboration defines the cooperation between its roles which are mapped to properties of the classifier owning the collaboration use.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCollaborationUse")][QStringLiteral("type")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCollaborationUse")][QStringLiteral("type")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCollaborationUse")][QStringLiteral("type")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlcollaborationuse.h b/src/uml/qumlcollaborationuse.h
index 1cefb0c9..f437773c 100644
--- a/src/uml/qumlcollaborationuse.h
+++ b/src/uml/qumlcollaborationuse.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlNamedElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlDependency;
 class Q_UML_EXPORT QUmlCollaborationUse : public QUmlNamedElement
 {
 public:
-    explicit QUmlCollaborationUse(bool createQObject = true);
+    explicit QUmlCollaborationUse(bool createQModelingObject = true);
     virtual ~QUmlCollaborationUse();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlDependency *> roleBindings() const;
@@ -73,9 +72,6 @@ public:
 protected:
     QSet<QUmlDependency *> _roleBindings;
     QUmlCollaboration *_type;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlcombinedfragment.cpp b/src/uml/qumlcombinedfragment.cpp
index efed7987..98738cd4 100644
--- a/src/uml/qumlcombinedfragment.cpp
+++ b/src/uml/qumlcombinedfragment.cpp
@@ -62,25 +62,23 @@
 
     \brief A combined fragment defines an expression of interaction fragments. A combined fragment is defined by an interaction operator and corresponding interaction operands. Through the use of combined fragments the user will be able to describe a number of traces in a compact and concise manner.
  */
-QUmlCombinedFragment::QUmlCombinedFragment(bool createQObject) :
+QUmlCombinedFragment::QUmlCombinedFragment(bool createQModelingObject) :
     _interactionOperator(QtUml::InteractionOperatorKindSeq)
 {
-    if (createQObject)
-        _qObject = new QUmlCombinedFragmentObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlCombinedFragmentObject(this));
 }
 
 QUmlCombinedFragment::~QUmlCombinedFragment()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlCombinedFragment::clone() const
+QModelingElement *QUmlCombinedFragment::clone() const
 {
     QUmlCombinedFragment *c = new QUmlCombinedFragment;
     foreach (QUmlComment *element, ownedComments())
@@ -125,9 +123,9 @@ void QUmlCombinedFragment::addCfragmentGate(QUmlGate *cfragmentGate)
 
     if (!_cfragmentGates.contains(cfragmentGate)) {
         _cfragmentGates.insert(cfragmentGate);
-        if (cfragmentGate && cfragmentGate->asQObject() && this->asQObject())
-            QObject::connect(cfragmentGate->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeCfragmentGate(QObject *)));
-        cfragmentGate->asQObject()->setParent(this->asQObject());
+        if (cfragmentGate && cfragmentGate->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(cfragmentGate->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeCfragmentGate(QObject *)));
+        cfragmentGate->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(cfragmentGate);
@@ -140,8 +138,8 @@ void QUmlCombinedFragment::removeCfragmentGate(QUmlGate *cfragmentGate)
 
     if (_cfragmentGates.contains(cfragmentGate)) {
         _cfragmentGates.remove(cfragmentGate);
-        if (cfragmentGate->asQObject())
-            cfragmentGate->asQObject()->setParent(0);
+        if (cfragmentGate->asQModelingObject())
+            cfragmentGate->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(cfragmentGate);
@@ -164,7 +162,7 @@ void QUmlCombinedFragment::setInteractionOperator(QtUml::InteractionOperatorKind
 
     if (_interactionOperator != interactionOperator) {
         _interactionOperator = interactionOperator;
-        _modifiedResettableProperties << QStringLiteral("interactionOperator");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("interactionOperator");
     }
 }
 
@@ -184,9 +182,9 @@ void QUmlCombinedFragment::addOperand(QUmlInteractionOperand *operand)
 
     if (!_operands.contains(operand)) {
         _operands.append(operand);
-        if (operand && operand->asQObject() && this->asQObject())
-            QObject::connect(operand->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeOperand(QObject *)));
-        operand->asQObject()->setParent(this->asQObject());
+        if (operand && operand->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(operand->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeOperand(QObject *)));
+        operand->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(operand);
@@ -199,64 +197,11 @@ void QUmlCombinedFragment::removeOperand(QUmlInteractionOperand *operand)
 
     if (_operands.contains(operand)) {
         _operands.removeAll(operand);
-        if (operand->asQObject())
-            operand->asQObject()->setParent(0);
+        if (operand->asQModelingObject())
+            operand->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(operand);
     }
 }
 
-void QUmlCombinedFragment::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("covered"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingInteraction"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingOperand"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalOrderings"))));
-    _groupProperties.insert(QStringLiteral("QUmlCombinedFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("cfragmentGates"))));
-    _groupProperties.insert(QStringLiteral("QUmlCombinedFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interactionOperator"))));
-    _groupProperties.insert(QStringLiteral("QUmlCombinedFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("operands"))));
-}
-
-void QUmlCombinedFragment::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("cfragmentGates")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("cfragmentGates")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlCombinedFragment");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("cfragmentGates")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("cfragmentGates")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("cfragmentGates")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the gates that form the interface between this CombinedFragment and its surroundings");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("cfragmentGates")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("cfragmentGates")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("cfragmentGates")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("interactionOperator")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("interactionOperator")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlCombinedFragment");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("interactionOperator")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("interactionOperator")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("interactionOperator")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the operation which defines the semantics of this combination of InteractionFragments.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("interactionOperator")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("interactionOperator")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("interactionOperator")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("operands")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("operands")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlCombinedFragment");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("operands")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("operands")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("operands")][QtModeling::DocumentationRole] = QStringLiteral("The set of operands of the combined fragment.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("operands")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("operands")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("operands")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlcombinedfragment.h b/src/uml/qumlcombinedfragment.h
index f5ab6ad4..0c0fb48a 100644
--- a/src/uml/qumlcombinedfragment.h
+++ b/src/uml/qumlcombinedfragment.h
@@ -47,7 +47,6 @@
 
 
 #include <QtUml/QtUmlNamespace>
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -60,10 +59,10 @@ class QUmlInteractionOperand;
 class Q_UML_EXPORT QUmlCombinedFragment : public QUmlInteractionFragment
 {
 public:
-    explicit QUmlCombinedFragment(bool createQObject = true);
+    explicit QUmlCombinedFragment(bool createQModelingObject = true);
     virtual ~QUmlCombinedFragment();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlGate *> cfragmentGates() const;
@@ -79,9 +78,6 @@ protected:
     QSet<QUmlGate *> _cfragmentGates;
     QtUml::InteractionOperatorKind _interactionOperator;
     QList<QUmlInteractionOperand *> _operands;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlcomment.cpp b/src/uml/qumlcomment.cpp
index 05a08367..c3783423 100644
--- a/src/uml/qumlcomment.cpp
+++ b/src/uml/qumlcomment.cpp
@@ -51,24 +51,22 @@
 
     \brief A comment is a textual annotation that can be attached to a set of elements.
  */
-QUmlComment::QUmlComment(bool createQObject)
+QUmlComment::QUmlComment(bool createQModelingObject)
 {
-    if (createQObject)
-        _qObject = new QUmlCommentObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlCommentObject(this));
 }
 
 QUmlComment::~QUmlComment()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlComment::clone() const
+QModelingElement *QUmlComment::clone() const
 {
     QUmlComment *c = new QUmlComment;
     foreach (QUmlComment *element, ownedComments())
@@ -97,8 +95,8 @@ void QUmlComment::addAnnotatedElement(QUmlElement *annotatedElement)
 
     if (!_annotatedElements.contains(annotatedElement)) {
         _annotatedElements.insert(annotatedElement);
-        if (annotatedElement && annotatedElement->asQObject() && this->asQObject())
-            QObject::connect(annotatedElement->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeAnnotatedElement(QObject *)));
+        if (annotatedElement && annotatedElement->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(annotatedElement->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeAnnotatedElement(QObject *)));
     }
 }
 
@@ -130,36 +128,3 @@ void QUmlComment::setBody(QString body)
     }
 }
 
-void QUmlComment::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlComment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("annotatedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlComment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("body"))));
-}
-
-void QUmlComment::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComment")][QStringLiteral("annotatedElements")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComment")][QStringLiteral("annotatedElements")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlComment");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComment")][QStringLiteral("annotatedElements")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComment")][QStringLiteral("annotatedElements")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComment")][QStringLiteral("annotatedElements")][QtModeling::DocumentationRole] = QStringLiteral("References the Element(s) being commented.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComment")][QStringLiteral("annotatedElements")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComment")][QStringLiteral("annotatedElements")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComment")][QStringLiteral("annotatedElements")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComment")][QStringLiteral("body")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComment")][QStringLiteral("body")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlComment");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComment")][QStringLiteral("body")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComment")][QStringLiteral("body")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComment")][QStringLiteral("body")][QtModeling::DocumentationRole] = QStringLiteral("Specifies a string that is the comment.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComment")][QStringLiteral("body")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComment")][QStringLiteral("body")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComment")][QStringLiteral("body")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlcomment.h b/src/uml/qumlcomment.h
index 87bfbf49..00960b66 100644
--- a/src/uml/qumlcomment.h
+++ b/src/uml/qumlcomment.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,10 +54,10 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlComment : public QUmlElement
 {
 public:
-    explicit QUmlComment(bool createQObject = true);
+    explicit QUmlComment(bool createQModelingObject = true);
     virtual ~QUmlComment();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlElement *> annotatedElements() const;
@@ -70,9 +69,6 @@ public:
 protected:
     QSet<QUmlElement *> _annotatedElements;
     QString _body;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlcommunicationpath.cpp b/src/uml/qumlcommunicationpath.cpp
index d30b5d95..2bf47bb9 100644
--- a/src/uml/qumlcommunicationpath.cpp
+++ b/src/uml/qumlcommunicationpath.cpp
@@ -77,25 +77,23 @@
 
     \brief A communication path is an association between two deployment targets, through which they are able to exchange signals and messages.
  */
-QUmlCommunicationPath::QUmlCommunicationPath(bool createQObject) :
+QUmlCommunicationPath::QUmlCommunicationPath(bool createQModelingObject) :
     QUmlAssociation(false)
 {
-    if (createQObject)
-        _qObject = new QUmlCommunicationPathObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlCommunicationPathObject(this));
 }
 
 QUmlCommunicationPath::~QUmlCommunicationPath()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlCommunicationPath::clone() const
+QModelingElement *QUmlCommunicationPath::clone() const
 {
     QUmlCommunicationPath *c = new QUmlCommunicationPath;
     foreach (QUmlComment *element, ownedComments())
@@ -151,56 +149,3 @@ QModelingObject *QUmlCommunicationPath::clone() const
     return c;
 }
 
-void QUmlCommunicationPath::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generals"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlAssociation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("endTypes"))));
-    _groupProperties.insert(QStringLiteral("QUmlAssociation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isDerived"))));
-    _groupProperties.insert(QStringLiteral("QUmlAssociation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("memberEnds"))));
-    _groupProperties.insert(QStringLiteral("QUmlAssociation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("navigableOwnedEnds"))));
-    _groupProperties.insert(QStringLiteral("QUmlAssociation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedEnds"))));
-}
-
-void QUmlCommunicationPath::setPropertyData()
-{
-}
-
diff --git a/src/uml/qumlcommunicationpath.h b/src/uml/qumlcommunicationpath.h
index bb0263f3..96ea0608 100644
--- a/src/uml/qumlcommunicationpath.h
+++ b/src/uml/qumlcommunicationpath.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlAssociation>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,16 +54,13 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlCommunicationPath : public QUmlAssociation
 {
 public:
-    explicit QUmlCommunicationPath(bool createQObject = true);
+    explicit QUmlCommunicationPath(bool createQModelingObject = true);
     virtual ~QUmlCommunicationPath();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
 
 protected:
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlcomponent.cpp b/src/uml/qumlcomponent.cpp
index a9464fb4..be3543ca 100644
--- a/src/uml/qumlcomponent.cpp
+++ b/src/uml/qumlcomponent.cpp
@@ -88,26 +88,24 @@
 
     \brief In the namespace of a component, all model elements that are involved in or related to its definition are either owned or imported explicitly. This may include, for example, use cases and dependencies (e.g. mappings), packages, components, and artifacts.A component represents a modular part of a system that encapsulates its contents and whose manifestation is replaceable within its environment.
  */
-QUmlComponent::QUmlComponent(bool createQObject) :
+QUmlComponent::QUmlComponent(bool createQModelingObject) :
     QUmlClass(false),
     _isIndirectlyInstantiated(true)
 {
-    if (createQObject)
-        _qObject = new QUmlComponentObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlComponentObject(this));
 }
 
 QUmlComponent::~QUmlComponent()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlComponent::clone() const
+QModelingElement *QUmlComponent::clone() const
 {
     QUmlComponent *c = new QUmlComponent;
     foreach (QUmlComment *element, ownedComments())
@@ -196,7 +194,7 @@ void QUmlComponent::setIndirectlyInstantiated(bool isIndirectlyInstantiated)
 
     if (_isIndirectlyInstantiated != isIndirectlyInstantiated) {
         _isIndirectlyInstantiated = isIndirectlyInstantiated;
-        _modifiedResettableProperties << QStringLiteral("isIndirectlyInstantiated");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isIndirectlyInstantiated");
     }
 }
 
@@ -216,9 +214,9 @@ void QUmlComponent::addPackagedElement(QUmlPackageableElement *packagedElement)
 
     if (!_packagedElements.contains(packagedElement)) {
         _packagedElements.insert(packagedElement);
-        if (packagedElement && packagedElement->asQObject() && this->asQObject())
-            QObject::connect(packagedElement->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removePackagedElement(QObject *)));
-        packagedElement->asQObject()->setParent(this->asQObject());
+        if (packagedElement && packagedElement->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(packagedElement->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removePackagedElement(QObject *)));
+        packagedElement->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedMember(packagedElement);
@@ -231,8 +229,8 @@ void QUmlComponent::removePackagedElement(QUmlPackageableElement *packagedElemen
 
     if (_packagedElements.contains(packagedElement)) {
         _packagedElements.remove(packagedElement);
-        if (packagedElement->asQObject())
-            packagedElement->asQObject()->setParent(0);
+        if (packagedElement->asQModelingObject())
+            packagedElement->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedMember(packagedElement);
@@ -291,9 +289,9 @@ void QUmlComponent::addRealization(QUmlComponentRealization *realization)
 
     if (!_realizations.contains(realization)) {
         _realizations.insert(realization);
-        if (realization && realization->asQObject() && this->asQObject())
-            QObject::connect(realization->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeRealization(QObject *)));
-        realization->asQObject()->setParent(this->asQObject());
+        if (realization && realization->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(realization->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeRealization(QObject *)));
+        realization->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(realization);
@@ -311,8 +309,8 @@ void QUmlComponent::removeRealization(QUmlComponentRealization *realization)
 
     if (_realizations.contains(realization)) {
         _realizations.remove(realization);
-        if (realization->asQObject())
-            realization->asQObject()->setParent(0);
+        if (realization->asQModelingObject())
+            realization->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(realization);
@@ -384,113 +382,3 @@ QSet<QUmlInterface *> QUmlComponent::usedInterfaces(QUmlClassifier *classifier)
     return QSet<QUmlInterface *> ();
 }
 
-void QUmlComponent::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedConnectors"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parts"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("roles"))));
-    _groupProperties.insert(QStringLiteral("QUmlEncapsulatedClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedPorts"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifierBehavior"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interfaceRealizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedBehaviors"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extensions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isActive"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedReceptions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superClasses"))));
-    _groupProperties.insert(QStringLiteral("QUmlComponent"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isIndirectlyInstantiated"))));
-    _groupProperties.insert(QStringLiteral("QUmlComponent"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packagedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlComponent"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("provided"))));
-    _groupProperties.insert(QStringLiteral("QUmlComponent"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("realizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlComponent"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("required"))));
-}
-
-void QUmlComponent::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("isIndirectlyInstantiated")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("isIndirectlyInstantiated")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlComponent");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("isIndirectlyInstantiated")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("isIndirectlyInstantiated")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("isIndirectlyInstantiated")][QtModeling::DocumentationRole] = QStringLiteral("isIndirectlyInstantiated : Boolean {default = true} The kind of instantiation that applies to a Component. If false, the component is instantiated as an addressable object. If true, the Component is defined at design-time, but at run-time (or execution-time) an object specified by the Component does not exist, that is, the component is instantiated indirectly, through the instantiation of its realizing classifiers or parts. Several standard stereotypes use this meta attribute (e.g., specification, focus, subsystem).");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("isIndirectlyInstantiated")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("isIndirectlyInstantiated")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("isIndirectlyInstantiated")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("packagedElements")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("packagedElements")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlComponent");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("packagedElements")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("packagedElements")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("packagedElements")][QtModeling::DocumentationRole] = QStringLiteral("The set of PackageableElements that a Component owns. In the namespace of a component, all model elements that are involved in or related to its definition may be owned or imported explicitly. These may include e.g. Classes, Interfaces, Components, Packages, Use cases, Dependencies (e.g. mappings), and Artifacts.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("packagedElements")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("packagedElements")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("packagedElements")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("provided")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("provided")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlComponent");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("provided")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("provided")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("provided")][QtModeling::DocumentationRole] = QStringLiteral("The interfaces that the component exposes to its environment. These interfaces may be Realized by the Component or any of its realizingClassifiers, or they may be the Interfaces that are provided by its public Ports.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("provided")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("provided")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("provided")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("realizations")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("realizations")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlComponent");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("realizations")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("realizations")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("realizations")][QtModeling::DocumentationRole] = QStringLiteral("The set of Realizations owned by the Component. Realizations reference the Classifiers of which the Component is an abstraction; i.e., that realize its behavior.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("realizations")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("realizations")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_supplier_supplierDependency-supplierDependency Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("realizations")][QtModeling::OppositeEndRole] = QStringLiteral("ComponentRealization-abstraction");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("required")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("required")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlComponent");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("required")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("required")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("required")][QtModeling::DocumentationRole] = QStringLiteral("The interfaces that the component requires from other components in its environment in order to be able to offer its full set of provided functionality. These interfaces may be used by the Component or any of its realizingClassifiers, or they may be the Interfaces that are required by its public Ports.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("required")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("required")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("required")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlcomponent.h b/src/uml/qumlcomponent.h
index 5565cc7e..b9ee3d48 100644
--- a/src/uml/qumlcomponent.h
+++ b/src/uml/qumlcomponent.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlClass>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -60,10 +59,10 @@ class QUmlPackageableElement;
 class Q_UML_EXPORT QUmlComponent : public QUmlClass
 {
 public:
-    explicit QUmlComponent(bool createQObject = true);
+    explicit QUmlComponent(bool createQModelingObject = true);
     virtual ~QUmlComponent();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     bool isIndirectlyInstantiated() const;
@@ -89,9 +88,6 @@ protected:
     bool _isIndirectlyInstantiated;
     QSet<QUmlPackageableElement *> _packagedElements;
     QSet<QUmlComponentRealization *> _realizations;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlcomponentrealization.cpp b/src/uml/qumlcomponentrealization.cpp
index ea2b03c7..5a39848e 100644
--- a/src/uml/qumlcomponentrealization.cpp
+++ b/src/uml/qumlcomponentrealization.cpp
@@ -62,26 +62,24 @@
 
     \brief The realization concept is specialized to (optionally) define the classifiers that realize the contract offered by a component in terms of its provided and required interfaces. The component forms an abstraction from these various classifiers.
  */
-QUmlComponentRealization::QUmlComponentRealization(bool createQObject) :
+QUmlComponentRealization::QUmlComponentRealization(bool createQModelingObject) :
     QUmlRealization(false),
     _abstraction(0)
 {
-    if (createQObject)
-        _qObject = new QUmlComponentRealizationObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlComponentRealizationObject(this));
 }
 
 QUmlComponentRealization::~QUmlComponentRealization()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlComponentRealization::clone() const
+QModelingElement *QUmlComponentRealization::clone() const
 {
     QUmlComponentRealization *c = new QUmlComponentRealization;
     foreach (QUmlComment *element, ownedComments())
@@ -130,8 +128,8 @@ void QUmlComponentRealization::setAbstraction(QUmlComponent *abstraction)
         removeSupplier(_abstraction);
 
         _abstraction = abstraction;
-        if (abstraction && abstraction->asQObject() && this->asQObject())
-            QObject::connect(abstraction->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setAbstraction()));
+        if (abstraction && abstraction->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(abstraction->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setAbstraction()));
 
         // Adjust subsetted properties
         if (abstraction) {
@@ -157,8 +155,8 @@ void QUmlComponentRealization::addRealizingClassifier(QUmlClassifier *realizingC
 
     if (!_realizingClassifiers.contains(realizingClassifier)) {
         _realizingClassifiers.insert(realizingClassifier);
-        if (realizingClassifier && realizingClassifier->asQObject() && this->asQObject())
-            QObject::connect(realizingClassifier->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeRealizingClassifier(QObject *)));
+        if (realizingClassifier && realizingClassifier->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(realizingClassifier->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeRealizingClassifier(QObject *)));
 
         // Adjust subsetted properties
         addClient(realizingClassifier);
@@ -177,50 +175,3 @@ void QUmlComponentRealization::removeRealizingClassifier(QUmlClassifier *realizi
     }
 }
 
-void QUmlComponentRealization::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
-    _groupProperties.insert(QStringLiteral("QUmlDependency"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clients"))));
-    _groupProperties.insert(QStringLiteral("QUmlDependency"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("suppliers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAbstraction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("mapping"))));
-    _groupProperties.insert(QStringLiteral("QUmlComponentRealization"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("abstraction"))));
-    _groupProperties.insert(QStringLiteral("QUmlComponentRealization"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("realizingClassifiers"))));
-}
-
-void QUmlComponentRealization::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponentRealization")][QStringLiteral("abstraction")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponentRealization")][QStringLiteral("abstraction")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlComponentRealization");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponentRealization")][QStringLiteral("abstraction")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponentRealization")][QStringLiteral("abstraction")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponentRealization")][QStringLiteral("abstraction")][QtModeling::DocumentationRole] = QStringLiteral("The Component that owns this ComponentRealization and which is implemented by its realizing classifiers.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponentRealization")][QStringLiteral("abstraction")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponentRealization")][QStringLiteral("abstraction")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Dependency-supplier Element-owner");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponentRealization")][QStringLiteral("abstraction")][QtModeling::OppositeEndRole] = QStringLiteral("Component-realization");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponentRealization")][QStringLiteral("realizingClassifiers")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponentRealization")][QStringLiteral("realizingClassifiers")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlComponentRealization");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponentRealization")][QStringLiteral("realizingClassifiers")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponentRealization")][QStringLiteral("realizingClassifiers")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponentRealization")][QStringLiteral("realizingClassifiers")][QtModeling::DocumentationRole] = QStringLiteral("The classifiers that are involved in the implementation of the Component that owns this Realization.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponentRealization")][QStringLiteral("realizingClassifiers")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponentRealization")][QStringLiteral("realizingClassifiers")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Dependency-client");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponentRealization")][QStringLiteral("realizingClassifiers")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlcomponentrealization.h b/src/uml/qumlcomponentrealization.h
index 03f93f6d..f5c5842a 100644
--- a/src/uml/qumlcomponentrealization.h
+++ b/src/uml/qumlcomponentrealization.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlRealization>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlComponent;
 class Q_UML_EXPORT QUmlComponentRealization : public QUmlRealization
 {
 public:
-    explicit QUmlComponentRealization(bool createQObject = true);
+    explicit QUmlComponentRealization(bool createQModelingObject = true);
     virtual ~QUmlComponentRealization();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlComponent *abstraction() const;
@@ -73,9 +72,6 @@ public:
 protected:
     QUmlComponent *_abstraction;
     QSet<QUmlClassifier *> _realizingClassifiers;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlconditionalnode.cpp b/src/uml/qumlconditionalnode.cpp
index 2f593675..01735d4f 100644
--- a/src/uml/qumlconditionalnode.cpp
+++ b/src/uml/qumlconditionalnode.cpp
@@ -75,27 +75,25 @@
 
     \brief A conditional node is a structured activity node that represents an exclusive choice among some number of alternatives.
  */
-QUmlConditionalNode::QUmlConditionalNode(bool createQObject) :
+QUmlConditionalNode::QUmlConditionalNode(bool createQModelingObject) :
     QUmlStructuredActivityNode(false),
     _isAssured(false),
     _isDeterminate(false)
 {
-    if (createQObject)
-        _qObject = new QUmlConditionalNodeObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlConditionalNodeObject(this));
 }
 
 QUmlConditionalNode::~QUmlConditionalNode()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlConditionalNode::clone() const
+QModelingElement *QUmlConditionalNode::clone() const
 {
     QUmlConditionalNode *c = new QUmlConditionalNode;
     foreach (QUmlComment *element, ownedComments())
@@ -170,9 +168,9 @@ void QUmlConditionalNode::addClause(QUmlClause *clause)
 
     if (!_clauses.contains(clause)) {
         _clauses.insert(clause);
-        if (clause && clause->asQObject() && this->asQObject())
-            QObject::connect(clause->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeClause(QObject *)));
-        clause->asQObject()->setParent(this->asQObject());
+        if (clause && clause->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(clause->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeClause(QObject *)));
+        clause->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(clause);
@@ -185,8 +183,8 @@ void QUmlConditionalNode::removeClause(QUmlClause *clause)
 
     if (_clauses.contains(clause)) {
         _clauses.remove(clause);
-        if (clause->asQObject())
-            clause->asQObject()->setParent(0);
+        if (clause->asQModelingObject())
+            clause->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(clause);
@@ -209,7 +207,7 @@ void QUmlConditionalNode::setAssured(bool isAssured)
 
     if (_isAssured != isAssured) {
         _isAssured = isAssured;
-        _modifiedResettableProperties << QStringLiteral("isAssured");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isAssured");
     }
 }
 
@@ -229,7 +227,7 @@ void QUmlConditionalNode::setDeterminate(bool isDeterminate)
 
     if (_isDeterminate != isDeterminate) {
         _isDeterminate = isDeterminate;
-        _modifiedResettableProperties << QStringLiteral("isDeterminate");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isDeterminate");
     }
 }
 
@@ -249,9 +247,9 @@ void QUmlConditionalNode::addResult(QUmlOutputPin *result)
 
     if (!_results.contains(result)) {
         _results.append(result);
-        if (result && result->asQObject() && this->asQObject())
-            QObject::connect(result->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeResult(QObject *)));
-        result->asQObject()->setParent(this->asQObject());
+        if (result && result->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(result->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeResult(QObject *)));
+        result->asQModelingObject()->setParent(this->asQModelingObject());
     }
 }
 
@@ -261,100 +259,8 @@ void QUmlConditionalNode::removeResult(QUmlOutputPin *result)
 
     if (_results.contains(result)) {
         _results.removeAll(result);
-        if (result->asQObject())
-            result->asQObject()->setParent(0);
+        if (result->asQModelingObject())
+            result->asQModelingObject()->setParent(0);
     }
 }
 
-void QUmlConditionalNode::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("containedEdges"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("containedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("subgroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superGroup"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("edges"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("mustIsolate"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("structuredNodeInputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("variables"))));
-    _groupProperties.insert(QStringLiteral("QUmlConditionalNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clauses"))));
-    _groupProperties.insert(QStringLiteral("QUmlConditionalNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAssured"))));
-    _groupProperties.insert(QStringLiteral("QUmlConditionalNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isDeterminate"))));
-    _groupProperties.insert(QStringLiteral("QUmlConditionalNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("results"))));
-}
-
-void QUmlConditionalNode::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("clauses")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("clauses")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConditionalNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("clauses")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("clauses")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("clauses")][QtModeling::DocumentationRole] = QStringLiteral("Set of clauses composing the conditional.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("clauses")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("clauses")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("clauses")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("isAssured")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("isAssured")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConditionalNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("isAssured")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("isAssured")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("isAssured")][QtModeling::DocumentationRole] = QStringLiteral("If true, the modeler asserts that at least one test will succeed.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("isAssured")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("isAssured")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("isAssured")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("isDeterminate")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("isDeterminate")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConditionalNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("isDeterminate")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("isDeterminate")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("isDeterminate")][QtModeling::DocumentationRole] = QStringLiteral("If true, the modeler asserts that at most one test will succeed.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("isDeterminate")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("isDeterminate")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("isDeterminate")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("results")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("results")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConditionalNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("results")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("results")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("results")][QtModeling::DocumentationRole] = QStringLiteral("A list of output pins that constitute the data flow outputs of the conditional.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("results")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("StructuredActivityNode-structuredNodeOutput");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("results")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("results")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlconditionalnode.h b/src/uml/qumlconditionalnode.h
index 8be84c3c..4e249711 100644
--- a/src/uml/qumlconditionalnode.h
+++ b/src/uml/qumlconditionalnode.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlStructuredActivityNode>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlOutputPin;
 class Q_UML_EXPORT QUmlConditionalNode : public QUmlStructuredActivityNode
 {
 public:
-    explicit QUmlConditionalNode(bool createQObject = true);
+    explicit QUmlConditionalNode(bool createQModelingObject = true);
     virtual ~QUmlConditionalNode();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlClause *> clauses() const;
@@ -80,9 +79,6 @@ protected:
     bool _isAssured;
     bool _isDeterminate;
     QList<QUmlOutputPin *> _results;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlconnectableelement.cpp b/src/uml/qumlconnectableelement.cpp
index 0b30639f..a790194f 100644
--- a/src/uml/qumlconnectableelement.cpp
+++ b/src/uml/qumlconnectableelement.cpp
@@ -63,15 +63,13 @@
 QUmlConnectableElement::QUmlConnectableElement() :
     _templateParameter(0)
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlConnectableElement::~QUmlConnectableElement()
 {
 }
 
-QModelingObject *QUmlConnectableElement::clone() const
+QModelingElement *QUmlConnectableElement::clone() const
 {
     QUmlConnectableElement *c = new QUmlConnectableElement;
     foreach (QUmlComment *element, ownedComments())
@@ -155,49 +153,8 @@ void QUmlConnectableElement::setTemplateParameter(QUmlConnectableElementTemplate
 
     if (_templateParameter != templateParameter) {
         _templateParameter = templateParameter;
-        if (templateParameter && templateParameter->asQObject() && this->asQObject())
-            QObject::connect(templateParameter->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setTemplateParameter()));
+        if (templateParameter && templateParameter->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(templateParameter->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setTemplateParameter()));
     }
 }
 
-void QUmlConnectableElement::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlConnectableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ends"))));
-    _groupProperties.insert(QStringLiteral("QUmlConnectableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-}
-
-void QUmlConnectableElement::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectableElement")][QStringLiteral("ends")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectableElement")][QStringLiteral("ends")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConnectableElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectableElement")][QStringLiteral("ends")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectableElement")][QStringLiteral("ends")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectableElement")][QStringLiteral("ends")][QtModeling::DocumentationRole] = QStringLiteral("Denotes a set of connector ends that attaches to this connectable element.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectableElement")][QStringLiteral("ends")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectableElement")][QStringLiteral("ends")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectableElement")][QStringLiteral("ends")][QtModeling::OppositeEndRole] = QStringLiteral("ConnectorEnd-role");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectableElement")][QStringLiteral("templateParameter")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectableElement")][QStringLiteral("templateParameter")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConnectableElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectableElement")][QStringLiteral("templateParameter")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectableElement")][QStringLiteral("templateParameter")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectableElement")][QStringLiteral("templateParameter")][QtModeling::DocumentationRole] = QStringLiteral("The ConnectableElementTemplateParameter for this ConnectableElement parameter.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectableElement")][QStringLiteral("templateParameter")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("ParameterableElement-templateParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectableElement")][QStringLiteral("templateParameter")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectableElement")][QStringLiteral("templateParameter")][QtModeling::OppositeEndRole] = QStringLiteral("ConnectableElementTemplateParameter-parameteredElement");
-
-}
-
diff --git a/src/uml/qumlconnectableelement.h b/src/uml/qumlconnectableelement.h
index 748956a3..8f93ccfa 100644
--- a/src/uml/qumlconnectableelement.h
+++ b/src/uml/qumlconnectableelement.h
@@ -46,7 +46,6 @@
 #include <QtUml/QUmlTypedElement>
 #include <QtUml/QUmlParameterableElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -61,7 +60,7 @@ class Q_UML_EXPORT QUmlConnectableElement : public virtual QUmlTypedElement, pub
 public:
     virtual ~QUmlConnectableElement();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QList<QUmlConnectorEnd *> ends() const;
@@ -74,9 +73,6 @@ protected:
     explicit QUmlConnectableElement();
 
     QUmlConnectableElementTemplateParameter *_templateParameter;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlconnectableelementtemplateparameter.cpp b/src/uml/qumlconnectableelementtemplateparameter.cpp
index 9e3959bd..f27186af 100644
--- a/src/uml/qumlconnectableelementtemplateparameter.cpp
+++ b/src/uml/qumlconnectableelementtemplateparameter.cpp
@@ -55,26 +55,24 @@
 
     \brief A connectable element template parameter exposes a connectable element as a formal parameter for a template.
  */
-QUmlConnectableElementTemplateParameter::QUmlConnectableElementTemplateParameter(bool createQObject) :
+QUmlConnectableElementTemplateParameter::QUmlConnectableElementTemplateParameter(bool createQModelingObject) :
     QUmlTemplateParameter(false),
     _parameteredElement(0)
 {
-    if (createQObject)
-        _qObject = new QUmlConnectableElementTemplateParameterObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlConnectableElementTemplateParameterObject(this));
 }
 
 QUmlConnectableElementTemplateParameter::~QUmlConnectableElementTemplateParameter()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlConnectableElementTemplateParameter::clone() const
+QModelingElement *QUmlConnectableElementTemplateParameter::clone() const
 {
     QUmlConnectableElementTemplateParameter *c = new QUmlConnectableElementTemplateParameter;
     foreach (QUmlComment *element, ownedComments())
@@ -110,35 +108,8 @@ void QUmlConnectableElementTemplateParameter::setParameteredElement(QUmlConnecta
 
     if (_parameteredElement != parameteredElement) {
         _parameteredElement = parameteredElement;
-        if (parameteredElement && parameteredElement->asQObject() && this->asQObject())
-            QObject::connect(parameteredElement->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setParameteredElement()));
+        if (parameteredElement && parameteredElement->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(parameteredElement->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setParameteredElement()));
     }
 }
 
-void QUmlConnectableElementTemplateParameter::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("default_"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedDefault"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameteredElement"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("signature"))));
-    _groupProperties.insert(QStringLiteral("QUmlConnectableElementTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parameteredElement"))));
-}
-
-void QUmlConnectableElementTemplateParameter::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectableElementTemplateParameter")][QStringLiteral("parameteredElement")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectableElementTemplateParameter")][QStringLiteral("parameteredElement")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConnectableElementTemplateParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectableElementTemplateParameter")][QStringLiteral("parameteredElement")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectableElementTemplateParameter")][QStringLiteral("parameteredElement")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectableElementTemplateParameter")][QStringLiteral("parameteredElement")][QtModeling::DocumentationRole] = QStringLiteral("The ConnectableElement for this template parameter.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectableElementTemplateParameter")][QStringLiteral("parameteredElement")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("TemplateParameter-parameteredElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectableElementTemplateParameter")][QStringLiteral("parameteredElement")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectableElementTemplateParameter")][QStringLiteral("parameteredElement")][QtModeling::OppositeEndRole] = QStringLiteral("ConnectableElement-templateParameter");
-
-}
-
diff --git a/src/uml/qumlconnectableelementtemplateparameter.h b/src/uml/qumlconnectableelementtemplateparameter.h
index cfd6d977..d1894dbd 100644
--- a/src/uml/qumlconnectableelementtemplateparameter.h
+++ b/src/uml/qumlconnectableelementtemplateparameter.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlTemplateParameter>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlConnectableElement;
 class Q_UML_EXPORT QUmlConnectableElementTemplateParameter : public QUmlTemplateParameter
 {
 public:
-    explicit QUmlConnectableElementTemplateParameter(bool createQObject = true);
+    explicit QUmlConnectableElementTemplateParameter(bool createQModelingObject = true);
     virtual ~QUmlConnectableElementTemplateParameter();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlConnectableElement *parameteredElement() const;
@@ -68,9 +67,6 @@ public:
 
 protected:
     QUmlConnectableElement *_parameteredElement;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlconnectionpointreference.cpp b/src/uml/qumlconnectionpointreference.cpp
index d1979aae..1e0d5f2a 100644
--- a/src/uml/qumlconnectionpointreference.cpp
+++ b/src/uml/qumlconnectionpointreference.cpp
@@ -62,25 +62,23 @@
 
     \brief A connection point reference represents a usage (as part of a submachine state) of an entry/exit point defined in the statemachine reference by the submachine state.
  */
-QUmlConnectionPointReference::QUmlConnectionPointReference(bool createQObject) :
+QUmlConnectionPointReference::QUmlConnectionPointReference(bool createQModelingObject) :
     _state(0)
 {
-    if (createQObject)
-        _qObject = new QUmlConnectionPointReferenceObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlConnectionPointReferenceObject(this));
 }
 
 QUmlConnectionPointReference::~QUmlConnectionPointReference()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlConnectionPointReference::clone() const
+QModelingElement *QUmlConnectionPointReference::clone() const
 {
     QUmlConnectionPointReference *c = new QUmlConnectionPointReference;
     foreach (QUmlComment *element, ownedComments())
@@ -120,8 +118,8 @@ void QUmlConnectionPointReference::addEntry(QUmlPseudostate *entry)
 
     if (!_entries.contains(entry)) {
         _entries.insert(entry);
-        if (entry && entry->asQObject() && this->asQObject())
-            QObject::connect(entry->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeEntry(QObject *)));
+        if (entry && entry->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(entry->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeEntry(QObject *)));
     }
 }
 
@@ -150,8 +148,8 @@ void QUmlConnectionPointReference::addExit(QUmlPseudostate *exit)
 
     if (!_exits.contains(exit)) {
         _exits.insert(exit);
-        if (exit && exit->asQObject() && this->asQObject())
-            QObject::connect(exit->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeExit(QObject *)));
+        if (exit && exit->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(exit->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeExit(QObject *)));
     }
 }
 
@@ -182,63 +180,11 @@ void QUmlConnectionPointReference::setState(QUmlState *state)
         // Adjust subsetted properties
 
         _state = state;
-        if (state && state->asQObject() && this->asQObject())
-            QObject::connect(state->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setState()));
+        if (state && state->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(state->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setState()));
 
         // Adjust subsetted properties
         setNamespace(state);
     }
 }
 
-void QUmlConnectionPointReference::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlVertex"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("container"))));
-    _groupProperties.insert(QStringLiteral("QUmlVertex"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlVertex"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlConnectionPointReference"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("entries"))));
-    _groupProperties.insert(QStringLiteral("QUmlConnectionPointReference"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("exits"))));
-    _groupProperties.insert(QStringLiteral("QUmlConnectionPointReference"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("state"))));
-}
-
-void QUmlConnectionPointReference::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("entries")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("entries")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConnectionPointReference");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("entries")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("entries")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("entries")][QtModeling::DocumentationRole] = QStringLiteral("The entryPoint kind pseudo states corresponding to this connection point.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("entries")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("entries")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("entries")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("exits")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("exits")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConnectionPointReference");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("exits")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("exits")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("exits")][QtModeling::DocumentationRole] = QStringLiteral("The exitPoints kind pseudo states corresponding to this connection point.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("exits")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("exits")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("exits")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("state")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("state")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConnectionPointReference");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("state")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("state")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("state")][QtModeling::DocumentationRole] = QStringLiteral("The State in which the connection point refreshens are defined.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("state")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("state")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("state")][QtModeling::OppositeEndRole] = QStringLiteral("State-connection");
-
-}
-
diff --git a/src/uml/qumlconnectionpointreference.h b/src/uml/qumlconnectionpointreference.h
index 963c3a74..981c7893 100644
--- a/src/uml/qumlconnectionpointreference.h
+++ b/src/uml/qumlconnectionpointreference.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlVertex>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlState;
 class Q_UML_EXPORT QUmlConnectionPointReference : public QUmlVertex
 {
 public:
-    explicit QUmlConnectionPointReference(bool createQObject = true);
+    explicit QUmlConnectionPointReference(bool createQModelingObject = true);
     virtual ~QUmlConnectionPointReference();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlPseudostate *> entries() const;
@@ -77,9 +76,6 @@ protected:
     QSet<QUmlPseudostate *> _entries;
     QSet<QUmlPseudostate *> _exits;
     QUmlState *_state;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlconnector.cpp b/src/uml/qumlconnector.cpp
index 9406f368..1626a0f5 100644
--- a/src/uml/qumlconnector.cpp
+++ b/src/uml/qumlconnector.cpp
@@ -62,25 +62,23 @@
 
     \brief A delegation connector is a connector that links the external contract of a component (as specified by its ports) to the realization of that behavior. It represents the forwarding of events (operation requests and events): a signal that arrives at a port that has a delegation connector to one or more parts or ports on parts will be passed on to those targets for handling. An assembly connector is a connector between two or more parts or ports on parts that defines that one or more parts provide the services that other parts use.Specifies a link that enables communication between two or more instances. This link may be an instance of an association, or it may represent the possibility of the instances being able to communicate because their identities are known by virtue of being passed in as parameters, held in variables or slots, or because the communicating instances are the same instance. The link may be realized by something as simple as a pointer or by something as complex as a network connection. In contrast to associations, which specify links between any instance of the associated classifiers, connectors specify links between instances playing the connected parts only.
  */
-QUmlConnector::QUmlConnector(bool createQObject) :
+QUmlConnector::QUmlConnector(bool createQModelingObject) :
     _type(0)
 {
-    if (createQObject)
-        _qObject = new QUmlConnectorObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlConnectorObject(this));
 }
 
 QUmlConnector::~QUmlConnector()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlConnector::clone() const
+QModelingElement *QUmlConnector::clone() const
 {
     QUmlConnector *c = new QUmlConnector;
     foreach (QUmlComment *element, ownedComments())
@@ -122,8 +120,8 @@ void QUmlConnector::addContract(QUmlBehavior *contract)
 
     if (!_contracts.contains(contract)) {
         _contracts.insert(contract);
-        if (contract && contract->asQObject() && this->asQObject())
-            QObject::connect(contract->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeContract(QObject *)));
+        if (contract && contract->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(contract->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeContract(QObject *)));
     }
 }
 
@@ -152,9 +150,9 @@ void QUmlConnector::addEnd(QUmlConnectorEnd *end)
 
     if (!_ends.contains(end)) {
         _ends.append(end);
-        if (end && end->asQObject() && this->asQObject())
-            QObject::connect(end->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeEnd(QObject *)));
-        end->asQObject()->setParent(this->asQObject());
+        if (end && end->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(end->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeEnd(QObject *)));
+        end->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(end);
@@ -167,8 +165,8 @@ void QUmlConnector::removeEnd(QUmlConnectorEnd *end)
 
     if (_ends.contains(end)) {
         _ends.removeAll(end);
-        if (end->asQObject())
-            end->asQObject()->setParent(0);
+        if (end->asQModelingObject())
+            end->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(end);
@@ -215,8 +213,8 @@ void QUmlConnector::addRedefinedConnector(QUmlConnector *redefinedConnector)
 
     if (!_redefinedConnectors.contains(redefinedConnector)) {
         _redefinedConnectors.insert(redefinedConnector);
-        if (redefinedConnector && redefinedConnector->asQObject() && this->asQObject())
-            QObject::connect(redefinedConnector->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeRedefinedConnector(QObject *)));
+        if (redefinedConnector && redefinedConnector->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(redefinedConnector->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeRedefinedConnector(QObject *)));
 
         // Adjust subsetted properties
         addRedefinedElement(redefinedConnector);
@@ -251,82 +249,8 @@ void QUmlConnector::setType(QUmlAssociation *type)
 
     if (_type != type) {
         _type = type;
-        if (type && type->asQObject() && this->asQObject())
-            QObject::connect(type->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setType()));
+        if (type && type->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(type->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setType()));
     }
 }
 
-void QUmlConnector::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("featuringClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isStatic"))));
-    _groupProperties.insert(QStringLiteral("QUmlConnector"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("contracts"))));
-    _groupProperties.insert(QStringLiteral("QUmlConnector"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ends"))));
-    _groupProperties.insert(QStringLiteral("QUmlConnector"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("kind"))));
-    _groupProperties.insert(QStringLiteral("QUmlConnector"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedConnectors"))));
-    _groupProperties.insert(QStringLiteral("QUmlConnector"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
-}
-
-void QUmlConnector::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("contracts")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("contracts")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConnector");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("contracts")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("contracts")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("contracts")][QtModeling::DocumentationRole] = QStringLiteral("The set of Behaviors that specify the valid interaction patterns across the connector.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("contracts")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("contracts")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("contracts")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("ends")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("ends")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConnector");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("ends")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("ends")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("ends")][QtModeling::DocumentationRole] = QStringLiteral("A connector consists of at least two connector ends, each representing the participation of instances of the classifiers typing the connectable elements attached to this end. The set of connector ends is ordered.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("ends")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("ends")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("ends")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("kind")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("kind")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConnector");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("kind")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("kind")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("kind")][QtModeling::DocumentationRole] = QStringLiteral("Indicates the kind of connector. This is derived: a connector with one or more ends connected to a Port which is not on a Part and which is not a behavior port is a delegation; otherwise it is an assembly.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("kind")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("kind")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("kind")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("redefinedConnectors")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("redefinedConnectors")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConnector");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("redefinedConnectors")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("redefinedConnectors")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("redefinedConnectors")][QtModeling::DocumentationRole] = QStringLiteral("A connector may be redefined when its containing classifier is specialized. The redefining connector may have a type that specializes the type of the redefined connector. The types of the connector ends of the redefining connector may specialize the types of the connector ends of the redefined connector. The properties of the connector ends of the redefining connector may be replaced.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("redefinedConnectors")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("redefinedConnectors")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("RedefinableElement-redefinedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("redefinedConnectors")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("type")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("type")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConnector");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("type")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("type")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("type")][QtModeling::DocumentationRole] = QStringLiteral("An optional association that specifies the link corresponding to this connector.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("type")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("type")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("type")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlconnector.h b/src/uml/qumlconnector.h
index 9c5618ee..a30782bd 100644
--- a/src/uml/qumlconnector.h
+++ b/src/uml/qumlconnector.h
@@ -47,7 +47,6 @@
 
 
 #include <QtUml/QtUmlNamespace>
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -61,10 +60,10 @@ class QUmlConnectorEnd;
 class Q_UML_EXPORT QUmlConnector : public QUmlFeature
 {
 public:
-    explicit QUmlConnector(bool createQObject = true);
+    explicit QUmlConnector(bool createQModelingObject = true);
     virtual ~QUmlConnector();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlBehavior *> contracts() const;
@@ -86,9 +85,6 @@ protected:
     QList<QUmlConnectorEnd *> _ends;
     QSet<QUmlConnector *> _redefinedConnectors;
     QUmlAssociation *_type;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlconnectorend.cpp b/src/uml/qumlconnectorend.cpp
index 369f581e..ddc02f5c 100644
--- a/src/uml/qumlconnectorend.cpp
+++ b/src/uml/qumlconnectorend.cpp
@@ -56,26 +56,24 @@
 
     \brief A connector end is an endpoint of a connector, which attaches the connector to a connectable element. Each connector end is part of one connector.
  */
-QUmlConnectorEnd::QUmlConnectorEnd(bool createQObject) :
+QUmlConnectorEnd::QUmlConnectorEnd(bool createQModelingObject) :
     _partWithPort(0),
     _role(0)
 {
-    if (createQObject)
-        _qObject = new QUmlConnectorEndObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlConnectorEndObject(this));
 }
 
 QUmlConnectorEnd::~QUmlConnectorEnd()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlConnectorEnd::clone() const
+QModelingElement *QUmlConnectorEnd::clone() const
 {
     QUmlConnectorEnd *c = new QUmlConnectorEnd;
     foreach (QUmlComment *element, ownedComments())
@@ -135,8 +133,8 @@ void QUmlConnectorEnd::setPartWithPort(QUmlProperty *partWithPort)
 
     if (_partWithPort != partWithPort) {
         _partWithPort = partWithPort;
-        if (partWithPort && partWithPort->asQObject() && this->asQObject())
-            QObject::connect(partWithPort->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setPartWithPort()));
+        if (partWithPort && partWithPort->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(partWithPort->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setPartWithPort()));
     }
 }
 
@@ -156,57 +154,8 @@ void QUmlConnectorEnd::setRole(QUmlConnectableElement *role)
 
     if (_role != role) {
         _role = role;
-        if (role && role->asQObject() && this->asQObject())
-            QObject::connect(role->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setRole()));
+        if (role && role->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(role->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setRole()));
     }
 }
 
-void QUmlConnectorEnd::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isOrdered"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isUnique"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lower"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lowerValue"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upper"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperValue"))));
-    _groupProperties.insert(QStringLiteral("QUmlConnectorEnd"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("definingEnd"))));
-    _groupProperties.insert(QStringLiteral("QUmlConnectorEnd"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("partWithPort"))));
-    _groupProperties.insert(QStringLiteral("QUmlConnectorEnd"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("role"))));
-}
-
-void QUmlConnectorEnd::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectorEnd")][QStringLiteral("definingEnd")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectorEnd")][QStringLiteral("definingEnd")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConnectorEnd");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectorEnd")][QStringLiteral("definingEnd")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectorEnd")][QStringLiteral("definingEnd")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectorEnd")][QStringLiteral("definingEnd")][QtModeling::DocumentationRole] = QStringLiteral("A derived association referencing the corresponding association end on the association which types the connector owing this connector end. This association is derived by selecting the association end at the same place in the ordering of association ends as this connector end.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectorEnd")][QStringLiteral("definingEnd")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectorEnd")][QStringLiteral("definingEnd")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectorEnd")][QStringLiteral("definingEnd")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectorEnd")][QStringLiteral("partWithPort")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectorEnd")][QStringLiteral("partWithPort")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConnectorEnd");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectorEnd")][QStringLiteral("partWithPort")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectorEnd")][QStringLiteral("partWithPort")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectorEnd")][QStringLiteral("partWithPort")][QtModeling::DocumentationRole] = QStringLiteral("Indicates the role of the internal structure of a classifier with the port to which the connector end is attached.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectorEnd")][QStringLiteral("partWithPort")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectorEnd")][QStringLiteral("partWithPort")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectorEnd")][QStringLiteral("partWithPort")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectorEnd")][QStringLiteral("role")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectorEnd")][QStringLiteral("role")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConnectorEnd");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectorEnd")][QStringLiteral("role")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectorEnd")][QStringLiteral("role")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectorEnd")][QStringLiteral("role")][QtModeling::DocumentationRole] = QStringLiteral("The connectable element attached at this connector end. When an instance of the containing classifier is created, a link may (depending on the multiplicities) be created to an instance of the classifier that types this connectable element.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectorEnd")][QStringLiteral("role")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectorEnd")][QStringLiteral("role")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectorEnd")][QStringLiteral("role")][QtModeling::OppositeEndRole] = QStringLiteral("ConnectableElement-end");
-
-}
-
diff --git a/src/uml/qumlconnectorend.h b/src/uml/qumlconnectorend.h
index 7b7f5d63..a4aaa421 100644
--- a/src/uml/qumlconnectorend.h
+++ b/src/uml/qumlconnectorend.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlMultiplicityElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlProperty;
 class Q_UML_EXPORT QUmlConnectorEnd : public QUmlMultiplicityElement
 {
 public:
-    explicit QUmlConnectorEnd(bool createQObject = true);
+    explicit QUmlConnectorEnd(bool createQModelingObject = true);
     virtual ~QUmlConnectorEnd();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlProperty *definingEnd() const;
@@ -74,9 +73,6 @@ public:
 protected:
     QUmlProperty *_partWithPort;
     QUmlConnectableElement *_role;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlconsiderignorefragment.cpp b/src/uml/qumlconsiderignorefragment.cpp
index d0f95536..8c47bd8f 100644
--- a/src/uml/qumlconsiderignorefragment.cpp
+++ b/src/uml/qumlconsiderignorefragment.cpp
@@ -62,25 +62,23 @@
 
     \brief A consider ignore fragment is a kind of combined fragment that is used for the consider and ignore cases, which require lists of pertinent messages to be specified.
  */
-QUmlConsiderIgnoreFragment::QUmlConsiderIgnoreFragment(bool createQObject) :
+QUmlConsiderIgnoreFragment::QUmlConsiderIgnoreFragment(bool createQModelingObject) :
     QUmlCombinedFragment(false)
 {
-    if (createQObject)
-        _qObject = new QUmlConsiderIgnoreFragmentObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlConsiderIgnoreFragmentObject(this));
 }
 
 QUmlConsiderIgnoreFragment::~QUmlConsiderIgnoreFragment()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlConsiderIgnoreFragment::clone() const
+QModelingElement *QUmlConsiderIgnoreFragment::clone() const
 {
     QUmlConsiderIgnoreFragment *c = new QUmlConsiderIgnoreFragment;
     foreach (QUmlComment *element, ownedComments())
@@ -127,8 +125,8 @@ void QUmlConsiderIgnoreFragment::addMessage(QUmlNamedElement *message)
 
     if (!_messages.contains(message)) {
         _messages.insert(message);
-        if (message && message->asQObject() && this->asQObject())
-            QObject::connect(message->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeMessage(QObject *)));
+        if (message && message->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(message->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeMessage(QObject *)));
     }
 }
 
@@ -141,39 +139,3 @@ void QUmlConsiderIgnoreFragment::removeMessage(QUmlNamedElement *message)
     }
 }
 
-void QUmlConsiderIgnoreFragment::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("covered"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingInteraction"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingOperand"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalOrderings"))));
-    _groupProperties.insert(QStringLiteral("QUmlCombinedFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("cfragmentGates"))));
-    _groupProperties.insert(QStringLiteral("QUmlCombinedFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interactionOperator"))));
-    _groupProperties.insert(QStringLiteral("QUmlCombinedFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("operands"))));
-    _groupProperties.insert(QStringLiteral("QUmlConsiderIgnoreFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("messages"))));
-}
-
-void QUmlConsiderIgnoreFragment::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConsiderIgnoreFragment")][QStringLiteral("messages")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConsiderIgnoreFragment")][QStringLiteral("messages")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConsiderIgnoreFragment");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConsiderIgnoreFragment")][QStringLiteral("messages")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConsiderIgnoreFragment")][QStringLiteral("messages")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConsiderIgnoreFragment")][QStringLiteral("messages")][QtModeling::DocumentationRole] = QStringLiteral("The set of messages that apply to this fragment");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConsiderIgnoreFragment")][QStringLiteral("messages")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConsiderIgnoreFragment")][QStringLiteral("messages")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConsiderIgnoreFragment")][QStringLiteral("messages")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlconsiderignorefragment.h b/src/uml/qumlconsiderignorefragment.h
index c41c3e61..9797f49e 100644
--- a/src/uml/qumlconsiderignorefragment.h
+++ b/src/uml/qumlconsiderignorefragment.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlCombinedFragment>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlNamedElement;
 class Q_UML_EXPORT QUmlConsiderIgnoreFragment : public QUmlCombinedFragment
 {
 public:
-    explicit QUmlConsiderIgnoreFragment(bool createQObject = true);
+    explicit QUmlConsiderIgnoreFragment(bool createQModelingObject = true);
     virtual ~QUmlConsiderIgnoreFragment();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlNamedElement *> messages() const;
@@ -69,9 +68,6 @@ public:
 
 protected:
     QSet<QUmlNamedElement *> _messages;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlconstraint.cpp b/src/uml/qumlconstraint.cpp
index a27eeafb..efa3d4f7 100644
--- a/src/uml/qumlconstraint.cpp
+++ b/src/uml/qumlconstraint.cpp
@@ -60,26 +60,24 @@
 
     \brief A constraint is a condition or restriction expressed in natural language text or in a machine readable language for the purpose of declaring some of the semantics of an element.
  */
-QUmlConstraint::QUmlConstraint(bool createQObject) :
+QUmlConstraint::QUmlConstraint(bool createQModelingObject) :
     _context(0),
     _specification(0)
 {
-    if (createQObject)
-        _qObject = new QUmlConstraintObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlConstraintObject(this));
 }
 
 QUmlConstraint::~QUmlConstraint()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlConstraint::clone() const
+QModelingElement *QUmlConstraint::clone() const
 {
     QUmlConstraint *c = new QUmlConstraint;
     foreach (QUmlComment *element, ownedComments())
@@ -121,8 +119,8 @@ void QUmlConstraint::addConstrainedElement(QUmlElement *constrainedElement)
 
     if (!_constrainedElements.contains(constrainedElement)) {
         _constrainedElements.append(constrainedElement);
-        if (constrainedElement && constrainedElement->asQObject() && this->asQObject())
-            QObject::connect(constrainedElement->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeConstrainedElement(QObject *)));
+        if (constrainedElement && constrainedElement->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(constrainedElement->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeConstrainedElement(QObject *)));
     }
 }
 
@@ -153,8 +151,8 @@ void QUmlConstraint::setContext(QUmlNamespace *context)
         // Adjust subsetted properties
 
         _context = context;
-        if (context && context->asQObject() && this->asQObject())
-            QObject::connect(context->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setContext()));
+        if (context && context->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(context->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setContext()));
 
         // Adjust subsetted properties
         setNamespace(context);
@@ -180,9 +178,9 @@ void QUmlConstraint::setSpecification(QUmlValueSpecification *specification)
         removeOwnedElement(_specification);
 
         _specification = specification;
-        if (specification && specification->asQObject() && this->asQObject())
-            QObject::connect(specification->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setSpecification()));
-        specification->asQObject()->setParent(this->asQObject());
+        if (specification && specification->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(specification->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setSpecification()));
+        specification->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (specification) {
@@ -191,54 +189,3 @@ void QUmlConstraint::setSpecification(QUmlValueSpecification *specification)
     }
 }
 
-void QUmlConstraint::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlConstraint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("constrainedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlConstraint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlConstraint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("specification"))));
-}
-
-void QUmlConstraint::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConstraint")][QStringLiteral("constrainedElements")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConstraint")][QStringLiteral("constrainedElements")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConstraint");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConstraint")][QStringLiteral("constrainedElements")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConstraint")][QStringLiteral("constrainedElements")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConstraint")][QStringLiteral("constrainedElements")][QtModeling::DocumentationRole] = QStringLiteral("The ordered set of Elements referenced by this Constraint.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConstraint")][QStringLiteral("constrainedElements")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConstraint")][QStringLiteral("constrainedElements")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConstraint")][QStringLiteral("constrainedElements")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConstraint")][QStringLiteral("context")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConstraint")][QStringLiteral("context")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConstraint");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConstraint")][QStringLiteral("context")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConstraint")][QStringLiteral("context")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConstraint")][QStringLiteral("context")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the namespace that owns the NamedElement.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConstraint")][QStringLiteral("context")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConstraint")][QStringLiteral("context")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConstraint")][QStringLiteral("context")][QtModeling::OppositeEndRole] = QStringLiteral("Namespace-ownedRule");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConstraint")][QStringLiteral("specification")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConstraint")][QStringLiteral("specification")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConstraint");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConstraint")][QStringLiteral("specification")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConstraint")][QStringLiteral("specification")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConstraint")][QStringLiteral("specification")][QtModeling::DocumentationRole] = QStringLiteral("A condition that must be true when evaluated in order for the constraint to be satisfied.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConstraint")][QStringLiteral("specification")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConstraint")][QStringLiteral("specification")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlConstraint")][QStringLiteral("specification")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlconstraint.h b/src/uml/qumlconstraint.h
index 297b0044..c9b1a3a7 100644
--- a/src/uml/qumlconstraint.h
+++ b/src/uml/qumlconstraint.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlPackageableElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -59,10 +58,10 @@ class QUmlValueSpecification;
 class Q_UML_EXPORT QUmlConstraint : public QUmlPackageableElement
 {
 public:
-    explicit QUmlConstraint(bool createQObject = true);
+    explicit QUmlConstraint(bool createQModelingObject = true);
     virtual ~QUmlConstraint();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QList<QUmlElement *> constrainedElements() const;
@@ -77,9 +76,6 @@ protected:
     QList<QUmlElement *> _constrainedElements;
     QUmlNamespace *_context;
     QUmlValueSpecification *_specification;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlcontinuation.cpp b/src/uml/qumlcontinuation.cpp
index e66e6a3a..5ef4f10b 100644
--- a/src/uml/qumlcontinuation.cpp
+++ b/src/uml/qumlcontinuation.cpp
@@ -61,25 +61,23 @@
 
     \brief A continuation is a syntactic way to define continuations of different branches of an alternative combined fragment. Continuations is intuitively similar to labels representing intermediate points in a flow of control.
  */
-QUmlContinuation::QUmlContinuation(bool createQObject) :
+QUmlContinuation::QUmlContinuation(bool createQModelingObject) :
     _setting(true)
 {
-    if (createQObject)
-        _qObject = new QUmlContinuationObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlContinuationObject(this));
 }
 
 QUmlContinuation::~QUmlContinuation()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlContinuation::clone() const
+QModelingElement *QUmlContinuation::clone() const
 {
     QUmlContinuation *c = new QUmlContinuation;
     foreach (QUmlComment *element, ownedComments())
@@ -120,40 +118,7 @@ void QUmlContinuation::setSetting(bool setting)
 
     if (_setting != setting) {
         _setting = setting;
-        _modifiedResettableProperties << QStringLiteral("setting");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("setting");
     }
 }
 
-void QUmlContinuation::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("covered"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingInteraction"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingOperand"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalOrderings"))));
-    _groupProperties.insert(QStringLiteral("QUmlContinuation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("setting"))));
-}
-
-void QUmlContinuation::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlContinuation")][QStringLiteral("setting")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlContinuation")][QStringLiteral("setting")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlContinuation");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlContinuation")][QStringLiteral("setting")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlContinuation")][QStringLiteral("setting")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlContinuation")][QStringLiteral("setting")][QtModeling::DocumentationRole] = QStringLiteral("True: when the Continuation is at the end of the enclosing InteractionFragment and False when it is in the beginning.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlContinuation")][QStringLiteral("setting")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlContinuation")][QStringLiteral("setting")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlContinuation")][QStringLiteral("setting")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlcontinuation.h b/src/uml/qumlcontinuation.h
index 14b47f57..1e1fc1f1 100644
--- a/src/uml/qumlcontinuation.h
+++ b/src/uml/qumlcontinuation.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlInteractionFragment>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,10 +54,10 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlContinuation : public QUmlInteractionFragment
 {
 public:
-    explicit QUmlContinuation(bool createQObject = true);
+    explicit QUmlContinuation(bool createQModelingObject = true);
     virtual ~QUmlContinuation();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     bool setting() const;
@@ -66,9 +65,6 @@ public:
 
 protected:
     bool _setting;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlcontrolflow.cpp b/src/uml/qumlcontrolflow.cpp
index 39463a3d..06bc8dbf 100644
--- a/src/uml/qumlcontrolflow.cpp
+++ b/src/uml/qumlcontrolflow.cpp
@@ -67,24 +67,22 @@
 
     \brief A control flow is an edge that starts an activity node after the previous one is finished.
  */
-QUmlControlFlow::QUmlControlFlow(bool createQObject)
+QUmlControlFlow::QUmlControlFlow(bool createQModelingObject)
 {
-    if (createQObject)
-        _qObject = new QUmlControlFlowObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlControlFlowObject(this));
 }
 
 QUmlControlFlow::~QUmlControlFlow()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlControlFlow::clone() const
+QModelingElement *QUmlControlFlow::clone() const
 {
     QUmlControlFlow *c = new QUmlControlFlow;
     foreach (QUmlComment *element, ownedComments())
@@ -117,35 +115,3 @@ QModelingObject *QUmlControlFlow::clone() const
     return c;
 }
 
-void QUmlControlFlow::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("guard"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interrupts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedEdges"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("source"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("target"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("weight"))));
-}
-
-void QUmlControlFlow::setPropertyData()
-{
-}
-
diff --git a/src/uml/qumlcontrolflow.h b/src/uml/qumlcontrolflow.h
index e8ae3bd5..6ef6dd6c 100644
--- a/src/uml/qumlcontrolflow.h
+++ b/src/uml/qumlcontrolflow.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlActivityEdge>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,16 +54,13 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlControlFlow : public QUmlActivityEdge
 {
 public:
-    explicit QUmlControlFlow(bool createQObject = true);
+    explicit QUmlControlFlow(bool createQModelingObject = true);
     virtual ~QUmlControlFlow();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
 
 protected:
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlcontrolnode.cpp b/src/uml/qumlcontrolnode.cpp
index 36ae9b58..e805a900 100644
--- a/src/uml/qumlcontrolnode.cpp
+++ b/src/uml/qumlcontrolnode.cpp
@@ -66,15 +66,13 @@
  */
 QUmlControlNode::QUmlControlNode()
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlControlNode::~QUmlControlNode()
 {
 }
 
-QModelingObject *QUmlControlNode::clone() const
+QModelingElement *QUmlControlNode::clone() const
 {
     QUmlControlNode *c = new QUmlControlNode;
     foreach (QUmlComment *element, ownedComments())
@@ -103,33 +101,3 @@ QModelingObject *QUmlControlNode::clone() const
     return c;
 }
 
-void QUmlControlNode::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-}
-
-void QUmlControlNode::setPropertyData()
-{
-}
-
diff --git a/src/uml/qumlcontrolnode.h b/src/uml/qumlcontrolnode.h
index 6204aebd..92f07a24 100644
--- a/src/uml/qumlcontrolnode.h
+++ b/src/uml/qumlcontrolnode.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlActivityNode>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,15 +56,12 @@ class Q_UML_EXPORT QUmlControlNode : public QUmlActivityNode
 public:
     virtual ~QUmlControlNode();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
 
 protected:
     explicit QUmlControlNode();
 
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlcreatelinkaction.cpp b/src/uml/qumlcreatelinkaction.cpp
index a23e0507..ad1c2868 100644
--- a/src/uml/qumlcreatelinkaction.cpp
+++ b/src/uml/qumlcreatelinkaction.cpp
@@ -73,24 +73,22 @@
 
     \brief A create link action is a write link action for creating links.
  */
-QUmlCreateLinkAction::QUmlCreateLinkAction(bool createQObject)
+QUmlCreateLinkAction::QUmlCreateLinkAction(bool createQModelingObject)
 {
-    if (createQObject)
-        _qObject = new QUmlCreateLinkActionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlCreateLinkActionObject(this));
 }
 
 QUmlCreateLinkAction::~QUmlCreateLinkAction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlCreateLinkAction::clone() const
+QModelingElement *QUmlCreateLinkAction::clone() const
 {
     QUmlCreateLinkAction *c = new QUmlCreateLinkAction;
     foreach (QUmlComment *element, ownedComments())
@@ -148,9 +146,9 @@ void QUmlCreateLinkAction::addEndData(QUmlLinkEndCreationData *endData)
 
     if (!_endData.contains(endData)) {
         _endData.insert(endData);
-        if (endData && endData->asQObject() && this->asQObject())
-            QObject::connect(endData->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeEndData(QObject *)));
-        endData->asQObject()->setParent(this->asQObject());
+        if (endData && endData->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(endData->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeEndData(QObject *)));
+        endData->asQModelingObject()->setParent(this->asQModelingObject());
     }
 }
 
@@ -160,56 +158,8 @@ void QUmlCreateLinkAction::removeEndData(QUmlLinkEndCreationData *endData)
 
     if (_endData.contains(endData)) {
         _endData.remove(endData);
-        if (endData->asQObject())
-            endData->asQObject()->setParent(0);
+        if (endData->asQModelingObject())
+            endData->asQModelingObject()->setParent(0);
     }
 }
 
-void QUmlCreateLinkAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlLinkAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputValues"))));
-    _groupProperties.insert(QStringLiteral("QUmlCreateLinkAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("endData"))));
-}
-
-void QUmlCreateLinkAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCreateLinkAction")][QStringLiteral("endData")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCreateLinkAction")][QStringLiteral("endData")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlCreateLinkAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCreateLinkAction")][QStringLiteral("endData")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCreateLinkAction")][QStringLiteral("endData")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCreateLinkAction")][QStringLiteral("endData")][QtModeling::DocumentationRole] = QStringLiteral("Specifies ends of association and inputs.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCreateLinkAction")][QStringLiteral("endData")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("LinkAction-endData");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCreateLinkAction")][QStringLiteral("endData")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCreateLinkAction")][QStringLiteral("endData")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlcreatelinkaction.h b/src/uml/qumlcreatelinkaction.h
index 3f4bd262..768bdb35 100644
--- a/src/uml/qumlcreatelinkaction.h
+++ b/src/uml/qumlcreatelinkaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlWriteLinkAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlLinkEndCreationData;
 class Q_UML_EXPORT QUmlCreateLinkAction : public QUmlWriteLinkAction
 {
 public:
-    explicit QUmlCreateLinkAction(bool createQObject = true);
+    explicit QUmlCreateLinkAction(bool createQModelingObject = true);
     virtual ~QUmlCreateLinkAction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlLinkEndCreationData *> endData() const;
@@ -69,9 +68,6 @@ public:
 
 protected:
     QSet<QUmlLinkEndCreationData *> _endData;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlcreatelinkobjectaction.cpp b/src/uml/qumlcreatelinkobjectaction.cpp
index 8d50699f..651c4c8d 100644
--- a/src/uml/qumlcreatelinkobjectaction.cpp
+++ b/src/uml/qumlcreatelinkobjectaction.cpp
@@ -73,26 +73,24 @@
 
     \brief A create link object action creates a link object.
  */
-QUmlCreateLinkObjectAction::QUmlCreateLinkObjectAction(bool createQObject) :
+QUmlCreateLinkObjectAction::QUmlCreateLinkObjectAction(bool createQModelingObject) :
     QUmlCreateLinkAction(false),
     _result(0)
 {
-    if (createQObject)
-        _qObject = new QUmlCreateLinkObjectActionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlCreateLinkObjectActionObject(this));
 }
 
 QUmlCreateLinkObjectAction::~QUmlCreateLinkObjectAction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlCreateLinkObjectAction::clone() const
+QModelingElement *QUmlCreateLinkObjectAction::clone() const
 {
     QUmlCreateLinkObjectAction *c = new QUmlCreateLinkObjectAction;
     foreach (QUmlComment *element, ownedComments())
@@ -155,9 +153,9 @@ void QUmlCreateLinkObjectAction::setResult(QUmlOutputPin *result)
         removeOutput(_result);
 
         _result = result;
-        if (result && result->asQObject() && this->asQObject())
-            QObject::connect(result->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setResult()));
-        result->asQObject()->setParent(this->asQObject());
+        if (result && result->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(result->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setResult()));
+        result->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (result) {
@@ -166,52 +164,3 @@ void QUmlCreateLinkObjectAction::setResult(QUmlOutputPin *result)
     }
 }
 
-void QUmlCreateLinkObjectAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlLinkAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputValues"))));
-    _groupProperties.insert(QStringLiteral("QUmlCreateLinkAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("endData"))));
-    _groupProperties.insert(QStringLiteral("QUmlCreateLinkObjectAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("result"))));
-}
-
-void QUmlCreateLinkObjectAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCreateLinkObjectAction")][QStringLiteral("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCreateLinkObjectAction")][QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlCreateLinkObjectAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCreateLinkObjectAction")][QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCreateLinkObjectAction")][QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCreateLinkObjectAction")][QStringLiteral("result")][QtModeling::DocumentationRole] = QStringLiteral("Gives the output pin on which the result is put.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCreateLinkObjectAction")][QStringLiteral("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCreateLinkObjectAction")][QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCreateLinkObjectAction")][QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlcreatelinkobjectaction.h b/src/uml/qumlcreatelinkobjectaction.h
index 61fd7ede..d8d27833 100644
--- a/src/uml/qumlcreatelinkobjectaction.h
+++ b/src/uml/qumlcreatelinkobjectaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlCreateLinkAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlOutputPin;
 class Q_UML_EXPORT QUmlCreateLinkObjectAction : public QUmlCreateLinkAction
 {
 public:
-    explicit QUmlCreateLinkObjectAction(bool createQObject = true);
+    explicit QUmlCreateLinkObjectAction(bool createQModelingObject = true);
     virtual ~QUmlCreateLinkObjectAction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlOutputPin *result() const;
@@ -68,9 +67,6 @@ public:
 
 protected:
     QUmlOutputPin *_result;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlcreateobjectaction.cpp b/src/uml/qumlcreateobjectaction.cpp
index 6e011a91..56515409 100644
--- a/src/uml/qumlcreateobjectaction.cpp
+++ b/src/uml/qumlcreateobjectaction.cpp
@@ -70,26 +70,24 @@
 
     \brief A create object action is an action that creates an object that conforms to a statically specified classifier and puts it on an output pin at runtime.
  */
-QUmlCreateObjectAction::QUmlCreateObjectAction(bool createQObject) :
+QUmlCreateObjectAction::QUmlCreateObjectAction(bool createQModelingObject) :
     _classifier(0),
     _result(0)
 {
-    if (createQObject)
-        _qObject = new QUmlCreateObjectActionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlCreateObjectActionObject(this));
 }
 
 QUmlCreateObjectAction::~QUmlCreateObjectAction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlCreateObjectAction::clone() const
+QModelingElement *QUmlCreateObjectAction::clone() const
 {
     QUmlCreateObjectAction *c = new QUmlCreateObjectAction;
     foreach (QUmlComment *element, ownedComments())
@@ -147,8 +145,8 @@ void QUmlCreateObjectAction::setClassifier(QUmlClassifier *classifier)
 
     if (_classifier != classifier) {
         _classifier = classifier;
-        if (classifier && classifier->asQObject() && this->asQObject())
-            QObject::connect(classifier->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setClassifier()));
+        if (classifier && classifier->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(classifier->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setClassifier()));
     }
 }
 
@@ -171,9 +169,9 @@ void QUmlCreateObjectAction::setResult(QUmlOutputPin *result)
         removeOutput(_result);
 
         _result = result;
-        if (result && result->asQObject() && this->asQObject())
-            QObject::connect(result->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setResult()));
-        result->asQObject()->setParent(this->asQObject());
+        if (result && result->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(result->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setResult()));
+        result->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (result) {
@@ -182,60 +180,3 @@ void QUmlCreateObjectAction::setResult(QUmlOutputPin *result)
     }
 }
 
-void QUmlCreateObjectAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlCreateObjectAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifier"))));
-    _groupProperties.insert(QStringLiteral("QUmlCreateObjectAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("result"))));
-}
-
-void QUmlCreateObjectAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCreateObjectAction")][QStringLiteral("classifier")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCreateObjectAction")][QStringLiteral("classifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlCreateObjectAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCreateObjectAction")][QStringLiteral("classifier")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCreateObjectAction")][QStringLiteral("classifier")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCreateObjectAction")][QStringLiteral("classifier")][QtModeling::DocumentationRole] = QStringLiteral("Classifier to be instantiated.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCreateObjectAction")][QStringLiteral("classifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCreateObjectAction")][QStringLiteral("classifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCreateObjectAction")][QStringLiteral("classifier")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCreateObjectAction")][QStringLiteral("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCreateObjectAction")][QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlCreateObjectAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCreateObjectAction")][QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCreateObjectAction")][QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCreateObjectAction")][QStringLiteral("result")][QtModeling::DocumentationRole] = QStringLiteral("Gives the output pin on which the result is put.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCreateObjectAction")][QStringLiteral("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCreateObjectAction")][QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlCreateObjectAction")][QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlcreateobjectaction.h b/src/uml/qumlcreateobjectaction.h
index d2a4472b..d22471b3 100644
--- a/src/uml/qumlcreateobjectaction.h
+++ b/src/uml/qumlcreateobjectaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlOutputPin;
 class Q_UML_EXPORT QUmlCreateObjectAction : public QUmlAction
 {
 public:
-    explicit QUmlCreateObjectAction(bool createQObject = true);
+    explicit QUmlCreateObjectAction(bool createQModelingObject = true);
     virtual ~QUmlCreateObjectAction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlClassifier *classifier() const;
@@ -72,9 +71,6 @@ public:
 protected:
     QUmlClassifier *_classifier;
     QUmlOutputPin *_result;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumldatastorenode.cpp b/src/uml/qumldatastorenode.cpp
index ca6b9e20..e85545c8 100644
--- a/src/uml/qumldatastorenode.cpp
+++ b/src/uml/qumldatastorenode.cpp
@@ -70,25 +70,23 @@
 
     \brief A data store node is a central buffer node for non-transient information.
  */
-QUmlDataStoreNode::QUmlDataStoreNode(bool createQObject) :
+QUmlDataStoreNode::QUmlDataStoreNode(bool createQModelingObject) :
     QUmlCentralBufferNode(false)
 {
-    if (createQObject)
-        _qObject = new QUmlDataStoreNodeObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlDataStoreNodeObject(this));
 }
 
 QUmlDataStoreNode::~QUmlDataStoreNode()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlDataStoreNode::clone() const
+QModelingElement *QUmlDataStoreNode::clone() const
 {
     QUmlDataStoreNode *c = new QUmlDataStoreNode;
     foreach (QUmlComment *element, ownedComments())
@@ -127,39 +125,3 @@ QModelingObject *QUmlDataStoreNode::clone() const
     return c;
 }
 
-void QUmlDataStoreNode::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStates"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isControlType"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ordering"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("selection"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperBound"))));
-}
-
-void QUmlDataStoreNode::setPropertyData()
-{
-}
-
diff --git a/src/uml/qumldatastorenode.h b/src/uml/qumldatastorenode.h
index 7de44790..67a7e3f8 100644
--- a/src/uml/qumldatastorenode.h
+++ b/src/uml/qumldatastorenode.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlCentralBufferNode>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,16 +54,13 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlDataStoreNode : public QUmlCentralBufferNode
 {
 public:
-    explicit QUmlDataStoreNode(bool createQObject = true);
+    explicit QUmlDataStoreNode(bool createQModelingObject = true);
     virtual ~QUmlDataStoreNode();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
 
 protected:
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumldatatype.cpp b/src/uml/qumldatatype.cpp
index 5f808f2f..3eddc869 100644
--- a/src/uml/qumldatatype.cpp
+++ b/src/uml/qumldatatype.cpp
@@ -78,24 +78,22 @@
 
     \brief A data type is a type whose instances are identified only by their value. A data type may contain attributes to support the modeling of structured data types.
  */
-QUmlDataType::QUmlDataType(bool createQObject)
+QUmlDataType::QUmlDataType(bool createQModelingObject)
 {
-    if (createQObject)
-        _qObject = new QUmlDataTypeObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlDataTypeObject(this));
 }
 
 QUmlDataType::~QUmlDataType()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlDataType::clone() const
+QModelingElement *QUmlDataType::clone() const
 {
     QUmlDataType *c = new QUmlDataType;
     foreach (QUmlComment *element, ownedComments())
@@ -166,9 +164,9 @@ void QUmlDataType::addOwnedAttribute(QUmlProperty *ownedAttribute)
 
     if (!_ownedAttributes.contains(ownedAttribute)) {
         _ownedAttributes.append(ownedAttribute);
-        if (ownedAttribute && ownedAttribute->asQObject() && this->asQObject())
-            QObject::connect(ownedAttribute->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeOwnedAttribute(QObject *)));
-        ownedAttribute->asQObject()->setParent(this->asQObject());
+        if (ownedAttribute && ownedAttribute->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(ownedAttribute->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeOwnedAttribute(QObject *)));
+        ownedAttribute->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedMember(ownedAttribute);
@@ -187,8 +185,8 @@ void QUmlDataType::removeOwnedAttribute(QUmlProperty *ownedAttribute)
 
     if (_ownedAttributes.contains(ownedAttribute)) {
         _ownedAttributes.removeAll(ownedAttribute);
-        if (ownedAttribute->asQObject())
-            ownedAttribute->asQObject()->setParent(0);
+        if (ownedAttribute->asQModelingObject())
+            ownedAttribute->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedMember(ownedAttribute);
@@ -217,9 +215,9 @@ void QUmlDataType::addOwnedOperation(QUmlOperation *ownedOperation)
 
     if (!_ownedOperations.contains(ownedOperation)) {
         _ownedOperations.append(ownedOperation);
-        if (ownedOperation && ownedOperation->asQObject() && this->asQObject())
-            QObject::connect(ownedOperation->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeOwnedOperation(QObject *)));
-        ownedOperation->asQObject()->setParent(this->asQObject());
+        if (ownedOperation && ownedOperation->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(ownedOperation->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeOwnedOperation(QObject *)));
+        ownedOperation->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addFeature(ownedOperation);
@@ -238,8 +236,8 @@ void QUmlDataType::removeOwnedOperation(QUmlOperation *ownedOperation)
 
     if (_ownedOperations.contains(ownedOperation)) {
         _ownedOperations.removeAll(ownedOperation);
-        if (ownedOperation->asQObject())
-            ownedOperation->asQObject()->setParent(0);
+        if (ownedOperation->asQModelingObject())
+            ownedOperation->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeFeature(ownedOperation);
@@ -265,70 +263,3 @@ QSet<QUmlNamedElement *> QUmlDataType::inherit(QSet<QUmlNamedElement *> inhs) co
     return QSet<QUmlNamedElement *> ();
 }
 
-void QUmlDataType::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generals"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlDataType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlDataType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
-}
-
-void QUmlDataType::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDataType")][QStringLiteral("ownedAttributes")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDataType")][QStringLiteral("ownedAttributes")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDataType");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDataType")][QStringLiteral("ownedAttributes")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDataType")][QStringLiteral("ownedAttributes")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDataType")][QStringLiteral("ownedAttributes")][QtModeling::DocumentationRole] = QStringLiteral("The Attributes owned by the DataType.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDataType")][QStringLiteral("ownedAttributes")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDataType")][QStringLiteral("ownedAttributes")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember Classifier-attribute");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDataType")][QStringLiteral("ownedAttributes")][QtModeling::OppositeEndRole] = QStringLiteral("Property-datatype");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDataType")][QStringLiteral("ownedOperations")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDataType")][QStringLiteral("ownedOperations")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDataType");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDataType")][QStringLiteral("ownedOperations")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDataType")][QStringLiteral("ownedOperations")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDataType")][QStringLiteral("ownedOperations")][QtModeling::DocumentationRole] = QStringLiteral("The Operations owned by the DataType.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDataType")][QStringLiteral("ownedOperations")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDataType")][QStringLiteral("ownedOperations")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Classifier-feature A_redefinitionContext_redefinableElement-redefinableElement Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDataType")][QStringLiteral("ownedOperations")][QtModeling::OppositeEndRole] = QStringLiteral("Operation-datatype");
-
-}
-
diff --git a/src/uml/qumldatatype.h b/src/uml/qumldatatype.h
index bd42dec5..aac63c7f 100644
--- a/src/uml/qumldatatype.h
+++ b/src/uml/qumldatatype.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlClassifier>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -59,10 +58,10 @@ class QUmlProperty;
 class Q_UML_EXPORT QUmlDataType : public QUmlClassifier
 {
 public:
-    explicit QUmlDataType(bool createQObject = true);
+    explicit QUmlDataType(bool createQModelingObject = true);
     virtual ~QUmlDataType();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QList<QUmlProperty *> ownedAttributes() const;
@@ -78,9 +77,6 @@ public:
 protected:
     QList<QUmlProperty *> _ownedAttributes;
     QList<QUmlOperation *> _ownedOperations;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumldecisionnode.cpp b/src/uml/qumldecisionnode.cpp
index 84d67265..a9027e8f 100644
--- a/src/uml/qumldecisionnode.cpp
+++ b/src/uml/qumldecisionnode.cpp
@@ -68,26 +68,24 @@
 
     \brief A decision node is a control node that chooses between outgoing flows.
  */
-QUmlDecisionNode::QUmlDecisionNode(bool createQObject) :
+QUmlDecisionNode::QUmlDecisionNode(bool createQModelingObject) :
     _decisionInput(0),
     _decisionInputFlow(0)
 {
-    if (createQObject)
-        _qObject = new QUmlDecisionNodeObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlDecisionNodeObject(this));
 }
 
 QUmlDecisionNode::~QUmlDecisionNode()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlDecisionNode::clone() const
+QModelingElement *QUmlDecisionNode::clone() const
 {
     QUmlDecisionNode *c = new QUmlDecisionNode;
     foreach (QUmlComment *element, ownedComments())
@@ -138,8 +136,8 @@ void QUmlDecisionNode::setDecisionInput(QUmlBehavior *decisionInput)
 
     if (_decisionInput != decisionInput) {
         _decisionInput = decisionInput;
-        if (decisionInput && decisionInput->asQObject() && this->asQObject())
-            QObject::connect(decisionInput->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setDecisionInput()));
+        if (decisionInput && decisionInput->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(decisionInput->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setDecisionInput()));
     }
 }
 
@@ -159,58 +157,8 @@ void QUmlDecisionNode::setDecisionInputFlow(QUmlObjectFlow *decisionInputFlow)
 
     if (_decisionInputFlow != decisionInputFlow) {
         _decisionInputFlow = decisionInputFlow;
-        if (decisionInputFlow && decisionInputFlow->asQObject() && this->asQObject())
-            QObject::connect(decisionInputFlow->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setDecisionInputFlow()));
+        if (decisionInputFlow && decisionInputFlow->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(decisionInputFlow->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setDecisionInputFlow()));
     }
 }
 
-void QUmlDecisionNode::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlDecisionNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("decisionInput"))));
-    _groupProperties.insert(QStringLiteral("QUmlDecisionNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("decisionInputFlow"))));
-}
-
-void QUmlDecisionNode::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDecisionNode")][QStringLiteral("decisionInput")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDecisionNode")][QStringLiteral("decisionInput")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDecisionNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDecisionNode")][QStringLiteral("decisionInput")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDecisionNode")][QStringLiteral("decisionInput")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDecisionNode")][QStringLiteral("decisionInput")][QtModeling::DocumentationRole] = QStringLiteral("Provides input to guard specifications on edges outgoing from the decision node.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDecisionNode")][QStringLiteral("decisionInput")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDecisionNode")][QStringLiteral("decisionInput")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDecisionNode")][QStringLiteral("decisionInput")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDecisionNode")][QStringLiteral("decisionInputFlow")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDecisionNode")][QStringLiteral("decisionInputFlow")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDecisionNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDecisionNode")][QStringLiteral("decisionInputFlow")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDecisionNode")][QStringLiteral("decisionInputFlow")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDecisionNode")][QStringLiteral("decisionInputFlow")][QtModeling::DocumentationRole] = QStringLiteral("An additional edge incoming to the decision node that provides a decision input value.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDecisionNode")][QStringLiteral("decisionInputFlow")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDecisionNode")][QStringLiteral("decisionInputFlow")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDecisionNode")][QStringLiteral("decisionInputFlow")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumldecisionnode.h b/src/uml/qumldecisionnode.h
index 66c0f990..dd62a734 100644
--- a/src/uml/qumldecisionnode.h
+++ b/src/uml/qumldecisionnode.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlControlNode>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlObjectFlow;
 class Q_UML_EXPORT QUmlDecisionNode : public QUmlControlNode
 {
 public:
-    explicit QUmlDecisionNode(bool createQObject = true);
+    explicit QUmlDecisionNode(bool createQModelingObject = true);
     virtual ~QUmlDecisionNode();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlBehavior *decisionInput() const;
@@ -72,9 +71,6 @@ public:
 protected:
     QUmlBehavior *_decisionInput;
     QUmlObjectFlow *_decisionInputFlow;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumldependency.cpp b/src/uml/qumldependency.cpp
index 5d85f9f4..bab5622a 100644
--- a/src/uml/qumldependency.cpp
+++ b/src/uml/qumldependency.cpp
@@ -58,24 +58,22 @@
 
     \brief A dependency is a relationship that signifies that a single or a set of model elements requires other model elements for their specification or implementation. This means that the complete semantics of the depending elements is either semantically or structurally dependent on the definition of the supplier element(s).
  */
-QUmlDependency::QUmlDependency(bool createQObject)
+QUmlDependency::QUmlDependency(bool createQModelingObject)
 {
-    if (createQObject)
-        _qObject = new QUmlDependencyObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlDependencyObject(this));
 }
 
 QUmlDependency::~QUmlDependency()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlDependency::clone() const
+QModelingElement *QUmlDependency::clone() const
 {
     QUmlDependency *c = new QUmlDependency;
     foreach (QUmlComment *element, ownedComments())
@@ -115,8 +113,8 @@ void QUmlDependency::addClient(QUmlNamedElement *client)
 
     if (!_clients.contains(client)) {
         _clients.insert(client);
-        if (client && client->asQObject() && this->asQObject())
-            QObject::connect(client->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeClient(QObject *)));
+        if (client && client->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(client->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeClient(QObject *)));
 
         // Adjust subsetted properties
         addSource(client);
@@ -161,8 +159,8 @@ void QUmlDependency::addSupplier(QUmlNamedElement *supplier)
 
     if (!_suppliers.contains(supplier)) {
         _suppliers.insert(supplier);
-        if (supplier && supplier->asQObject() && this->asQObject())
-            QObject::connect(supplier->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeSupplier(QObject *)));
+        if (supplier && supplier->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(supplier->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeSupplier(QObject *)));
 
         // Adjust subsetted properties
         addTarget(supplier);
@@ -181,47 +179,3 @@ void QUmlDependency::removeSupplier(QUmlNamedElement *supplier)
     }
 }
 
-void QUmlDependency::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
-    _groupProperties.insert(QStringLiteral("QUmlDependency"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clients"))));
-    _groupProperties.insert(QStringLiteral("QUmlDependency"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("suppliers"))));
-}
-
-void QUmlDependency::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDependency")][QStringLiteral("clients")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDependency")][QStringLiteral("clients")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDependency");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDependency")][QStringLiteral("clients")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDependency")][QStringLiteral("clients")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDependency")][QStringLiteral("clients")][QtModeling::DocumentationRole] = QStringLiteral("The element(s) dependent on the supplier element(s). In some cases (such as a Trace Abstraction) the assignment of direction (that is, the designation of the client element) is at the discretion of the modeler, and is a stipulation.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDependency")][QStringLiteral("clients")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDependency")][QStringLiteral("clients")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("DirectedRelationship-source");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDependency")][QStringLiteral("clients")][QtModeling::OppositeEndRole] = QStringLiteral("NamedElement-clientDependency");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDependency")][QStringLiteral("suppliers")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDependency")][QStringLiteral("suppliers")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDependency");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDependency")][QStringLiteral("suppliers")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDependency")][QStringLiteral("suppliers")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDependency")][QStringLiteral("suppliers")][QtModeling::DocumentationRole] = QStringLiteral("The element(s) independent of the client element(s), in the same respect and the same dependency relationship. In some directed dependency relationships (such as Refinement Abstractions), a common convention in the domain of class-based OO software is to put the more abstract element in this role. Despite this convention, users of UML may stipulate a sense of dependency suitable for their domain, which makes a more abstract element dependent on that which is more specific.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDependency")][QStringLiteral("suppliers")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDependency")][QStringLiteral("suppliers")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("DirectedRelationship-target");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDependency")][QStringLiteral("suppliers")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumldependency.h b/src/uml/qumldependency.h
index 3c0da95b..5e2e7219 100644
--- a/src/uml/qumldependency.h
+++ b/src/uml/qumldependency.h
@@ -46,7 +46,6 @@
 #include <QtUml/QUmlPackageableElement>
 #include <QtUml/QUmlDirectedRelationship>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlNamedElement;
 class Q_UML_EXPORT QUmlDependency : public QUmlPackageableElement, public QUmlDirectedRelationship
 {
 public:
-    explicit QUmlDependency(bool createQObject = true);
+    explicit QUmlDependency(bool createQModelingObject = true);
     virtual ~QUmlDependency();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlNamedElement *> clients() const;
@@ -74,9 +73,6 @@ public:
 protected:
     QSet<QUmlNamedElement *> _clients;
     QSet<QUmlNamedElement *> _suppliers;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumldeployedartifact.cpp b/src/uml/qumldeployedartifact.cpp
index 02f6fc33..534d46df 100644
--- a/src/uml/qumldeployedartifact.cpp
+++ b/src/uml/qumldeployedartifact.cpp
@@ -57,15 +57,13 @@
  */
 QUmlDeployedArtifact::QUmlDeployedArtifact()
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlDeployedArtifact::~QUmlDeployedArtifact()
 {
 }
 
-QModelingObject *QUmlDeployedArtifact::clone() const
+QModelingElement *QUmlDeployedArtifact::clone() const
 {
     QUmlDeployedArtifact *c = new QUmlDeployedArtifact;
     foreach (QUmlComment *element, ownedComments())
@@ -79,22 +77,3 @@ QModelingObject *QUmlDeployedArtifact::clone() const
     return c;
 }
 
-void QUmlDeployedArtifact::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-}
-
-void QUmlDeployedArtifact::setPropertyData()
-{
-}
-
diff --git a/src/uml/qumldeployedartifact.h b/src/uml/qumldeployedartifact.h
index cdc82e52..29ee0cbb 100644
--- a/src/uml/qumldeployedartifact.h
+++ b/src/uml/qumldeployedartifact.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlNamedElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,15 +56,12 @@ class Q_UML_EXPORT QUmlDeployedArtifact : public virtual QUmlNamedElement
 public:
     virtual ~QUmlDeployedArtifact();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
 
 protected:
     explicit QUmlDeployedArtifact();
 
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumldeployment.cpp b/src/uml/qumldeployment.cpp
index fa80daf1..d15e7b5e 100644
--- a/src/uml/qumldeployment.cpp
+++ b/src/uml/qumldeployment.cpp
@@ -62,26 +62,24 @@
 
     \brief A deployment is the allocation of an artifact or artifact instance to a deployment target.A component deployment is the deployment of one or more artifacts or artifact instances to a deployment target, optionally parameterized by a deployment specification. Examples are executables and configuration files.
  */
-QUmlDeployment::QUmlDeployment(bool createQObject) :
+QUmlDeployment::QUmlDeployment(bool createQModelingObject) :
     QUmlDependency(false),
     _location(0)
 {
-    if (createQObject)
-        _qObject = new QUmlDeploymentObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlDeploymentObject(this));
 }
 
 QUmlDeployment::~QUmlDeployment()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlDeployment::clone() const
+QModelingElement *QUmlDeployment::clone() const
 {
     QUmlDeployment *c = new QUmlDeployment;
     foreach (QUmlComment *element, ownedComments())
@@ -127,9 +125,9 @@ void QUmlDeployment::addConfiguration(QUmlDeploymentSpecification *configuration
 
     if (!_configurations.contains(configuration)) {
         _configurations.insert(configuration);
-        if (configuration && configuration->asQObject() && this->asQObject())
-            QObject::connect(configuration->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeConfiguration(QObject *)));
-        configuration->asQObject()->setParent(this->asQObject());
+        if (configuration && configuration->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(configuration->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeConfiguration(QObject *)));
+        configuration->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(configuration);
@@ -147,8 +145,8 @@ void QUmlDeployment::removeConfiguration(QUmlDeploymentSpecification *configurat
 
     if (_configurations.contains(configuration)) {
         _configurations.remove(configuration);
-        if (configuration->asQObject())
-            configuration->asQObject()->setParent(0);
+        if (configuration->asQModelingObject())
+            configuration->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(configuration);
@@ -176,8 +174,8 @@ void QUmlDeployment::addDeployedArtifact(QUmlDeployedArtifact *deployedArtifact)
 
     if (!_deployedArtifacts.contains(deployedArtifact)) {
         _deployedArtifacts.insert(deployedArtifact);
-        if (deployedArtifact && deployedArtifact->asQObject() && this->asQObject())
-            QObject::connect(deployedArtifact->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeDeployedArtifact(QObject *)));
+        if (deployedArtifact && deployedArtifact->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(deployedArtifact->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeDeployedArtifact(QObject *)));
 
         // Adjust subsetted properties
         addSupplier(deployedArtifact);
@@ -215,8 +213,8 @@ void QUmlDeployment::setLocation(QUmlDeploymentTarget *location)
         removeClient(_location);
 
         _location = location;
-        if (location && location->asQObject() && this->asQObject())
-            QObject::connect(location->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setLocation()));
+        if (location && location->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(location->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setLocation()));
 
         // Adjust subsetted properties
         setOwner(location);
@@ -226,59 +224,3 @@ void QUmlDeployment::setLocation(QUmlDeploymentTarget *location)
     }
 }
 
-void QUmlDeployment::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
-    _groupProperties.insert(QStringLiteral("QUmlDependency"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clients"))));
-    _groupProperties.insert(QStringLiteral("QUmlDependency"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("suppliers"))));
-    _groupProperties.insert(QStringLiteral("QUmlDeployment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("configurations"))));
-    _groupProperties.insert(QStringLiteral("QUmlDeployment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deployedArtifacts"))));
-    _groupProperties.insert(QStringLiteral("QUmlDeployment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("location"))));
-}
-
-void QUmlDeployment::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("configurations")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("configurations")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDeployment");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("configurations")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("configurations")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("configurations")][QtModeling::DocumentationRole] = QStringLiteral("The specification of properties that parameterize the deployment and execution of one or more Artifacts.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("configurations")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("configurations")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("configurations")][QtModeling::OppositeEndRole] = QStringLiteral("DeploymentSpecification-deployment");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("deployedArtifacts")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("deployedArtifacts")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDeployment");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("deployedArtifacts")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("deployedArtifacts")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("deployedArtifacts")][QtModeling::DocumentationRole] = QStringLiteral("The Artifacts that are deployed onto a Node. This association specializes the supplier association.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("deployedArtifacts")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("deployedArtifacts")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Dependency-supplier");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("deployedArtifacts")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("location")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("location")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDeployment");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("location")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("location")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("location")][QtModeling::DocumentationRole] = QStringLiteral("The DeployedTarget which is the target of a Deployment.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("location")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("location")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner Dependency-client");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("location")][QtModeling::OppositeEndRole] = QStringLiteral("DeploymentTarget-deployment");
-
-}
-
diff --git a/src/uml/qumldeployment.h b/src/uml/qumldeployment.h
index a7315060..cf92966f 100644
--- a/src/uml/qumldeployment.h
+++ b/src/uml/qumldeployment.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlDependency>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -59,10 +58,10 @@ class QUmlDeploymentTarget;
 class Q_UML_EXPORT QUmlDeployment : public QUmlDependency
 {
 public:
-    explicit QUmlDeployment(bool createQObject = true);
+    explicit QUmlDeployment(bool createQModelingObject = true);
     virtual ~QUmlDeployment();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlDeploymentSpecification *> configurations() const;
@@ -78,9 +77,6 @@ protected:
     QSet<QUmlDeploymentSpecification *> _configurations;
     QSet<QUmlDeployedArtifact *> _deployedArtifacts;
     QUmlDeploymentTarget *_location;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumldeploymentspecification.cpp b/src/uml/qumldeploymentspecification.cpp
index 3a1bb116..a366ee58 100644
--- a/src/uml/qumldeploymentspecification.cpp
+++ b/src/uml/qumldeploymentspecification.cpp
@@ -81,26 +81,24 @@
 
     \brief A deployment specification specifies a set of properties that determine execution parameters of a component artifact that is deployed on a node. A deployment specification can be aimed at a specific type of container. An artifact that reifies or implements deployment specification properties is a deployment descriptor.
  */
-QUmlDeploymentSpecification::QUmlDeploymentSpecification(bool createQObject) :
+QUmlDeploymentSpecification::QUmlDeploymentSpecification(bool createQModelingObject) :
     QUmlArtifact(false),
     _deployment(0)
 {
-    if (createQObject)
-        _qObject = new QUmlDeploymentSpecificationObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlDeploymentSpecificationObject(this));
 }
 
 QUmlDeploymentSpecification::~QUmlDeploymentSpecification()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlDeploymentSpecification::clone() const
+QModelingElement *QUmlDeploymentSpecification::clone() const
 {
     QUmlDeploymentSpecification *c = new QUmlDeploymentSpecification;
     foreach (QUmlComment *element, ownedComments())
@@ -182,8 +180,8 @@ void QUmlDeploymentSpecification::setDeployment(QUmlDeployment *deployment)
         // Adjust subsetted properties
 
         _deployment = deployment;
-        if (deployment && deployment->asQObject() && this->asQObject())
-            QObject::connect(deployment->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setDeployment()));
+        if (deployment && deployment->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(deployment->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setDeployment()));
 
         // Adjust subsetted properties
         setOwner(deployment);
@@ -228,85 +226,3 @@ void QUmlDeploymentSpecification::setExecutionLocation(QString executionLocation
     }
 }
 
-void QUmlDeploymentSpecification::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generals"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlArtifact"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("fileName"))));
-    _groupProperties.insert(QStringLiteral("QUmlArtifact"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("manifestations"))));
-    _groupProperties.insert(QStringLiteral("QUmlArtifact"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedArtifacts"))));
-    _groupProperties.insert(QStringLiteral("QUmlArtifact"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlArtifact"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
-    _groupProperties.insert(QStringLiteral("QUmlDeploymentSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deployment"))));
-    _groupProperties.insert(QStringLiteral("QUmlDeploymentSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deploymentLocation"))));
-    _groupProperties.insert(QStringLiteral("QUmlDeploymentSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("executionLocation"))));
-}
-
-void QUmlDeploymentSpecification::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentSpecification")][QStringLiteral("deployment")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentSpecification")][QStringLiteral("deployment")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDeploymentSpecification");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentSpecification")][QStringLiteral("deployment")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentSpecification")][QStringLiteral("deployment")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentSpecification")][QStringLiteral("deployment")][QtModeling::DocumentationRole] = QStringLiteral("The deployment with which the DeploymentSpecification is associated.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentSpecification")][QStringLiteral("deployment")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentSpecification")][QStringLiteral("deployment")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentSpecification")][QStringLiteral("deployment")][QtModeling::OppositeEndRole] = QStringLiteral("Deployment-configuration");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentSpecification")][QStringLiteral("deploymentLocation")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentSpecification")][QStringLiteral("deploymentLocation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDeploymentSpecification");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentSpecification")][QStringLiteral("deploymentLocation")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentSpecification")][QStringLiteral("deploymentLocation")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentSpecification")][QStringLiteral("deploymentLocation")][QtModeling::DocumentationRole] = QStringLiteral("The location where an Artifact is deployed onto a Node. This is typically a 'directory' or 'memory address'.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentSpecification")][QStringLiteral("deploymentLocation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentSpecification")][QStringLiteral("deploymentLocation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentSpecification")][QStringLiteral("deploymentLocation")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentSpecification")][QStringLiteral("executionLocation")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentSpecification")][QStringLiteral("executionLocation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDeploymentSpecification");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentSpecification")][QStringLiteral("executionLocation")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentSpecification")][QStringLiteral("executionLocation")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentSpecification")][QStringLiteral("executionLocation")][QtModeling::DocumentationRole] = QStringLiteral("The location where a component Artifact executes. This may be a local or remote location.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentSpecification")][QStringLiteral("executionLocation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentSpecification")][QStringLiteral("executionLocation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentSpecification")][QStringLiteral("executionLocation")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumldeploymentspecification.h b/src/uml/qumldeploymentspecification.h
index 9641e64b..7e611274 100644
--- a/src/uml/qumldeploymentspecification.h
+++ b/src/uml/qumldeploymentspecification.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlArtifact>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlDeployment;
 class Q_UML_EXPORT QUmlDeploymentSpecification : public QUmlArtifact
 {
 public:
-    explicit QUmlDeploymentSpecification(bool createQObject = true);
+    explicit QUmlDeploymentSpecification(bool createQModelingObject = true);
     virtual ~QUmlDeploymentSpecification();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlDeployment *deployment() const;
@@ -74,9 +73,6 @@ protected:
     QUmlDeployment *_deployment;
     QString _deploymentLocation;
     QString _executionLocation;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumldeploymenttarget.cpp b/src/uml/qumldeploymenttarget.cpp
index 31deac33..9e85bc6a 100644
--- a/src/uml/qumldeploymenttarget.cpp
+++ b/src/uml/qumldeploymenttarget.cpp
@@ -59,15 +59,13 @@
  */
 QUmlDeploymentTarget::QUmlDeploymentTarget()
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlDeploymentTarget::~QUmlDeploymentTarget()
 {
 }
 
-QModelingObject *QUmlDeploymentTarget::clone() const
+QModelingElement *QUmlDeploymentTarget::clone() const
 {
     QUmlDeploymentTarget *c = new QUmlDeploymentTarget;
     foreach (QUmlComment *element, ownedComments())
@@ -137,9 +135,9 @@ void QUmlDeploymentTarget::addDeployment(QUmlDeployment *deployment)
 
     if (!_deployments.contains(deployment)) {
         _deployments.insert(deployment);
-        if (deployment && deployment->asQObject() && this->asQObject())
-            QObject::connect(deployment->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeDeployment(QObject *)));
-        deployment->asQObject()->setParent(this->asQObject());
+        if (deployment && deployment->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(deployment->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeDeployment(QObject *)));
+        deployment->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(deployment);
@@ -158,8 +156,8 @@ void QUmlDeploymentTarget::removeDeployment(QUmlDeployment *deployment)
 
     if (_deployments.contains(deployment)) {
         _deployments.remove(deployment);
-        if (deployment->asQObject())
-            deployment->asQObject()->setParent(0);
+        if (deployment->asQModelingObject())
+            deployment->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(deployment);
@@ -172,42 +170,3 @@ void QUmlDeploymentTarget::removeDeployment(QUmlDeployment *deployment)
     }
 }
 
-void QUmlDeploymentTarget::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlDeploymentTarget"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deployedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlDeploymentTarget"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deployments"))));
-}
-
-void QUmlDeploymentTarget::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentTarget")][QStringLiteral("deployedElements")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentTarget")][QStringLiteral("deployedElements")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDeploymentTarget");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentTarget")][QStringLiteral("deployedElements")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentTarget")][QStringLiteral("deployedElements")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentTarget")][QStringLiteral("deployedElements")][QtModeling::DocumentationRole] = QStringLiteral("The set of elements that are manifested in an Artifact that is involved in Deployment to a DeploymentTarget.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentTarget")][QStringLiteral("deployedElements")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentTarget")][QStringLiteral("deployedElements")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentTarget")][QStringLiteral("deployedElements")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentTarget")][QStringLiteral("deployments")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentTarget")][QStringLiteral("deployments")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDeploymentTarget");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentTarget")][QStringLiteral("deployments")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentTarget")][QStringLiteral("deployments")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentTarget")][QStringLiteral("deployments")][QtModeling::DocumentationRole] = QStringLiteral("The set of Deployments for a DeploymentTarget.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentTarget")][QStringLiteral("deployments")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentTarget")][QStringLiteral("deployments")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement NamedElement-clientDependency");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentTarget")][QStringLiteral("deployments")][QtModeling::OppositeEndRole] = QStringLiteral("Deployment-location");
-
-}
-
diff --git a/src/uml/qumldeploymenttarget.h b/src/uml/qumldeploymenttarget.h
index 4fdd7da3..1eef977c 100644
--- a/src/uml/qumldeploymenttarget.h
+++ b/src/uml/qumldeploymenttarget.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlNamedElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -60,7 +59,7 @@ class Q_UML_EXPORT QUmlDeploymentTarget : public virtual QUmlNamedElement
 public:
     virtual ~QUmlDeploymentTarget();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlPackageableElement *> deployedElements() const;
@@ -74,9 +73,6 @@ protected:
     explicit QUmlDeploymentTarget();
 
     QSet<QUmlDeployment *> _deployments;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumldestroylinkaction.cpp b/src/uml/qumldestroylinkaction.cpp
index d391a659..7685a95a 100644
--- a/src/uml/qumldestroylinkaction.cpp
+++ b/src/uml/qumldestroylinkaction.cpp
@@ -73,24 +73,22 @@
 
     \brief A destroy link action is a write link action that destroys links and link objects.
  */
-QUmlDestroyLinkAction::QUmlDestroyLinkAction(bool createQObject)
+QUmlDestroyLinkAction::QUmlDestroyLinkAction(bool createQModelingObject)
 {
-    if (createQObject)
-        _qObject = new QUmlDestroyLinkActionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlDestroyLinkActionObject(this));
 }
 
 QUmlDestroyLinkAction::~QUmlDestroyLinkAction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlDestroyLinkAction::clone() const
+QModelingElement *QUmlDestroyLinkAction::clone() const
 {
     QUmlDestroyLinkAction *c = new QUmlDestroyLinkAction;
     foreach (QUmlComment *element, ownedComments())
@@ -148,9 +146,9 @@ void QUmlDestroyLinkAction::addEndData(QUmlLinkEndDestructionData *endData)
 
     if (!_endData.contains(endData)) {
         _endData.insert(endData);
-        if (endData && endData->asQObject() && this->asQObject())
-            QObject::connect(endData->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeEndData(QObject *)));
-        endData->asQObject()->setParent(this->asQObject());
+        if (endData && endData->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(endData->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeEndData(QObject *)));
+        endData->asQModelingObject()->setParent(this->asQModelingObject());
     }
 }
 
@@ -160,56 +158,8 @@ void QUmlDestroyLinkAction::removeEndData(QUmlLinkEndDestructionData *endData)
 
     if (_endData.contains(endData)) {
         _endData.remove(endData);
-        if (endData->asQObject())
-            endData->asQObject()->setParent(0);
+        if (endData->asQModelingObject())
+            endData->asQModelingObject()->setParent(0);
     }
 }
 
-void QUmlDestroyLinkAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlLinkAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputValues"))));
-    _groupProperties.insert(QStringLiteral("QUmlDestroyLinkAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("endData"))));
-}
-
-void QUmlDestroyLinkAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDestroyLinkAction")][QStringLiteral("endData")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDestroyLinkAction")][QStringLiteral("endData")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDestroyLinkAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDestroyLinkAction")][QStringLiteral("endData")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDestroyLinkAction")][QStringLiteral("endData")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDestroyLinkAction")][QStringLiteral("endData")][QtModeling::DocumentationRole] = QStringLiteral("Specifies ends of association and inputs.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDestroyLinkAction")][QStringLiteral("endData")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("LinkAction-endData");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDestroyLinkAction")][QStringLiteral("endData")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDestroyLinkAction")][QStringLiteral("endData")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumldestroylinkaction.h b/src/uml/qumldestroylinkaction.h
index 4ade35e4..897bd061 100644
--- a/src/uml/qumldestroylinkaction.h
+++ b/src/uml/qumldestroylinkaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlWriteLinkAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlLinkEndDestructionData;
 class Q_UML_EXPORT QUmlDestroyLinkAction : public QUmlWriteLinkAction
 {
 public:
-    explicit QUmlDestroyLinkAction(bool createQObject = true);
+    explicit QUmlDestroyLinkAction(bool createQModelingObject = true);
     virtual ~QUmlDestroyLinkAction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlLinkEndDestructionData *> endData() const;
@@ -69,9 +68,6 @@ public:
 
 protected:
     QSet<QUmlLinkEndDestructionData *> _endData;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumldestroyobjectaction.cpp b/src/uml/qumldestroyobjectaction.cpp
index d1469be3..41539398 100644
--- a/src/uml/qumldestroyobjectaction.cpp
+++ b/src/uml/qumldestroyobjectaction.cpp
@@ -70,27 +70,25 @@
 
     \brief A destroy object action is an action that destroys objects.
  */
-QUmlDestroyObjectAction::QUmlDestroyObjectAction(bool createQObject) :
+QUmlDestroyObjectAction::QUmlDestroyObjectAction(bool createQModelingObject) :
     _isDestroyLinks(false),
     _isDestroyOwnedObjects(false),
     _target(0)
 {
-    if (createQObject)
-        _qObject = new QUmlDestroyObjectActionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlDestroyObjectActionObject(this));
 }
 
 QUmlDestroyObjectAction::~QUmlDestroyObjectAction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlDestroyObjectAction::clone() const
+QModelingElement *QUmlDestroyObjectAction::clone() const
 {
     QUmlDestroyObjectAction *c = new QUmlDestroyObjectAction;
     foreach (QUmlComment *element, ownedComments())
@@ -148,7 +146,7 @@ void QUmlDestroyObjectAction::setDestroyLinks(bool isDestroyLinks)
 
     if (_isDestroyLinks != isDestroyLinks) {
         _isDestroyLinks = isDestroyLinks;
-        _modifiedResettableProperties << QStringLiteral("isDestroyLinks");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isDestroyLinks");
     }
 }
 
@@ -168,7 +166,7 @@ void QUmlDestroyObjectAction::setDestroyOwnedObjects(bool isDestroyOwnedObjects)
 
     if (_isDestroyOwnedObjects != isDestroyOwnedObjects) {
         _isDestroyOwnedObjects = isDestroyOwnedObjects;
-        _modifiedResettableProperties << QStringLiteral("isDestroyOwnedObjects");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isDestroyOwnedObjects");
     }
 }
 
@@ -191,9 +189,9 @@ void QUmlDestroyObjectAction::setTarget(QUmlInputPin *target)
         removeInput(_target);
 
         _target = target;
-        if (target && target->asQObject() && this->asQObject())
-            QObject::connect(target->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setTarget()));
-        target->asQObject()->setParent(this->asQObject());
+        if (target && target->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(target->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setTarget()));
+        target->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (target) {
@@ -202,70 +200,3 @@ void QUmlDestroyObjectAction::setTarget(QUmlInputPin *target)
     }
 }
 
-void QUmlDestroyObjectAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlDestroyObjectAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isDestroyLinks"))));
-    _groupProperties.insert(QStringLiteral("QUmlDestroyObjectAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isDestroyOwnedObjects"))));
-    _groupProperties.insert(QStringLiteral("QUmlDestroyObjectAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("target"))));
-}
-
-void QUmlDestroyObjectAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDestroyObjectAction")][QStringLiteral("isDestroyLinks")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDestroyObjectAction")][QStringLiteral("isDestroyLinks")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDestroyObjectAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDestroyObjectAction")][QStringLiteral("isDestroyLinks")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDestroyObjectAction")][QStringLiteral("isDestroyLinks")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDestroyObjectAction")][QStringLiteral("isDestroyLinks")][QtModeling::DocumentationRole] = QStringLiteral("Specifies whether links in which the object participates are destroyed along with the object.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDestroyObjectAction")][QStringLiteral("isDestroyLinks")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDestroyObjectAction")][QStringLiteral("isDestroyLinks")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDestroyObjectAction")][QStringLiteral("isDestroyLinks")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDestroyObjectAction")][QStringLiteral("isDestroyOwnedObjects")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDestroyObjectAction")][QStringLiteral("isDestroyOwnedObjects")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDestroyObjectAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDestroyObjectAction")][QStringLiteral("isDestroyOwnedObjects")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDestroyObjectAction")][QStringLiteral("isDestroyOwnedObjects")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDestroyObjectAction")][QStringLiteral("isDestroyOwnedObjects")][QtModeling::DocumentationRole] = QStringLiteral("Specifies whether objects owned by the object are destroyed along with the object.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDestroyObjectAction")][QStringLiteral("isDestroyOwnedObjects")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDestroyObjectAction")][QStringLiteral("isDestroyOwnedObjects")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDestroyObjectAction")][QStringLiteral("isDestroyOwnedObjects")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDestroyObjectAction")][QStringLiteral("target")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDestroyObjectAction")][QStringLiteral("target")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDestroyObjectAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDestroyObjectAction")][QStringLiteral("target")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDestroyObjectAction")][QStringLiteral("target")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDestroyObjectAction")][QStringLiteral("target")][QtModeling::DocumentationRole] = QStringLiteral("The input pin providing the object to be destroyed.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDestroyObjectAction")][QStringLiteral("target")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDestroyObjectAction")][QStringLiteral("target")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDestroyObjectAction")][QStringLiteral("target")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumldestroyobjectaction.h b/src/uml/qumldestroyobjectaction.h
index cdb0d35e..18965c0e 100644
--- a/src/uml/qumldestroyobjectaction.h
+++ b/src/uml/qumldestroyobjectaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlInputPin;
 class Q_UML_EXPORT QUmlDestroyObjectAction : public QUmlAction
 {
 public:
-    explicit QUmlDestroyObjectAction(bool createQObject = true);
+    explicit QUmlDestroyObjectAction(bool createQModelingObject = true);
     virtual ~QUmlDestroyObjectAction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     bool isDestroyLinks() const;
@@ -74,9 +73,6 @@ protected:
     bool _isDestroyLinks;
     bool _isDestroyOwnedObjects;
     QUmlInputPin *_target;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumldestructionoccurrencespecification.cpp b/src/uml/qumldestructionoccurrencespecification.cpp
index 9d762583..cf93c5e3 100644
--- a/src/uml/qumldestructionoccurrencespecification.cpp
+++ b/src/uml/qumldestructionoccurrencespecification.cpp
@@ -62,25 +62,23 @@
 
     \brief A destruction event models the destruction of an object.
  */
-QUmlDestructionOccurrenceSpecification::QUmlDestructionOccurrenceSpecification(bool createQObject) :
+QUmlDestructionOccurrenceSpecification::QUmlDestructionOccurrenceSpecification(bool createQModelingObject) :
     QUmlMessageOccurrenceSpecification(false)
 {
-    if (createQObject)
-        _qObject = new QUmlDestructionOccurrenceSpecificationObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlDestructionOccurrenceSpecificationObject(this));
 }
 
 QUmlDestructionOccurrenceSpecification::~QUmlDestructionOccurrenceSpecification()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlDestructionOccurrenceSpecification::clone() const
+QModelingElement *QUmlDestructionOccurrenceSpecification::clone() const
 {
     QUmlDestructionOccurrenceSpecification *c = new QUmlDestructionOccurrenceSpecification;
     foreach (QUmlComment *element, ownedComments())
@@ -108,29 +106,3 @@ QModelingObject *QUmlDestructionOccurrenceSpecification::clone() const
     return c;
 }
 
-void QUmlDestructionOccurrenceSpecification::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingInteraction"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingOperand"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalOrderings"))));
-    _groupProperties.insert(QStringLiteral("QUmlOccurrenceSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("covered"))));
-    _groupProperties.insert(QStringLiteral("QUmlOccurrenceSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("toAfters"))));
-    _groupProperties.insert(QStringLiteral("QUmlOccurrenceSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("toBefores"))));
-    _groupProperties.insert(QStringLiteral("QUmlMessageEnd"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("message"))));
-}
-
-void QUmlDestructionOccurrenceSpecification::setPropertyData()
-{
-}
-
diff --git a/src/uml/qumldestructionoccurrencespecification.h b/src/uml/qumldestructionoccurrencespecification.h
index b64a4429..62b271e5 100644
--- a/src/uml/qumldestructionoccurrencespecification.h
+++ b/src/uml/qumldestructionoccurrencespecification.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlMessageOccurrenceSpecification>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,16 +54,13 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlDestructionOccurrenceSpecification : public QUmlMessageOccurrenceSpecification
 {
 public:
-    explicit QUmlDestructionOccurrenceSpecification(bool createQObject = true);
+    explicit QUmlDestructionOccurrenceSpecification(bool createQModelingObject = true);
     virtual ~QUmlDestructionOccurrenceSpecification();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
 
 protected:
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumldevice.cpp b/src/uml/qumldevice.cpp
index c6c20273..29140c98 100644
--- a/src/uml/qumldevice.cpp
+++ b/src/uml/qumldevice.cpp
@@ -88,25 +88,23 @@
 
     \brief A device is a physical computational resource with processing capability upon which artifacts may be deployed for execution. Devices may be complex (i.e., they may consist of other devices).
  */
-QUmlDevice::QUmlDevice(bool createQObject) :
+QUmlDevice::QUmlDevice(bool createQModelingObject) :
     QUmlNode(false)
 {
-    if (createQObject)
-        _qObject = new QUmlDeviceObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlDeviceObject(this));
 }
 
 QUmlDevice::~QUmlDevice()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlDevice::clone() const
+QModelingElement *QUmlDevice::clone() const
 {
     QUmlDevice *c = new QUmlDevice;
     foreach (QUmlComment *element, ownedComments())
@@ -176,66 +174,3 @@ QModelingObject *QUmlDevice::clone() const
     return c;
 }
 
-void QUmlDevice::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedConnectors"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parts"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("roles"))));
-    _groupProperties.insert(QStringLiteral("QUmlEncapsulatedClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedPorts"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifierBehavior"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interfaceRealizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedBehaviors"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extensions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isActive"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedReceptions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superClasses"))));
-    _groupProperties.insert(QStringLiteral("QUmlDeploymentTarget"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deployedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlDeploymentTarget"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deployments"))));
-    _groupProperties.insert(QStringLiteral("QUmlNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedNodes"))));
-}
-
-void QUmlDevice::setPropertyData()
-{
-}
-
diff --git a/src/uml/qumldevice.h b/src/uml/qumldevice.h
index 321e6351..e5336c7d 100644
--- a/src/uml/qumldevice.h
+++ b/src/uml/qumldevice.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlNode>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,16 +54,13 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlDevice : public QUmlNode
 {
 public:
-    explicit QUmlDevice(bool createQObject = true);
+    explicit QUmlDevice(bool createQModelingObject = true);
     virtual ~QUmlDevice();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
 
 protected:
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumldirectedrelationship.cpp b/src/uml/qumldirectedrelationship.cpp
index 7b4cb1c7..d298c915 100644
--- a/src/uml/qumldirectedrelationship.cpp
+++ b/src/uml/qumldirectedrelationship.cpp
@@ -52,15 +52,13 @@
  */
 QUmlDirectedRelationship::QUmlDirectedRelationship()
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlDirectedRelationship::~QUmlDirectedRelationship()
 {
 }
 
-QModelingObject *QUmlDirectedRelationship::clone() const
+QModelingElement *QUmlDirectedRelationship::clone() const
 {
     QUmlDirectedRelationship *c = new QUmlDirectedRelationship;
     foreach (QUmlComment *element, ownedComments())
@@ -86,8 +84,8 @@ void QUmlDirectedRelationship::addSource(QUmlElement *source)
 
     if (!_sources.contains(source)) {
         _sources.insert(source);
-        if (source && source->asQObject() && this->asQObject())
-            QObject::connect(source->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeSource(QObject *)));
+        if (source && source->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(source->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeSource(QObject *)));
 
         // Adjust subsetted properties
         addRelatedElement(source);
@@ -122,8 +120,8 @@ void QUmlDirectedRelationship::addTarget(QUmlElement *target)
 
     if (!_targets.contains(target)) {
         _targets.insert(target);
-        if (target && target->asQObject() && this->asQObject())
-            QObject::connect(target->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeTarget(QObject *)));
+        if (target && target->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(target->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeTarget(QObject *)));
 
         // Adjust subsetted properties
         addRelatedElement(target);
@@ -142,37 +140,3 @@ void QUmlDirectedRelationship::removeTarget(QUmlElement *target)
     }
 }
 
-void QUmlDirectedRelationship::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
-}
-
-void QUmlDirectedRelationship::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDirectedRelationship")][QStringLiteral("sources")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDirectedRelationship")][QStringLiteral("sources")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDirectedRelationship");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDirectedRelationship")][QStringLiteral("sources")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDirectedRelationship")][QStringLiteral("sources")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDirectedRelationship")][QStringLiteral("sources")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the sources of the DirectedRelationship.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDirectedRelationship")][QStringLiteral("sources")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDirectedRelationship")][QStringLiteral("sources")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Relationship-relatedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDirectedRelationship")][QStringLiteral("sources")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDirectedRelationship")][QStringLiteral("targets")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDirectedRelationship")][QStringLiteral("targets")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDirectedRelationship");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDirectedRelationship")][QStringLiteral("targets")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDirectedRelationship")][QStringLiteral("targets")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDirectedRelationship")][QStringLiteral("targets")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the targets of the DirectedRelationship.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDirectedRelationship")][QStringLiteral("targets")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDirectedRelationship")][QStringLiteral("targets")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Relationship-relatedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDirectedRelationship")][QStringLiteral("targets")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumldirectedrelationship.h b/src/uml/qumldirectedrelationship.h
index 8aff22e1..07436434 100644
--- a/src/uml/qumldirectedrelationship.h
+++ b/src/uml/qumldirectedrelationship.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlRelationship>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -59,7 +58,7 @@ class Q_UML_EXPORT QUmlDirectedRelationship : public QUmlRelationship
 public:
     virtual ~QUmlDirectedRelationship();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlElement *> sources() const;
@@ -74,9 +73,6 @@ protected:
 
     QSet<QUmlElement *> _sources;
     QSet<QUmlElement *> _targets;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlduration.cpp b/src/uml/qumlduration.cpp
index 8811ffc8..9406e27d 100644
--- a/src/uml/qumlduration.cpp
+++ b/src/uml/qumlduration.cpp
@@ -62,25 +62,23 @@
 
     \brief Duration defines a value specification that specifies the temporal distance between two time instants.
  */
-QUmlDuration::QUmlDuration(bool createQObject) :
+QUmlDuration::QUmlDuration(bool createQModelingObject) :
     _expr(0)
 {
-    if (createQObject)
-        _qObject = new QUmlDurationObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlDurationObject(this));
 }
 
 QUmlDuration::~QUmlDuration()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlDuration::clone() const
+QModelingElement *QUmlDuration::clone() const
 {
     QUmlDuration *c = new QUmlDuration;
     foreach (QUmlComment *element, ownedComments())
@@ -125,9 +123,9 @@ void QUmlDuration::setExpr(QUmlValueSpecification *expr)
         removeOwnedElement(_expr);
 
         _expr = expr;
-        if (expr && expr->asQObject() && this->asQObject())
-            QObject::connect(expr->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setExpr()));
-        expr->asQObject()->setParent(this->asQObject());
+        if (expr && expr->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(expr->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setExpr()));
+        expr->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (expr) {
@@ -152,8 +150,8 @@ void QUmlDuration::addObservation(QUmlObservation *observation)
 
     if (!_observations.contains(observation)) {
         _observations.insert(observation);
-        if (observation && observation->asQObject() && this->asQObject())
-            QObject::connect(observation->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeObservation(QObject *)));
+        if (observation && observation->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(observation->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeObservation(QObject *)));
     }
 }
 
@@ -166,45 +164,3 @@ void QUmlDuration::removeObservation(QUmlObservation *observation)
     }
 }
 
-void QUmlDuration::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlDuration"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("expr"))));
-    _groupProperties.insert(QStringLiteral("QUmlDuration"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("observations"))));
-}
-
-void QUmlDuration::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDuration")][QStringLiteral("expr")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDuration")][QStringLiteral("expr")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDuration");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDuration")][QStringLiteral("expr")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDuration")][QStringLiteral("expr")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDuration")][QStringLiteral("expr")][QtModeling::DocumentationRole] = QStringLiteral("The value of the Duration.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDuration")][QStringLiteral("expr")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDuration")][QStringLiteral("expr")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDuration")][QStringLiteral("expr")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDuration")][QStringLiteral("observations")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDuration")][QStringLiteral("observations")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDuration");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDuration")][QStringLiteral("observations")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDuration")][QStringLiteral("observations")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDuration")][QStringLiteral("observations")][QtModeling::DocumentationRole] = QStringLiteral("Refers to the time and duration observations that are involved in expr.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDuration")][QStringLiteral("observations")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDuration")][QStringLiteral("observations")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDuration")][QStringLiteral("observations")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlduration.h b/src/uml/qumlduration.h
index 8e8194cf..5d9e3cfc 100644
--- a/src/uml/qumlduration.h
+++ b/src/uml/qumlduration.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlValueSpecification>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlObservation;
 class Q_UML_EXPORT QUmlDuration : public QUmlValueSpecification
 {
 public:
-    explicit QUmlDuration(bool createQObject = true);
+    explicit QUmlDuration(bool createQModelingObject = true);
     virtual ~QUmlDuration();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlValueSpecification *expr() const;
@@ -72,9 +71,6 @@ public:
 protected:
     QUmlValueSpecification *_expr;
     QSet<QUmlObservation *> _observations;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumldurationconstraint.cpp b/src/uml/qumldurationconstraint.cpp
index 06c4fb0c..906db5e4 100644
--- a/src/uml/qumldurationconstraint.cpp
+++ b/src/uml/qumldurationconstraint.cpp
@@ -62,26 +62,24 @@
 
     \brief A duration constraint is a constraint that refers to a duration interval.
  */
-QUmlDurationConstraint::QUmlDurationConstraint(bool createQObject) :
+QUmlDurationConstraint::QUmlDurationConstraint(bool createQModelingObject) :
     QUmlIntervalConstraint(false),
     _specification(0)
 {
-    if (createQObject)
-        _qObject = new QUmlDurationConstraintObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlDurationConstraintObject(this));
 }
 
 QUmlDurationConstraint::~QUmlDurationConstraint()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlDurationConstraint::clone() const
+QModelingElement *QUmlDurationConstraint::clone() const
 {
     QUmlDurationConstraint *c = new QUmlDurationConstraint;
     foreach (QUmlComment *element, ownedComments())
@@ -143,52 +141,9 @@ void QUmlDurationConstraint::setSpecification(QUmlDurationInterval *specificatio
 
     if (_specification != specification) {
         _specification = specification;
-        if (specification && specification->asQObject() && this->asQObject())
-            QObject::connect(specification->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setSpecification()));
-        specification->asQObject()->setParent(this->asQObject());
+        if (specification && specification->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(specification->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setSpecification()));
+        specification->asQModelingObject()->setParent(this->asQModelingObject());
     }
 }
 
-void QUmlDurationConstraint::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlConstraint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("constrainedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlConstraint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlDurationConstraint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("firstEvent"))));
-    _groupProperties.insert(QStringLiteral("QUmlDurationConstraint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("specification"))));
-}
-
-void QUmlDurationConstraint::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationConstraint")][QStringLiteral("firstEvent")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationConstraint")][QStringLiteral("firstEvent")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDurationConstraint");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationConstraint")][QStringLiteral("firstEvent")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationConstraint")][QStringLiteral("firstEvent")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationConstraint")][QStringLiteral("firstEvent")][QtModeling::DocumentationRole] = QStringLiteral("The value of firstEvent[i] is related to constrainedElement[i] (where i is 1 or 2). If firstEvent[i] is true, then the corresponding observation event is the first time instant the execution enters constrainedElement[i]. If firstEvent[i] is false, then the corresponding observation event is the last time instant the execution is within constrainedElement[i]. Default value is true applied when constrainedElement[i] refers an element that represents only one time instant.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationConstraint")][QStringLiteral("firstEvent")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationConstraint")][QStringLiteral("firstEvent")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationConstraint")][QStringLiteral("firstEvent")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationConstraint")][QStringLiteral("specification")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationConstraint")][QStringLiteral("specification")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDurationConstraint");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationConstraint")][QStringLiteral("specification")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationConstraint")][QStringLiteral("specification")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationConstraint")][QStringLiteral("specification")][QtModeling::DocumentationRole] = QStringLiteral("The interval constraining the duration.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationConstraint")][QStringLiteral("specification")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("IntervalConstraint-specification");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationConstraint")][QStringLiteral("specification")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationConstraint")][QStringLiteral("specification")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumldurationconstraint.h b/src/uml/qumldurationconstraint.h
index eb6f2e84..a4a201ec 100644
--- a/src/uml/qumldurationconstraint.h
+++ b/src/uml/qumldurationconstraint.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlIntervalConstraint>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlDurationInterval;
 class Q_UML_EXPORT QUmlDurationConstraint : public QUmlIntervalConstraint
 {
 public:
-    explicit QUmlDurationConstraint(bool createQObject = true);
+    explicit QUmlDurationConstraint(bool createQModelingObject = true);
     virtual ~QUmlDurationConstraint();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     bool firstEvent() const;
@@ -71,9 +70,6 @@ public:
 protected:
     bool _firstEvent;
     QUmlDurationInterval *_specification;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumldurationinterval.cpp b/src/uml/qumldurationinterval.cpp
index ea1a6640..be85ed05 100644
--- a/src/uml/qumldurationinterval.cpp
+++ b/src/uml/qumldurationinterval.cpp
@@ -62,27 +62,25 @@
 
     \brief A duration interval defines the range between two durations.
  */
-QUmlDurationInterval::QUmlDurationInterval(bool createQObject) :
+QUmlDurationInterval::QUmlDurationInterval(bool createQModelingObject) :
     QUmlInterval(false),
     _max(0),
     _min(0)
 {
-    if (createQObject)
-        _qObject = new QUmlDurationIntervalObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlDurationIntervalObject(this));
 }
 
 QUmlDurationInterval::~QUmlDurationInterval()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlDurationInterval::clone() const
+QModelingElement *QUmlDurationInterval::clone() const
 {
     QUmlDurationInterval *c = new QUmlDurationInterval;
     foreach (QUmlComment *element, ownedComments())
@@ -124,8 +122,8 @@ void QUmlDurationInterval::setMax(QUmlDuration *max)
 
     if (_max != max) {
         _max = max;
-        if (max && max->asQObject() && this->asQObject())
-            QObject::connect(max->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setMax()));
+        if (max && max->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(max->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setMax()));
     }
 }
 
@@ -145,50 +143,8 @@ void QUmlDurationInterval::setMin(QUmlDuration *min)
 
     if (_min != min) {
         _min = min;
-        if (min && min->asQObject() && this->asQObject())
-            QObject::connect(min->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setMin()));
+        if (min && min->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(min->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setMin()));
     }
 }
 
-void QUmlDurationInterval::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlDurationInterval"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("max"))));
-    _groupProperties.insert(QStringLiteral("QUmlDurationInterval"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("min"))));
-}
-
-void QUmlDurationInterval::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationInterval")][QStringLiteral("max")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationInterval")][QStringLiteral("max")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDurationInterval");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationInterval")][QStringLiteral("max")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationInterval")][QStringLiteral("max")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationInterval")][QStringLiteral("max")][QtModeling::DocumentationRole] = QStringLiteral("Refers to the Duration denoting the maximum value of the range.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationInterval")][QStringLiteral("max")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("Interval-max");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationInterval")][QStringLiteral("max")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationInterval")][QStringLiteral("max")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationInterval")][QStringLiteral("min")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationInterval")][QStringLiteral("min")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDurationInterval");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationInterval")][QStringLiteral("min")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationInterval")][QStringLiteral("min")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationInterval")][QStringLiteral("min")][QtModeling::DocumentationRole] = QStringLiteral("Refers to the Duration denoting the minimum value of the range.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationInterval")][QStringLiteral("min")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("Interval-min");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationInterval")][QStringLiteral("min")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationInterval")][QStringLiteral("min")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumldurationinterval.h b/src/uml/qumldurationinterval.h
index c4f67272..71ea3122 100644
--- a/src/uml/qumldurationinterval.h
+++ b/src/uml/qumldurationinterval.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlInterval>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlDuration;
 class Q_UML_EXPORT QUmlDurationInterval : public QUmlInterval
 {
 public:
-    explicit QUmlDurationInterval(bool createQObject = true);
+    explicit QUmlDurationInterval(bool createQModelingObject = true);
     virtual ~QUmlDurationInterval();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlDuration *max() const;
@@ -71,9 +70,6 @@ public:
 protected:
     QUmlDuration *_max;
     QUmlDuration *_min;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumldurationobservation.cpp b/src/uml/qumldurationobservation.cpp
index 7dff171c..fce7d1b7 100644
--- a/src/uml/qumldurationobservation.cpp
+++ b/src/uml/qumldurationobservation.cpp
@@ -59,25 +59,23 @@
 
     \brief A duration observation is a reference to a duration during an execution. It points out the element(s) in the model to observe and whether the observations are when this model element is entered or when it is exited.
  */
-QUmlDurationObservation::QUmlDurationObservation(bool createQObject) :
+QUmlDurationObservation::QUmlDurationObservation(bool createQModelingObject) :
     _event(0)
 {
-    if (createQObject)
-        _qObject = new QUmlDurationObservationObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlDurationObservationObject(this));
 }
 
 QUmlDurationObservation::~QUmlDurationObservation()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlDurationObservation::clone() const
+QModelingElement *QUmlDurationObservation::clone() const
 {
     QUmlDurationObservation *c = new QUmlDurationObservation;
     foreach (QUmlComment *element, ownedComments())
@@ -116,8 +114,8 @@ void QUmlDurationObservation::setEvent(QUmlNamedElement *event)
 
     if (_event != event) {
         _event = event;
-        if (event && event->asQObject() && this->asQObject())
-            QObject::connect(event->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setEvent()));
+        if (event && event->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(event->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setEvent()));
     }
 }
 
@@ -140,44 +138,3 @@ void QUmlDurationObservation::setFirstEvent(bool firstEvent)
     }
 }
 
-void QUmlDurationObservation::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlDurationObservation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("event"))));
-    _groupProperties.insert(QStringLiteral("QUmlDurationObservation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("firstEvent"))));
-}
-
-void QUmlDurationObservation::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationObservation")][QStringLiteral("event")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationObservation")][QStringLiteral("event")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDurationObservation");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationObservation")][QStringLiteral("event")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationObservation")][QStringLiteral("event")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationObservation")][QStringLiteral("event")][QtModeling::DocumentationRole] = QStringLiteral("The observation is determined by the entering or exiting of the event element during execution.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationObservation")][QStringLiteral("event")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationObservation")][QStringLiteral("event")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationObservation")][QStringLiteral("event")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationObservation")][QStringLiteral("firstEvent")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationObservation")][QStringLiteral("firstEvent")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDurationObservation");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationObservation")][QStringLiteral("firstEvent")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationObservation")][QStringLiteral("firstEvent")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationObservation")][QStringLiteral("firstEvent")][QtModeling::DocumentationRole] = QStringLiteral("The value of firstEvent[i] is related to event[i] (where i is 1 or 2). If firstEvent[i] is true, then the corresponding observation event is the first time instant the execution enters event[i]. If firstEvent[i] is false, then the corresponding observation event is the time instant the execution exits event[i]. Default value is true applied when event[i] refers an element that represents only one time instant.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationObservation")][QStringLiteral("firstEvent")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationObservation")][QStringLiteral("firstEvent")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlDurationObservation")][QStringLiteral("firstEvent")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumldurationobservation.h b/src/uml/qumldurationobservation.h
index ee32431b..4895b66e 100644
--- a/src/uml/qumldurationobservation.h
+++ b/src/uml/qumldurationobservation.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlObservation>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlNamedElement;
 class Q_UML_EXPORT QUmlDurationObservation : public QUmlObservation
 {
 public:
-    explicit QUmlDurationObservation(bool createQObject = true);
+    explicit QUmlDurationObservation(bool createQModelingObject = true);
     virtual ~QUmlDurationObservation();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlNamedElement *event() const;
@@ -71,9 +70,6 @@ public:
 protected:
     QUmlNamedElement *_event;
     bool _firstEvent;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlelement.cpp b/src/uml/qumlelement.cpp
index 207f61b1..ff308ef6 100644
--- a/src/uml/qumlelement.cpp
+++ b/src/uml/qumlelement.cpp
@@ -52,15 +52,13 @@
 QUmlElement::QUmlElement() :
     _owner(0)
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlElement::~QUmlElement()
 {
 }
 
-QModelingObject *QUmlElement::clone() const
+QModelingElement *QUmlElement::clone() const
 {
     QUmlElement *c = new QUmlElement;
     foreach (QUmlComment *element, ownedComments())
@@ -86,9 +84,9 @@ void QUmlElement::addOwnedComment(QUmlComment *ownedComment)
 
     if (!_ownedComments.contains(ownedComment)) {
         _ownedComments.insert(ownedComment);
-        if (ownedComment && ownedComment->asQObject() && this->asQObject())
-            QObject::connect(ownedComment->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeOwnedComment(QObject *)));
-        ownedComment->asQObject()->setParent(this->asQObject());
+        if (ownedComment && ownedComment->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(ownedComment->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeOwnedComment(QObject *)));
+        ownedComment->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(ownedComment);
@@ -101,8 +99,8 @@ void QUmlElement::removeOwnedComment(QUmlComment *ownedComment)
 
     if (_ownedComments.contains(ownedComment)) {
         _ownedComments.remove(ownedComment);
-        if (ownedComment->asQObject())
-            ownedComment->asQObject()->setParent(0);
+        if (ownedComment->asQModelingObject())
+            ownedComment->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(ownedComment);
@@ -125,9 +123,9 @@ void QUmlElement::addOwnedElement(QUmlElement *ownedElement)
 
     if (!_ownedElements.contains(ownedElement)) {
         _ownedElements.insert(ownedElement);
-        if (ownedElement && ownedElement->asQObject() && this->asQObject())
-            QObject::connect(ownedElement->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeOwnedElement(QObject *)));
-        ownedElement->asQObject()->setParent(this->asQObject());
+        if (ownedElement && ownedElement->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(ownedElement->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeOwnedElement(QObject *)));
+        ownedElement->asQModelingObject()->setParent(this->asQModelingObject());
     }
 }
 
@@ -137,8 +135,8 @@ void QUmlElement::removeOwnedElement(QUmlElement *ownedElement)
 
     if (_ownedElements.contains(ownedElement)) {
         _ownedElements.remove(ownedElement);
-        if (ownedElement->asQObject())
-            ownedElement->asQObject()->setParent(0);
+        if (ownedElement->asQModelingObject())
+            ownedElement->asQModelingObject()->setParent(0);
     }
 }
 
@@ -158,8 +156,8 @@ void QUmlElement::setOwner(QUmlElement *owner)
 
     if (_owner != owner) {
         _owner = owner;
-        if (owner && owner->asQObject() && this->asQObject())
-            QObject::connect(owner->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setOwner()));
+        if (owner && owner->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(owner->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setOwner()));
     }
 }
 
@@ -183,46 +181,6 @@ bool QUmlElement::mustBeOwned() const
     return true;
 }
 
-void QUmlElement::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-}
-
-void QUmlElement::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("ownedComments")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("ownedComments")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("ownedComments")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("ownedComments")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("ownedComments")][QtModeling::DocumentationRole] = QStringLiteral("The Comments owned by this element.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("ownedComments")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("ownedComments")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("ownedComments")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("ownedElements")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("ownedElements")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("ownedElements")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("ownedElements")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("ownedElements")][QtModeling::DocumentationRole] = QStringLiteral("The Elements owned by this element.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("ownedElements")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("ownedElements")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("ownedElements")][QtModeling::OppositeEndRole] = QStringLiteral("Element-owner");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("owner")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("owner")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("owner")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("owner")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("owner")][QtModeling::DocumentationRole] = QStringLiteral("The Element that owns this element.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("owner")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("owner")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("owner")][QtModeling::OppositeEndRole] = QStringLiteral("Element-ownedElement");
-
-}
-
 void QUmlElement::allOwnedElements(QSet<QUmlElement *> &allOwnedElements_) const
 {
     allOwnedElements_.unite(_ownedElements);
diff --git a/src/uml/qumlelement.h b/src/uml/qumlelement.h
index be8ce4c5..f77dcaab 100644
--- a/src/uml/qumlelement.h
+++ b/src/uml/qumlelement.h
@@ -43,8 +43,7 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtModeling/QModelingObject>
-
+#include <QtModeling/QModelingElement>
 
 QT_BEGIN_HEADER
 
@@ -54,12 +53,12 @@ QT_MODULE(QtUml)
 
 class QUmlComment;
 
-class Q_UML_EXPORT QUmlElement : public QModelingObject
+class Q_UML_EXPORT QUmlElement : public QModelingElement
 {
 public:
     virtual ~QUmlElement();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlComment *> ownedComments() const;
@@ -82,9 +81,6 @@ protected:
     QSet<QUmlElement *> _ownedElements;
     QUmlElement *_owner;
 
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
-
 private:
     void allOwnedElements(QSet<QUmlElement *> &allOwnedElements_) const;
 };
diff --git a/src/uml/qumlelementimport.cpp b/src/uml/qumlelementimport.cpp
index b04063e3..d1c0ce7f 100644
--- a/src/uml/qumlelementimport.cpp
+++ b/src/uml/qumlelementimport.cpp
@@ -54,27 +54,25 @@
 
     \brief An element import identifies an element in another package, and allows the element to be referenced using its name without a qualifier.
  */
-QUmlElementImport::QUmlElementImport(bool createQObject) :
+QUmlElementImport::QUmlElementImport(bool createQModelingObject) :
     _importedElement(0),
     _importingNamespace(0),
     _visibility(QtUml::VisibilityKindPublic)
 {
-    if (createQObject)
-        _qObject = new QUmlElementImportObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlElementImportObject(this));
 }
 
 QUmlElementImport::~QUmlElementImport()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlElementImport::clone() const
+QModelingElement *QUmlElementImport::clone() const
 {
     QUmlElementImport *c = new QUmlElementImport;
     foreach (QUmlComment *element, ownedComments())
@@ -128,8 +126,8 @@ void QUmlElementImport::setImportedElement(QUmlPackageableElement *importedEleme
         removeTarget(_importedElement);
 
         _importedElement = importedElement;
-        if (importedElement && importedElement->asQObject() && this->asQObject())
-            QObject::connect(importedElement->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setImportedElement()));
+        if (importedElement && importedElement->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(importedElement->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setImportedElement()));
 
         // Adjust subsetted properties
         if (importedElement) {
@@ -157,8 +155,8 @@ void QUmlElementImport::setImportingNamespace(QUmlNamespace *importingNamespace)
         removeSource(_importingNamespace);
 
         _importingNamespace = importingNamespace;
-        if (importingNamespace && importingNamespace->asQObject() && this->asQObject())
-            QObject::connect(importingNamespace->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setImportingNamespace()));
+        if (importingNamespace && importingNamespace->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(importingNamespace->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setImportingNamespace()));
 
         // Adjust subsetted properties
         setOwner(importingNamespace);
@@ -184,7 +182,7 @@ void QUmlElementImport::setVisibility(QtUml::VisibilityKind visibility)
 
     if (_visibility != visibility) {
         _visibility = visibility;
-        _modifiedResettableProperties << QStringLiteral("visibility");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("visibility");
     }
 }
 
@@ -200,59 +198,3 @@ QString QUmlElementImport::getName() const
     return QString ();
 }
 
-void QUmlElementImport::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
-    _groupProperties.insert(QStringLiteral("QUmlElementImport"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("alias"))));
-    _groupProperties.insert(QStringLiteral("QUmlElementImport"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedElement"))));
-    _groupProperties.insert(QStringLiteral("QUmlElementImport"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importingNamespace"))));
-    _groupProperties.insert(QStringLiteral("QUmlElementImport"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-}
-
-void QUmlElementImport::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElementImport")][QStringLiteral("alias")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElementImport")][QStringLiteral("alias")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlElementImport");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElementImport")][QStringLiteral("alias")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElementImport")][QStringLiteral("alias")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElementImport")][QStringLiteral("alias")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the name that should be added to the namespace of the importing package in lieu of the name of the imported packagable element. The aliased name must not clash with any other member name in the importing package. By default, no alias is used.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElementImport")][QStringLiteral("alias")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElementImport")][QStringLiteral("alias")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElementImport")][QStringLiteral("alias")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElementImport")][QStringLiteral("importedElement")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElementImport")][QStringLiteral("importedElement")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlElementImport");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElementImport")][QStringLiteral("importedElement")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElementImport")][QStringLiteral("importedElement")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElementImport")][QStringLiteral("importedElement")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the PackageableElement whose name is to be added to a Namespace.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElementImport")][QStringLiteral("importedElement")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElementImport")][QStringLiteral("importedElement")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("DirectedRelationship-target");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElementImport")][QStringLiteral("importedElement")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElementImport")][QStringLiteral("importingNamespace")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElementImport")][QStringLiteral("importingNamespace")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlElementImport");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElementImport")][QStringLiteral("importingNamespace")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElementImport")][QStringLiteral("importingNamespace")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElementImport")][QStringLiteral("importingNamespace")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the Namespace that imports a PackageableElement from another Package.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElementImport")][QStringLiteral("importingNamespace")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElementImport")][QStringLiteral("importingNamespace")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner DirectedRelationship-source");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElementImport")][QStringLiteral("importingNamespace")][QtModeling::OppositeEndRole] = QStringLiteral("Namespace-elementImport");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElementImport")][QStringLiteral("visibility")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElementImport")][QStringLiteral("visibility")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlElementImport");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElementImport")][QStringLiteral("visibility")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElementImport")][QStringLiteral("visibility")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElementImport")][QStringLiteral("visibility")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the visibility of the imported PackageableElement within the importing Package. The default visibility is the same as that of the imported element. If the imported element does not have a visibility, it is possible to add visibility to the element import.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElementImport")][QStringLiteral("visibility")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElementImport")][QStringLiteral("visibility")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlElementImport")][QStringLiteral("visibility")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlelementimport.h b/src/uml/qumlelementimport.h
index c1a13050..698888b4 100644
--- a/src/uml/qumlelementimport.h
+++ b/src/uml/qumlelementimport.h
@@ -47,7 +47,6 @@
 
 
 #include <QtUml/QtUmlNamespace>
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -60,10 +59,10 @@ class QUmlPackageableElement;
 class Q_UML_EXPORT QUmlElementImport : public QUmlDirectedRelationship
 {
 public:
-    explicit QUmlElementImport(bool createQObject = true);
+    explicit QUmlElementImport(bool createQModelingObject = true);
     virtual ~QUmlElementImport();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QString alias() const;
@@ -83,9 +82,6 @@ protected:
     QUmlPackageableElement *_importedElement;
     QUmlNamespace *_importingNamespace;
     QtUml::VisibilityKind _visibility;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlencapsulatedclassifier.cpp b/src/uml/qumlencapsulatedclassifier.cpp
index 60d41615..1b07c066 100644
--- a/src/uml/qumlencapsulatedclassifier.cpp
+++ b/src/uml/qumlencapsulatedclassifier.cpp
@@ -80,15 +80,13 @@
  */
 QUmlEncapsulatedClassifier::QUmlEncapsulatedClassifier()
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlEncapsulatedClassifier::~QUmlEncapsulatedClassifier()
 {
 }
 
-QModelingObject *QUmlEncapsulatedClassifier::clone() const
+QModelingElement *QUmlEncapsulatedClassifier::clone() const
 {
     QUmlEncapsulatedClassifier *c = new QUmlEncapsulatedClassifier;
     foreach (QUmlComment *element, ownedComments())
@@ -185,64 +183,3 @@ void QUmlEncapsulatedClassifier::removeOwnedPort(QUmlPort *ownedPort)
     }
 }
 
-void QUmlEncapsulatedClassifier::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generals"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedConnectors"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parts"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("roles"))));
-    _groupProperties.insert(QStringLiteral("QUmlEncapsulatedClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedPorts"))));
-}
-
-void QUmlEncapsulatedClassifier::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlEncapsulatedClassifier")][QStringLiteral("ownedPorts")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlEncapsulatedClassifier")][QStringLiteral("ownedPorts")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlEncapsulatedClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlEncapsulatedClassifier")][QStringLiteral("ownedPorts")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlEncapsulatedClassifier")][QStringLiteral("ownedPorts")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlEncapsulatedClassifier")][QStringLiteral("ownedPorts")][QtModeling::DocumentationRole] = QStringLiteral("References a set of ports that an encapsulated classifier owns.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlEncapsulatedClassifier")][QStringLiteral("ownedPorts")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlEncapsulatedClassifier")][QStringLiteral("ownedPorts")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("StructuredClassifier-ownedAttribute");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlEncapsulatedClassifier")][QStringLiteral("ownedPorts")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlencapsulatedclassifier.h b/src/uml/qumlencapsulatedclassifier.h
index 872ec876..43850511 100644
--- a/src/uml/qumlencapsulatedclassifier.h
+++ b/src/uml/qumlencapsulatedclassifier.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlStructuredClassifier>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -59,7 +58,7 @@ class Q_UML_EXPORT QUmlEncapsulatedClassifier : public QUmlStructuredClassifier
 public:
     virtual ~QUmlEncapsulatedClassifier();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlPort *> ownedPorts() const;
@@ -69,9 +68,6 @@ public:
 protected:
     explicit QUmlEncapsulatedClassifier();
 
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlenumeration.cpp b/src/uml/qumlenumeration.cpp
index 3cb66920..d25f27fb 100644
--- a/src/uml/qumlenumeration.cpp
+++ b/src/uml/qumlenumeration.cpp
@@ -79,25 +79,23 @@
 
     \brief An enumeration is a data type whose values are enumerated in the model as enumeration literals.
  */
-QUmlEnumeration::QUmlEnumeration(bool createQObject) :
+QUmlEnumeration::QUmlEnumeration(bool createQModelingObject) :
     QUmlDataType(false)
 {
-    if (createQObject)
-        _qObject = new QUmlEnumerationObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlEnumerationObject(this));
 }
 
 QUmlEnumeration::~QUmlEnumeration()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlEnumeration::clone() const
+QModelingElement *QUmlEnumeration::clone() const
 {
     QUmlEnumeration *c = new QUmlEnumeration;
     foreach (QUmlComment *element, ownedComments())
@@ -170,9 +168,9 @@ void QUmlEnumeration::addOwnedLiteral(QUmlEnumerationLiteral *ownedLiteral)
 
     if (!_ownedLiterals.contains(ownedLiteral)) {
         _ownedLiterals.append(ownedLiteral);
-        if (ownedLiteral && ownedLiteral->asQObject() && this->asQObject())
-            QObject::connect(ownedLiteral->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeOwnedLiteral(QObject *)));
-        ownedLiteral->asQObject()->setParent(this->asQObject());
+        if (ownedLiteral && ownedLiteral->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(ownedLiteral->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeOwnedLiteral(QObject *)));
+        ownedLiteral->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedMember(ownedLiteral);
@@ -190,8 +188,8 @@ void QUmlEnumeration::removeOwnedLiteral(QUmlEnumerationLiteral *ownedLiteral)
 
     if (_ownedLiterals.contains(ownedLiteral)) {
         _ownedLiterals.removeAll(ownedLiteral);
-        if (ownedLiteral->asQObject())
-            ownedLiteral->asQObject()->setParent(0);
+        if (ownedLiteral->asQModelingObject())
+            ownedLiteral->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedMember(ownedLiteral);
@@ -203,62 +201,3 @@ void QUmlEnumeration::removeOwnedLiteral(QUmlEnumerationLiteral *ownedLiteral)
     }
 }
 
-void QUmlEnumeration::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generals"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlDataType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlDataType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
-    _groupProperties.insert(QStringLiteral("QUmlEnumeration"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedLiterals"))));
-}
-
-void QUmlEnumeration::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlEnumeration")][QStringLiteral("ownedLiterals")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlEnumeration")][QStringLiteral("ownedLiterals")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlEnumeration");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlEnumeration")][QStringLiteral("ownedLiterals")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlEnumeration")][QStringLiteral("ownedLiterals")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlEnumeration")][QStringLiteral("ownedLiterals")][QtModeling::DocumentationRole] = QStringLiteral("The ordered set of literals for this Enumeration.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlEnumeration")][QStringLiteral("ownedLiterals")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlEnumeration")][QStringLiteral("ownedLiterals")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlEnumeration")][QStringLiteral("ownedLiterals")][QtModeling::OppositeEndRole] = QStringLiteral("EnumerationLiteral-enumeration");
-
-}
-
diff --git a/src/uml/qumlenumeration.h b/src/uml/qumlenumeration.h
index f9780e46..b3a30f94 100644
--- a/src/uml/qumlenumeration.h
+++ b/src/uml/qumlenumeration.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlDataType>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlEnumerationLiteral;
 class Q_UML_EXPORT QUmlEnumeration : public QUmlDataType
 {
 public:
-    explicit QUmlEnumeration(bool createQObject = true);
+    explicit QUmlEnumeration(bool createQModelingObject = true);
     virtual ~QUmlEnumeration();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QList<QUmlEnumerationLiteral *> ownedLiterals() const;
@@ -69,9 +68,6 @@ public:
 
 protected:
     QList<QUmlEnumerationLiteral *> _ownedLiterals;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlenumerationliteral.cpp b/src/uml/qumlenumerationliteral.cpp
index 074b8b73..4fffcac3 100644
--- a/src/uml/qumlenumerationliteral.cpp
+++ b/src/uml/qumlenumerationliteral.cpp
@@ -65,26 +65,24 @@
 
     \brief An enumeration literal is a user-defined data value for an enumeration.
  */
-QUmlEnumerationLiteral::QUmlEnumerationLiteral(bool createQObject) :
+QUmlEnumerationLiteral::QUmlEnumerationLiteral(bool createQModelingObject) :
     QUmlInstanceSpecification(false),
     _enumeration(0)
 {
-    if (createQObject)
-        _qObject = new QUmlEnumerationLiteralObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlEnumerationLiteralObject(this));
 }
 
 QUmlEnumerationLiteral::~QUmlEnumerationLiteral()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlEnumerationLiteral::clone() const
+QModelingElement *QUmlEnumerationLiteral::clone() const
 {
     QUmlEnumerationLiteral *c = new QUmlEnumerationLiteral;
     foreach (QUmlComment *element, ownedComments())
@@ -154,56 +152,11 @@ void QUmlEnumerationLiteral::setEnumeration(QUmlEnumeration *enumeration)
         // Adjust subsetted properties
 
         _enumeration = enumeration;
-        if (enumeration && enumeration->asQObject() && this->asQObject())
-            QObject::connect(enumeration->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setEnumeration()));
+        if (enumeration && enumeration->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(enumeration->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setEnumeration()));
 
         // Adjust subsetted properties
         setNamespace(enumeration);
     }
 }
 
-void QUmlEnumerationLiteral::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlDeploymentTarget"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deployedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlDeploymentTarget"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deployments"))));
-    _groupProperties.insert(QStringLiteral("QUmlInstanceSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("slots_"))));
-    _groupProperties.insert(QStringLiteral("QUmlInstanceSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("specification"))));
-    _groupProperties.insert(QStringLiteral("QUmlEnumerationLiteral"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifier"))));
-    _groupProperties.insert(QStringLiteral("QUmlEnumerationLiteral"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enumeration"))));
-}
-
-void QUmlEnumerationLiteral::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlEnumerationLiteral")][QStringLiteral("classifier")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlEnumerationLiteral")][QStringLiteral("classifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlEnumerationLiteral");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlEnumerationLiteral")][QStringLiteral("classifier")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlEnumerationLiteral")][QStringLiteral("classifier")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlEnumerationLiteral")][QStringLiteral("classifier")][QtModeling::DocumentationRole] = QStringLiteral("The classifier of this EnumerationLiteral derived to be equal to its enumeration.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlEnumerationLiteral")][QStringLiteral("classifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("InstanceSpecification-classifier");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlEnumerationLiteral")][QStringLiteral("classifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlEnumerationLiteral")][QStringLiteral("classifier")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlEnumerationLiteral")][QStringLiteral("enumeration")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlEnumerationLiteral")][QStringLiteral("enumeration")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlEnumerationLiteral");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlEnumerationLiteral")][QStringLiteral("enumeration")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlEnumerationLiteral")][QStringLiteral("enumeration")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlEnumerationLiteral")][QStringLiteral("enumeration")][QtModeling::DocumentationRole] = QStringLiteral("The Enumeration that this EnumerationLiteral is a member of.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlEnumerationLiteral")][QStringLiteral("enumeration")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlEnumerationLiteral")][QStringLiteral("enumeration")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlEnumerationLiteral")][QStringLiteral("enumeration")][QtModeling::OppositeEndRole] = QStringLiteral("Enumeration-ownedLiteral");
-
-}
-
diff --git a/src/uml/qumlenumerationliteral.h b/src/uml/qumlenumerationliteral.h
index 73a8bf26..416c0640 100644
--- a/src/uml/qumlenumerationliteral.h
+++ b/src/uml/qumlenumerationliteral.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlInstanceSpecification>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlEnumeration;
 class Q_UML_EXPORT QUmlEnumerationLiteral : public QUmlInstanceSpecification
 {
 public:
-    explicit QUmlEnumerationLiteral(bool createQObject = true);
+    explicit QUmlEnumerationLiteral(bool createQModelingObject = true);
     virtual ~QUmlEnumerationLiteral();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlEnumeration *classifier() const;
@@ -70,9 +69,6 @@ public:
 
 protected:
     QUmlEnumeration *_enumeration;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlevent.cpp b/src/uml/qumlevent.cpp
index fec4f1b8..2aa0ac0b 100644
--- a/src/uml/qumlevent.cpp
+++ b/src/uml/qumlevent.cpp
@@ -59,15 +59,13 @@
  */
 QUmlEvent::QUmlEvent()
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlEvent::~QUmlEvent()
 {
 }
 
-QModelingObject *QUmlEvent::clone() const
+QModelingElement *QUmlEvent::clone() const
 {
     QUmlEvent *c = new QUmlEvent;
     foreach (QUmlComment *element, ownedComments())
@@ -85,24 +83,3 @@ QModelingObject *QUmlEvent::clone() const
     return c;
 }
 
-void QUmlEvent::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-}
-
-void QUmlEvent::setPropertyData()
-{
-}
-
diff --git a/src/uml/qumlevent.h b/src/uml/qumlevent.h
index 3e32d4b2..368a4311 100644
--- a/src/uml/qumlevent.h
+++ b/src/uml/qumlevent.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlPackageableElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,15 +56,12 @@ class Q_UML_EXPORT QUmlEvent : public QUmlPackageableElement
 public:
     virtual ~QUmlEvent();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
 
 protected:
     explicit QUmlEvent();
 
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlexceptionhandler.cpp b/src/uml/qumlexceptionhandler.cpp
index c2500818..a3f8f876 100644
--- a/src/uml/qumlexceptionhandler.cpp
+++ b/src/uml/qumlexceptionhandler.cpp
@@ -55,27 +55,25 @@
 
     \brief An exception handler is an element that specifies a body to execute in case the specified exception occurs during the execution of the protected node.
  */
-QUmlExceptionHandler::QUmlExceptionHandler(bool createQObject) :
+QUmlExceptionHandler::QUmlExceptionHandler(bool createQModelingObject) :
     _exceptionInput(0),
     _handlerBody(0),
     _protectedNode(0)
 {
-    if (createQObject)
-        _qObject = new QUmlExceptionHandlerObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlExceptionHandlerObject(this));
 }
 
 QUmlExceptionHandler::~QUmlExceptionHandler()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlExceptionHandler::clone() const
+QModelingElement *QUmlExceptionHandler::clone() const
 {
     QUmlExceptionHandler *c = new QUmlExceptionHandler;
     foreach (QUmlComment *element, ownedComments())
@@ -109,8 +107,8 @@ void QUmlExceptionHandler::setExceptionInput(QUmlObjectNode *exceptionInput)
 
     if (_exceptionInput != exceptionInput) {
         _exceptionInput = exceptionInput;
-        if (exceptionInput && exceptionInput->asQObject() && this->asQObject())
-            QObject::connect(exceptionInput->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setExceptionInput()));
+        if (exceptionInput && exceptionInput->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(exceptionInput->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setExceptionInput()));
     }
 }
 
@@ -130,8 +128,8 @@ void QUmlExceptionHandler::addExceptionType(QUmlClassifier *exceptionType)
 
     if (!_exceptionTypes.contains(exceptionType)) {
         _exceptionTypes.insert(exceptionType);
-        if (exceptionType && exceptionType->asQObject() && this->asQObject())
-            QObject::connect(exceptionType->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeExceptionType(QObject *)));
+        if (exceptionType && exceptionType->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(exceptionType->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeExceptionType(QObject *)));
     }
 }
 
@@ -160,8 +158,8 @@ void QUmlExceptionHandler::setHandlerBody(QUmlExecutableNode *handlerBody)
 
     if (_handlerBody != handlerBody) {
         _handlerBody = handlerBody;
-        if (handlerBody && handlerBody->asQObject() && this->asQObject())
-            QObject::connect(handlerBody->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setHandlerBody()));
+        if (handlerBody && handlerBody->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(handlerBody->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setHandlerBody()));
     }
 }
 
@@ -183,64 +181,11 @@ void QUmlExceptionHandler::setProtectedNode(QUmlExecutableNode *protectedNode)
         // Adjust subsetted properties
 
         _protectedNode = protectedNode;
-        if (protectedNode && protectedNode->asQObject() && this->asQObject())
-            QObject::connect(protectedNode->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setProtectedNode()));
+        if (protectedNode && protectedNode->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(protectedNode->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setProtectedNode()));
 
         // Adjust subsetted properties
         setOwner(protectedNode);
     }
 }
 
-void QUmlExceptionHandler::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlExceptionHandler"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("exceptionInput"))));
-    _groupProperties.insert(QStringLiteral("QUmlExceptionHandler"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("exceptionTypes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExceptionHandler"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlerBody"))));
-    _groupProperties.insert(QStringLiteral("QUmlExceptionHandler"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("protectedNode"))));
-}
-
-void QUmlExceptionHandler::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExceptionHandler")][QStringLiteral("exceptionInput")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExceptionHandler")][QStringLiteral("exceptionInput")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExceptionHandler");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExceptionHandler")][QStringLiteral("exceptionInput")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExceptionHandler")][QStringLiteral("exceptionInput")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExceptionHandler")][QStringLiteral("exceptionInput")][QtModeling::DocumentationRole] = QStringLiteral("An object node within the handler body. When the handler catches an exception, the exception token is placed in this node, causing the body to execute.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExceptionHandler")][QStringLiteral("exceptionInput")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExceptionHandler")][QStringLiteral("exceptionInput")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExceptionHandler")][QStringLiteral("exceptionInput")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExceptionHandler")][QStringLiteral("exceptionTypes")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExceptionHandler")][QStringLiteral("exceptionTypes")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExceptionHandler");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExceptionHandler")][QStringLiteral("exceptionTypes")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExceptionHandler")][QStringLiteral("exceptionTypes")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExceptionHandler")][QStringLiteral("exceptionTypes")][QtModeling::DocumentationRole] = QStringLiteral("The kind of instances that the handler catches. If an exception occurs whose type is any of the classifiers in the set, the handler catches the exception and executes its body.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExceptionHandler")][QStringLiteral("exceptionTypes")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExceptionHandler")][QStringLiteral("exceptionTypes")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExceptionHandler")][QStringLiteral("exceptionTypes")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExceptionHandler")][QStringLiteral("handlerBody")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExceptionHandler")][QStringLiteral("handlerBody")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExceptionHandler");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExceptionHandler")][QStringLiteral("handlerBody")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExceptionHandler")][QStringLiteral("handlerBody")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExceptionHandler")][QStringLiteral("handlerBody")][QtModeling::DocumentationRole] = QStringLiteral("A node that is executed if the handler satisfies an uncaught exception.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExceptionHandler")][QStringLiteral("handlerBody")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExceptionHandler")][QStringLiteral("handlerBody")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExceptionHandler")][QStringLiteral("handlerBody")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExceptionHandler")][QStringLiteral("protectedNode")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExceptionHandler")][QStringLiteral("protectedNode")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExceptionHandler");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExceptionHandler")][QStringLiteral("protectedNode")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExceptionHandler")][QStringLiteral("protectedNode")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExceptionHandler")][QStringLiteral("protectedNode")][QtModeling::DocumentationRole] = QStringLiteral("The node protected by the handler. The handler is examined if an exception propagates to the outside of the node.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExceptionHandler")][QStringLiteral("protectedNode")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExceptionHandler")][QStringLiteral("protectedNode")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExceptionHandler")][QStringLiteral("protectedNode")][QtModeling::OppositeEndRole] = QStringLiteral("ExecutableNode-handler");
-
-}
-
diff --git a/src/uml/qumlexceptionhandler.h b/src/uml/qumlexceptionhandler.h
index 1fffa4bf..8ad554d0 100644
--- a/src/uml/qumlexceptionhandler.h
+++ b/src/uml/qumlexceptionhandler.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -59,10 +58,10 @@ class QUmlObjectNode;
 class Q_UML_EXPORT QUmlExceptionHandler : public QUmlElement
 {
 public:
-    explicit QUmlExceptionHandler(bool createQObject = true);
+    explicit QUmlExceptionHandler(bool createQModelingObject = true);
     virtual ~QUmlExceptionHandler();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlObjectNode *exceptionInput() const;
@@ -80,9 +79,6 @@ protected:
     QSet<QUmlClassifier *> _exceptionTypes;
     QUmlExecutableNode *_handlerBody;
     QUmlExecutableNode *_protectedNode;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlexecutablenode.cpp b/src/uml/qumlexecutablenode.cpp
index 7283ba93..184af24d 100644
--- a/src/uml/qumlexecutablenode.cpp
+++ b/src/uml/qumlexecutablenode.cpp
@@ -67,15 +67,13 @@
  */
 QUmlExecutableNode::QUmlExecutableNode()
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlExecutableNode::~QUmlExecutableNode()
 {
 }
 
-QModelingObject *QUmlExecutableNode::clone() const
+QModelingElement *QUmlExecutableNode::clone() const
 {
     QUmlExecutableNode *c = new QUmlExecutableNode;
     foreach (QUmlComment *element, ownedComments())
@@ -124,9 +122,9 @@ void QUmlExecutableNode::addHandler(QUmlExceptionHandler *handler)
 
     if (!_handlers.contains(handler)) {
         _handlers.insert(handler);
-        if (handler && handler->asQObject() && this->asQObject())
-            QObject::connect(handler->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeHandler(QObject *)));
-        handler->asQObject()->setParent(this->asQObject());
+        if (handler && handler->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(handler->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeHandler(QObject *)));
+        handler->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(handler);
@@ -144,8 +142,8 @@ void QUmlExecutableNode::removeHandler(QUmlExceptionHandler *handler)
 
     if (_handlers.contains(handler)) {
         _handlers.remove(handler);
-        if (handler->asQObject())
-            handler->asQObject()->setParent(0);
+        if (handler->asQModelingObject())
+            handler->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(handler);
@@ -157,43 +155,3 @@ void QUmlExecutableNode::removeHandler(QUmlExceptionHandler *handler)
     }
 }
 
-void QUmlExecutableNode::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-}
-
-void QUmlExecutableNode::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutableNode")][QStringLiteral("handlers")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutableNode")][QStringLiteral("handlers")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExecutableNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutableNode")][QStringLiteral("handlers")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutableNode")][QStringLiteral("handlers")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutableNode")][QStringLiteral("handlers")][QtModeling::DocumentationRole] = QStringLiteral("A set of exception handlers that are examined if an uncaught exception propagates to the outer level of the executable node.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutableNode")][QStringLiteral("handlers")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutableNode")][QStringLiteral("handlers")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutableNode")][QStringLiteral("handlers")][QtModeling::OppositeEndRole] = QStringLiteral("ExceptionHandler-protectedNode");
-
-}
-
diff --git a/src/uml/qumlexecutablenode.h b/src/uml/qumlexecutablenode.h
index cea548da..1844b424 100644
--- a/src/uml/qumlexecutablenode.h
+++ b/src/uml/qumlexecutablenode.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlActivityNode>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -59,7 +58,7 @@ class Q_UML_EXPORT QUmlExecutableNode : public QUmlActivityNode
 public:
     virtual ~QUmlExecutableNode();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlExceptionHandler *> handlers() const;
@@ -70,9 +69,6 @@ protected:
     explicit QUmlExecutableNode();
 
     QSet<QUmlExceptionHandler *> _handlers;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlexecutionenvironment.cpp b/src/uml/qumlexecutionenvironment.cpp
index 5462d779..4add73c1 100644
--- a/src/uml/qumlexecutionenvironment.cpp
+++ b/src/uml/qumlexecutionenvironment.cpp
@@ -88,25 +88,23 @@
 
     \brief An execution environment is a node that offers an execution environment for specific types of components that are deployed on it in the form of executable artifacts.
  */
-QUmlExecutionEnvironment::QUmlExecutionEnvironment(bool createQObject) :
+QUmlExecutionEnvironment::QUmlExecutionEnvironment(bool createQModelingObject) :
     QUmlNode(false)
 {
-    if (createQObject)
-        _qObject = new QUmlExecutionEnvironmentObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlExecutionEnvironmentObject(this));
 }
 
 QUmlExecutionEnvironment::~QUmlExecutionEnvironment()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlExecutionEnvironment::clone() const
+QModelingElement *QUmlExecutionEnvironment::clone() const
 {
     QUmlExecutionEnvironment *c = new QUmlExecutionEnvironment;
     foreach (QUmlComment *element, ownedComments())
@@ -176,66 +174,3 @@ QModelingObject *QUmlExecutionEnvironment::clone() const
     return c;
 }
 
-void QUmlExecutionEnvironment::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedConnectors"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parts"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("roles"))));
-    _groupProperties.insert(QStringLiteral("QUmlEncapsulatedClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedPorts"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifierBehavior"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interfaceRealizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedBehaviors"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extensions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isActive"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedReceptions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superClasses"))));
-    _groupProperties.insert(QStringLiteral("QUmlDeploymentTarget"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deployedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlDeploymentTarget"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deployments"))));
-    _groupProperties.insert(QStringLiteral("QUmlNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedNodes"))));
-}
-
-void QUmlExecutionEnvironment::setPropertyData()
-{
-}
-
diff --git a/src/uml/qumlexecutionenvironment.h b/src/uml/qumlexecutionenvironment.h
index 1177b6e0..569f175c 100644
--- a/src/uml/qumlexecutionenvironment.h
+++ b/src/uml/qumlexecutionenvironment.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlNode>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,16 +54,13 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlExecutionEnvironment : public QUmlNode
 {
 public:
-    explicit QUmlExecutionEnvironment(bool createQObject = true);
+    explicit QUmlExecutionEnvironment(bool createQModelingObject = true);
     virtual ~QUmlExecutionEnvironment();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
 
 protected:
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlexecutionoccurrencespecification.cpp b/src/uml/qumlexecutionoccurrencespecification.cpp
index 7a203bb5..d49618d6 100644
--- a/src/uml/qumlexecutionoccurrencespecification.cpp
+++ b/src/uml/qumlexecutionoccurrencespecification.cpp
@@ -62,26 +62,24 @@
 
     \brief An execution occurrence specification represents moments in time at which actions or behaviors start or finish.
  */
-QUmlExecutionOccurrenceSpecification::QUmlExecutionOccurrenceSpecification(bool createQObject) :
+QUmlExecutionOccurrenceSpecification::QUmlExecutionOccurrenceSpecification(bool createQModelingObject) :
     QUmlOccurrenceSpecification(false),
     _execution(0)
 {
-    if (createQObject)
-        _qObject = new QUmlExecutionOccurrenceSpecificationObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlExecutionOccurrenceSpecificationObject(this));
 }
 
 QUmlExecutionOccurrenceSpecification::~QUmlExecutionOccurrenceSpecification()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlExecutionOccurrenceSpecification::clone() const
+QModelingElement *QUmlExecutionOccurrenceSpecification::clone() const
 {
     QUmlExecutionOccurrenceSpecification *c = new QUmlExecutionOccurrenceSpecification;
     foreach (QUmlComment *element, ownedComments())
@@ -127,43 +125,8 @@ void QUmlExecutionOccurrenceSpecification::setExecution(QUmlExecutionSpecificati
 
     if (_execution != execution) {
         _execution = execution;
-        if (execution && execution->asQObject() && this->asQObject())
-            QObject::connect(execution->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setExecution()));
+        if (execution && execution->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(execution->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setExecution()));
     }
 }
 
-void QUmlExecutionOccurrenceSpecification::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingInteraction"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingOperand"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalOrderings"))));
-    _groupProperties.insert(QStringLiteral("QUmlOccurrenceSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("covered"))));
-    _groupProperties.insert(QStringLiteral("QUmlOccurrenceSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("toAfters"))));
-    _groupProperties.insert(QStringLiteral("QUmlOccurrenceSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("toBefores"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutionOccurrenceSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("execution"))));
-}
-
-void QUmlExecutionOccurrenceSpecification::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutionOccurrenceSpecification")][QStringLiteral("execution")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutionOccurrenceSpecification")][QStringLiteral("execution")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExecutionOccurrenceSpecification");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutionOccurrenceSpecification")][QStringLiteral("execution")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutionOccurrenceSpecification")][QStringLiteral("execution")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutionOccurrenceSpecification")][QStringLiteral("execution")][QtModeling::DocumentationRole] = QStringLiteral("References the execution specification describing the execution that is started or finished at this execution event.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutionOccurrenceSpecification")][QStringLiteral("execution")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutionOccurrenceSpecification")][QStringLiteral("execution")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutionOccurrenceSpecification")][QStringLiteral("execution")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlexecutionoccurrencespecification.h b/src/uml/qumlexecutionoccurrencespecification.h
index d2688a0d..54c02c7a 100644
--- a/src/uml/qumlexecutionoccurrencespecification.h
+++ b/src/uml/qumlexecutionoccurrencespecification.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlOccurrenceSpecification>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlExecutionSpecification;
 class Q_UML_EXPORT QUmlExecutionOccurrenceSpecification : public QUmlOccurrenceSpecification
 {
 public:
-    explicit QUmlExecutionOccurrenceSpecification(bool createQObject = true);
+    explicit QUmlExecutionOccurrenceSpecification(bool createQModelingObject = true);
     virtual ~QUmlExecutionOccurrenceSpecification();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlExecutionSpecification *execution() const;
@@ -68,9 +67,6 @@ public:
 
 protected:
     QUmlExecutionSpecification *_execution;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlexecutionspecification.cpp b/src/uml/qumlexecutionspecification.cpp
index 56d39943..2034dc14 100644
--- a/src/uml/qumlexecutionspecification.cpp
+++ b/src/uml/qumlexecutionspecification.cpp
@@ -64,15 +64,13 @@ QUmlExecutionSpecification::QUmlExecutionSpecification() :
     _finish(0),
     _start(0)
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlExecutionSpecification::~QUmlExecutionSpecification()
 {
 }
 
-QModelingObject *QUmlExecutionSpecification::clone() const
+QModelingElement *QUmlExecutionSpecification::clone() const
 {
     QUmlExecutionSpecification *c = new QUmlExecutionSpecification;
     foreach (QUmlComment *element, ownedComments())
@@ -116,8 +114,8 @@ void QUmlExecutionSpecification::setFinish(QUmlOccurrenceSpecification *finish)
 
     if (_finish != finish) {
         _finish = finish;
-        if (finish && finish->asQObject() && this->asQObject())
-            QObject::connect(finish->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setFinish()));
+        if (finish && finish->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(finish->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setFinish()));
     }
 }
 
@@ -137,51 +135,8 @@ void QUmlExecutionSpecification::setStart(QUmlOccurrenceSpecification *start)
 
     if (_start != start) {
         _start = start;
-        if (start && start->asQObject() && this->asQObject())
-            QObject::connect(start->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setStart()));
+        if (start && start->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(start->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setStart()));
     }
 }
 
-void QUmlExecutionSpecification::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("covered"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingInteraction"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingOperand"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalOrderings"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutionSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("finish"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutionSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("start"))));
-}
-
-void QUmlExecutionSpecification::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutionSpecification")][QStringLiteral("finish")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutionSpecification")][QStringLiteral("finish")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExecutionSpecification");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutionSpecification")][QStringLiteral("finish")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutionSpecification")][QStringLiteral("finish")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutionSpecification")][QStringLiteral("finish")][QtModeling::DocumentationRole] = QStringLiteral("References the OccurrenceSpecification that designates the finish of the Action or Behavior.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutionSpecification")][QStringLiteral("finish")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutionSpecification")][QStringLiteral("finish")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutionSpecification")][QStringLiteral("finish")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutionSpecification")][QStringLiteral("start")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutionSpecification")][QStringLiteral("start")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExecutionSpecification");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutionSpecification")][QStringLiteral("start")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutionSpecification")][QStringLiteral("start")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutionSpecification")][QStringLiteral("start")][QtModeling::DocumentationRole] = QStringLiteral("References the OccurrenceSpecification that designates the start of the Action or Behavior");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutionSpecification")][QStringLiteral("start")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutionSpecification")][QStringLiteral("start")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutionSpecification")][QStringLiteral("start")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlexecutionspecification.h b/src/uml/qumlexecutionspecification.h
index f7b5348c..eeb42ec0 100644
--- a/src/uml/qumlexecutionspecification.h
+++ b/src/uml/qumlexecutionspecification.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlInteractionFragment>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -59,7 +58,7 @@ class Q_UML_EXPORT QUmlExecutionSpecification : public QUmlInteractionFragment
 public:
     virtual ~QUmlExecutionSpecification();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlOccurrenceSpecification *finish() const;
@@ -72,9 +71,6 @@ protected:
 
     QUmlOccurrenceSpecification *_finish;
     QUmlOccurrenceSpecification *_start;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlexpansionnode.cpp b/src/uml/qumlexpansionnode.cpp
index db7935b6..76873911 100644
--- a/src/uml/qumlexpansionnode.cpp
+++ b/src/uml/qumlexpansionnode.cpp
@@ -71,26 +71,24 @@
 
     \brief An expansion node is an object node used to indicate a flow across the boundary of an expansion region. A flow into a region contains a collection that is broken into its individual elements inside the region, which is executed once per element. A flow out of a region combines individual elements into a collection for use outside the region.
  */
-QUmlExpansionNode::QUmlExpansionNode(bool createQObject) :
+QUmlExpansionNode::QUmlExpansionNode(bool createQModelingObject) :
     _regionAsInput(0),
     _regionAsOutput(0)
 {
-    if (createQObject)
-        _qObject = new QUmlExpansionNodeObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlExpansionNodeObject(this));
 }
 
 QUmlExpansionNode::~QUmlExpansionNode()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlExpansionNode::clone() const
+QModelingElement *QUmlExpansionNode::clone() const
 {
     QUmlExpansionNode *c = new QUmlExpansionNode;
     foreach (QUmlComment *element, ownedComments())
@@ -151,8 +149,8 @@ void QUmlExpansionNode::setRegionAsInput(QUmlExpansionRegion *regionAsInput)
 
     if (_regionAsInput != regionAsInput) {
         _regionAsInput = regionAsInput;
-        if (regionAsInput && regionAsInput->asQObject() && this->asQObject())
-            QObject::connect(regionAsInput->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setRegionAsInput()));
+        if (regionAsInput && regionAsInput->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(regionAsInput->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setRegionAsInput()));
     }
 }
 
@@ -172,64 +170,8 @@ void QUmlExpansionNode::setRegionAsOutput(QUmlExpansionRegion *regionAsOutput)
 
     if (_regionAsOutput != regionAsOutput) {
         _regionAsOutput = regionAsOutput;
-        if (regionAsOutput && regionAsOutput->asQObject() && this->asQObject())
-            QObject::connect(regionAsOutput->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setRegionAsOutput()));
+        if (regionAsOutput && regionAsOutput->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(regionAsOutput->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setRegionAsOutput()));
     }
 }
 
-void QUmlExpansionNode::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStates"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isControlType"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ordering"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("selection"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperBound"))));
-    _groupProperties.insert(QStringLiteral("QUmlExpansionNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("regionAsInput"))));
-    _groupProperties.insert(QStringLiteral("QUmlExpansionNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("regionAsOutput"))));
-}
-
-void QUmlExpansionNode::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionNode")][QStringLiteral("regionAsInput")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionNode")][QStringLiteral("regionAsInput")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExpansionNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionNode")][QStringLiteral("regionAsInput")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionNode")][QStringLiteral("regionAsInput")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionNode")][QStringLiteral("regionAsInput")][QtModeling::DocumentationRole] = QStringLiteral("The expansion region for which the node is an input.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionNode")][QStringLiteral("regionAsInput")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionNode")][QStringLiteral("regionAsInput")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionNode")][QStringLiteral("regionAsInput")][QtModeling::OppositeEndRole] = QStringLiteral("ExpansionRegion-inputElement");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionNode")][QStringLiteral("regionAsOutput")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionNode")][QStringLiteral("regionAsOutput")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExpansionNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionNode")][QStringLiteral("regionAsOutput")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionNode")][QStringLiteral("regionAsOutput")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionNode")][QStringLiteral("regionAsOutput")][QtModeling::DocumentationRole] = QStringLiteral("The expansion region for which the node is an output.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionNode")][QStringLiteral("regionAsOutput")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionNode")][QStringLiteral("regionAsOutput")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionNode")][QStringLiteral("regionAsOutput")][QtModeling::OppositeEndRole] = QStringLiteral("ExpansionRegion-outputElement");
-
-}
-
diff --git a/src/uml/qumlexpansionnode.h b/src/uml/qumlexpansionnode.h
index da0a9782..5e7d72e3 100644
--- a/src/uml/qumlexpansionnode.h
+++ b/src/uml/qumlexpansionnode.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlObjectNode>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlExpansionRegion;
 class Q_UML_EXPORT QUmlExpansionNode : public QUmlObjectNode
 {
 public:
-    explicit QUmlExpansionNode(bool createQObject = true);
+    explicit QUmlExpansionNode(bool createQModelingObject = true);
     virtual ~QUmlExpansionNode();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlExpansionRegion *regionAsInput() const;
@@ -71,9 +70,6 @@ public:
 protected:
     QUmlExpansionRegion *_regionAsInput;
     QUmlExpansionRegion *_regionAsOutput;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlexpansionregion.cpp b/src/uml/qumlexpansionregion.cpp
index 51301cc7..c93e97db 100644
--- a/src/uml/qumlexpansionregion.cpp
+++ b/src/uml/qumlexpansionregion.cpp
@@ -75,26 +75,24 @@
 
     \brief An expansion region is a structured activity region that executes multiple times corresponding to elements of an input collection.
  */
-QUmlExpansionRegion::QUmlExpansionRegion(bool createQObject) :
+QUmlExpansionRegion::QUmlExpansionRegion(bool createQModelingObject) :
     QUmlStructuredActivityNode(false),
     _mode(QtUml::ExpansionKindIterative)
 {
-    if (createQObject)
-        _qObject = new QUmlExpansionRegionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlExpansionRegionObject(this));
 }
 
 QUmlExpansionRegion::~QUmlExpansionRegion()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlExpansionRegion::clone() const
+QModelingElement *QUmlExpansionRegion::clone() const
 {
     QUmlExpansionRegion *c = new QUmlExpansionRegion;
     foreach (QUmlComment *element, ownedComments())
@@ -170,8 +168,8 @@ void QUmlExpansionRegion::addInputElement(QUmlExpansionNode *inputElement)
 
     if (!_inputElements.contains(inputElement)) {
         _inputElements.insert(inputElement);
-        if (inputElement && inputElement->asQObject() && this->asQObject())
-            QObject::connect(inputElement->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeInputElement(QObject *)));
+        if (inputElement && inputElement->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(inputElement->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeInputElement(QObject *)));
 
         // Adjust opposite properties
         if (inputElement) {
@@ -210,7 +208,7 @@ void QUmlExpansionRegion::setMode(QtUml::ExpansionKind mode)
 
     if (_mode != mode) {
         _mode = mode;
-        _modifiedResettableProperties << QStringLiteral("mode");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("mode");
     }
 }
 
@@ -230,8 +228,8 @@ void QUmlExpansionRegion::addOutputElement(QUmlExpansionNode *outputElement)
 
     if (!_outputElements.contains(outputElement)) {
         _outputElements.insert(outputElement);
-        if (outputElement && outputElement->asQObject() && this->asQObject())
-            QObject::connect(outputElement->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeOutputElement(QObject *)));
+        if (outputElement && outputElement->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(outputElement->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeOutputElement(QObject *)));
 
         // Adjust opposite properties
         if (outputElement) {
@@ -254,86 +252,3 @@ void QUmlExpansionRegion::removeOutputElement(QUmlExpansionNode *outputElement)
     }
 }
 
-void QUmlExpansionRegion::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("containedEdges"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("containedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("subgroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superGroup"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("edges"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("mustIsolate"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("structuredNodeInputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("structuredNodeOutputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("variables"))));
-    _groupProperties.insert(QStringLiteral("QUmlExpansionRegion"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlExpansionRegion"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("mode"))));
-    _groupProperties.insert(QStringLiteral("QUmlExpansionRegion"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputElements"))));
-}
-
-void QUmlExpansionRegion::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionRegion")][QStringLiteral("inputElements")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionRegion")][QStringLiteral("inputElements")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExpansionRegion");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionRegion")][QStringLiteral("inputElements")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionRegion")][QStringLiteral("inputElements")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionRegion")][QStringLiteral("inputElements")][QtModeling::DocumentationRole] = QStringLiteral("An object node that holds a separate element of the input collection during each of the multiple executions of the region.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionRegion")][QStringLiteral("inputElements")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionRegion")][QStringLiteral("inputElements")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionRegion")][QStringLiteral("inputElements")][QtModeling::OppositeEndRole] = QStringLiteral("ExpansionNode-regionAsInput");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionRegion")][QStringLiteral("mode")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionRegion")][QStringLiteral("mode")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExpansionRegion");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionRegion")][QStringLiteral("mode")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionRegion")][QStringLiteral("mode")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionRegion")][QStringLiteral("mode")][QtModeling::DocumentationRole] = QStringLiteral("The way in which the executions interact: parallel: all interactions are independent iterative: the interactions occur in order of the elements stream: a stream of values flows into a single execution");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionRegion")][QStringLiteral("mode")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionRegion")][QStringLiteral("mode")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionRegion")][QStringLiteral("mode")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionRegion")][QStringLiteral("outputElements")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionRegion")][QStringLiteral("outputElements")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExpansionRegion");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionRegion")][QStringLiteral("outputElements")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionRegion")][QStringLiteral("outputElements")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionRegion")][QStringLiteral("outputElements")][QtModeling::DocumentationRole] = QStringLiteral("An object node that accepts a separate element of the output collection during each of the multiple executions of the region. The values are formed into a collection that is available when the execution of the region is complete.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionRegion")][QStringLiteral("outputElements")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionRegion")][QStringLiteral("outputElements")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionRegion")][QStringLiteral("outputElements")][QtModeling::OppositeEndRole] = QStringLiteral("ExpansionNode-regionAsOutput");
-
-}
-
diff --git a/src/uml/qumlexpansionregion.h b/src/uml/qumlexpansionregion.h
index 5549a656..658262af 100644
--- a/src/uml/qumlexpansionregion.h
+++ b/src/uml/qumlexpansionregion.h
@@ -47,7 +47,6 @@
 
 
 #include <QtUml/QtUmlNamespace>
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -59,10 +58,10 @@ class QUmlExpansionNode;
 class Q_UML_EXPORT QUmlExpansionRegion : public QUmlStructuredActivityNode
 {
 public:
-    explicit QUmlExpansionRegion(bool createQObject = true);
+    explicit QUmlExpansionRegion(bool createQModelingObject = true);
     virtual ~QUmlExpansionRegion();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlExpansionNode *> inputElements() const;
@@ -78,9 +77,6 @@ protected:
     QSet<QUmlExpansionNode *> _inputElements;
     QtUml::ExpansionKind _mode;
     QSet<QUmlExpansionNode *> _outputElements;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlexpression.cpp b/src/uml/qumlexpression.cpp
index 51b59213..39739cb7 100644
--- a/src/uml/qumlexpression.cpp
+++ b/src/uml/qumlexpression.cpp
@@ -61,24 +61,22 @@
 
     \brief An expression is a structured tree of symbols that denotes a (possibly empty) set of values when evaluated in a context.An expression represents a node in an expression tree, which may be non-terminal or terminal. It defines a symbol, and has a possibly empty sequence of operands which are value specifications.
  */
-QUmlExpression::QUmlExpression(bool createQObject)
+QUmlExpression::QUmlExpression(bool createQModelingObject)
 {
-    if (createQObject)
-        _qObject = new QUmlExpressionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlExpressionObject(this));
 }
 
 QUmlExpression::~QUmlExpression()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlExpression::clone() const
+QModelingElement *QUmlExpression::clone() const
 {
     QUmlExpression *c = new QUmlExpression;
     foreach (QUmlComment *element, ownedComments())
@@ -119,9 +117,9 @@ void QUmlExpression::addOperand(QUmlValueSpecification *operand)
 
     if (!_operands.contains(operand)) {
         _operands.append(operand);
-        if (operand && operand->asQObject() && this->asQObject())
-            QObject::connect(operand->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeOperand(QObject *)));
-        operand->asQObject()->setParent(this->asQObject());
+        if (operand && operand->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(operand->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeOperand(QObject *)));
+        operand->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(operand);
@@ -134,8 +132,8 @@ void QUmlExpression::removeOperand(QUmlValueSpecification *operand)
 
     if (_operands.contains(operand)) {
         _operands.removeAll(operand);
-        if (operand->asQObject())
-            operand->asQObject()->setParent(0);
+        if (operand->asQModelingObject())
+            operand->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(operand);
@@ -161,45 +159,3 @@ void QUmlExpression::setSymbol(QString symbol)
     }
 }
 
-void QUmlExpression::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlExpression"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("operands"))));
-    _groupProperties.insert(QStringLiteral("QUmlExpression"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("symbol"))));
-}
-
-void QUmlExpression::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpression")][QStringLiteral("operands")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpression")][QStringLiteral("operands")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExpression");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpression")][QStringLiteral("operands")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpression")][QStringLiteral("operands")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpression")][QStringLiteral("operands")][QtModeling::DocumentationRole] = QStringLiteral("Specifies a sequence of operands.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpression")][QStringLiteral("operands")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpression")][QStringLiteral("operands")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpression")][QStringLiteral("operands")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpression")][QStringLiteral("symbol")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpression")][QStringLiteral("symbol")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExpression");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpression")][QStringLiteral("symbol")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpression")][QStringLiteral("symbol")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpression")][QStringLiteral("symbol")][QtModeling::DocumentationRole] = QStringLiteral("The symbol associated with the node in the expression tree.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpression")][QStringLiteral("symbol")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpression")][QStringLiteral("symbol")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpression")][QStringLiteral("symbol")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlexpression.h b/src/uml/qumlexpression.h
index 07d6d38f..b5db81c9 100644
--- a/src/uml/qumlexpression.h
+++ b/src/uml/qumlexpression.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlValueSpecification>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,10 +54,10 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlExpression : public QUmlValueSpecification
 {
 public:
-    explicit QUmlExpression(bool createQObject = true);
+    explicit QUmlExpression(bool createQModelingObject = true);
     virtual ~QUmlExpression();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QList<QUmlValueSpecification *> operands() const;
@@ -70,9 +69,6 @@ public:
 protected:
     QList<QUmlValueSpecification *> _operands;
     QString _symbol;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlextend.cpp b/src/uml/qumlextend.cpp
index 0115c602..d4f020ef 100644
--- a/src/uml/qumlextend.cpp
+++ b/src/uml/qumlextend.cpp
@@ -60,27 +60,25 @@
 
     \brief A relationship from an extending use case to an extended use case that specifies how and when the behavior defined in the extending use case can be inserted into the behavior defined in the extended use case.
  */
-QUmlExtend::QUmlExtend(bool createQObject) :
+QUmlExtend::QUmlExtend(bool createQModelingObject) :
     _condition(0),
     _extendedCase(0),
     _extension(0)
 {
-    if (createQObject)
-        _qObject = new QUmlExtendObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlExtendObject(this));
 }
 
 QUmlExtend::~QUmlExtend()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlExtend::clone() const
+QModelingElement *QUmlExtend::clone() const
 {
     QUmlExtend *c = new QUmlExtend;
     foreach (QUmlComment *element, ownedComments())
@@ -123,9 +121,9 @@ void QUmlExtend::setCondition(QUmlConstraint *condition)
         removeOwnedElement(_condition);
 
         _condition = condition;
-        if (condition && condition->asQObject() && this->asQObject())
-            QObject::connect(condition->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setCondition()));
-        condition->asQObject()->setParent(this->asQObject());
+        if (condition && condition->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(condition->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setCondition()));
+        condition->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (condition) {
@@ -153,8 +151,8 @@ void QUmlExtend::setExtendedCase(QUmlUseCase *extendedCase)
         removeTarget(_extendedCase);
 
         _extendedCase = extendedCase;
-        if (extendedCase && extendedCase->asQObject() && this->asQObject())
-            QObject::connect(extendedCase->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setExtendedCase()));
+        if (extendedCase && extendedCase->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(extendedCase->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setExtendedCase()));
 
         // Adjust subsetted properties
         if (extendedCase) {
@@ -182,8 +180,8 @@ void QUmlExtend::setExtension(QUmlUseCase *extension)
         removeSource(_extension);
 
         _extension = extension;
-        if (extension && extension->asQObject() && this->asQObject())
-            QObject::connect(extension->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setExtension()));
+        if (extension && extension->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(extension->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setExtension()));
 
         // Adjust subsetted properties
         if (extension) {
@@ -209,8 +207,8 @@ void QUmlExtend::addExtensionLocation(QUmlExtensionPoint *extensionLocation)
 
     if (!_extensionLocations.contains(extensionLocation)) {
         _extensionLocations.append(extensionLocation);
-        if (extensionLocation && extensionLocation->asQObject() && this->asQObject())
-            QObject::connect(extensionLocation->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeExtensionLocation(QObject *)));
+        if (extensionLocation && extensionLocation->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(extensionLocation->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeExtensionLocation(QObject *)));
     }
 }
 
@@ -223,65 +221,3 @@ void QUmlExtend::removeExtensionLocation(QUmlExtensionPoint *extensionLocation)
     }
 }
 
-void QUmlExtend::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlExtend"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("condition"))));
-    _groupProperties.insert(QStringLiteral("QUmlExtend"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extendedCase"))));
-    _groupProperties.insert(QStringLiteral("QUmlExtend"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extension"))));
-    _groupProperties.insert(QStringLiteral("QUmlExtend"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extensionLocations"))));
-}
-
-void QUmlExtend::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtend")][QStringLiteral("condition")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtend")][QStringLiteral("condition")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExtend");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtend")][QStringLiteral("condition")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtend")][QStringLiteral("condition")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtend")][QStringLiteral("condition")][QtModeling::DocumentationRole] = QStringLiteral("References the condition that must hold when the first extension point is reached for the extension to take place. If no constraint is associated with the extend relationship, the extension is unconditional.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtend")][QStringLiteral("condition")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtend")][QStringLiteral("condition")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtend")][QStringLiteral("condition")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtend")][QStringLiteral("extendedCase")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtend")][QStringLiteral("extendedCase")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExtend");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtend")][QStringLiteral("extendedCase")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtend")][QStringLiteral("extendedCase")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtend")][QStringLiteral("extendedCase")][QtModeling::DocumentationRole] = QStringLiteral("References the use case that is being extended.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtend")][QStringLiteral("extendedCase")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtend")][QStringLiteral("extendedCase")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("DirectedRelationship-target");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtend")][QStringLiteral("extendedCase")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtend")][QStringLiteral("extension")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtend")][QStringLiteral("extension")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExtend");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtend")][QStringLiteral("extension")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtend")][QStringLiteral("extension")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtend")][QStringLiteral("extension")][QtModeling::DocumentationRole] = QStringLiteral("References the use case that represents the extension and owns the extend relationship.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtend")][QStringLiteral("extension")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtend")][QStringLiteral("extension")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("DirectedRelationship-source NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtend")][QStringLiteral("extension")][QtModeling::OppositeEndRole] = QStringLiteral("UseCase-extend");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtend")][QStringLiteral("extensionLocations")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtend")][QStringLiteral("extensionLocations")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExtend");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtend")][QStringLiteral("extensionLocations")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtend")][QStringLiteral("extensionLocations")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtend")][QStringLiteral("extensionLocations")][QtModeling::DocumentationRole] = QStringLiteral("An ordered list of extension points belonging to the extended use case, specifying where the respective behavioral fragments of the extending use case are to be inserted. The first fragment in the extending use case is associated with the first extension point in the list, the second fragment with the second point, and so on. (Note that, in most practical cases, the extending use case has just a single behavior fragment, so that the list of extension points is trivial.)");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtend")][QStringLiteral("extensionLocations")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtend")][QStringLiteral("extensionLocations")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtend")][QStringLiteral("extensionLocations")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlextend.h b/src/uml/qumlextend.h
index dadb5af8..0edceae3 100644
--- a/src/uml/qumlextend.h
+++ b/src/uml/qumlextend.h
@@ -46,7 +46,6 @@
 #include <QtUml/QUmlDirectedRelationship>
 #include <QtUml/QUmlNamedElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -60,10 +59,10 @@ class QUmlUseCase;
 class Q_UML_EXPORT QUmlExtend : public QUmlDirectedRelationship, public QUmlNamedElement
 {
 public:
-    explicit QUmlExtend(bool createQObject = true);
+    explicit QUmlExtend(bool createQModelingObject = true);
     virtual ~QUmlExtend();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlConstraint *condition() const;
@@ -81,9 +80,6 @@ protected:
     QUmlUseCase *_extendedCase;
     QUmlUseCase *_extension;
     QList<QUmlExtensionPoint *> _extensionLocations;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlextension.cpp b/src/uml/qumlextension.cpp
index 7bb6367b..5857a8ad 100644
--- a/src/uml/qumlextension.cpp
+++ b/src/uml/qumlextension.cpp
@@ -79,26 +79,24 @@
 
     \brief An extension is used to indicate that the properties of a metaclass are extended through a stereotype, and gives the ability to flexibly add (and later remove) stereotypes to classes.
  */
-QUmlExtension::QUmlExtension(bool createQObject) :
+QUmlExtension::QUmlExtension(bool createQModelingObject) :
     QUmlAssociation(false),
     _ownedEnd(0)
 {
-    if (createQObject)
-        _qObject = new QUmlExtensionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlExtensionObject(this));
 }
 
 QUmlExtension::~QUmlExtension()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlExtension::clone() const
+QModelingElement *QUmlExtension::clone() const
 {
     QUmlExtension *c = new QUmlExtension;
     foreach (QUmlComment *element, ownedComments())
@@ -220,9 +218,9 @@ void QUmlExtension::setOwnedEnd(QUmlExtensionEnd *ownedEnd)
 
     if (_ownedEnd != ownedEnd) {
         _ownedEnd = ownedEnd;
-        if (ownedEnd && ownedEnd->asQObject() && this->asQObject())
-            QObject::connect(ownedEnd->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setOwnedEnd()));
-        ownedEnd->asQObject()->setParent(this->asQObject());
+        if (ownedEnd && ownedEnd->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(ownedEnd->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setOwnedEnd()));
+        ownedEnd->asQModelingObject()->setParent(this->asQModelingObject());
     }
 }
 
@@ -238,85 +236,3 @@ QUmlProperty *QUmlExtension::metaclassEnd() const
     return 0;
 }
 
-void QUmlExtension::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generals"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlAssociation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("endTypes"))));
-    _groupProperties.insert(QStringLiteral("QUmlAssociation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isDerived"))));
-    _groupProperties.insert(QStringLiteral("QUmlAssociation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("memberEnds"))));
-    _groupProperties.insert(QStringLiteral("QUmlAssociation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("navigableOwnedEnds"))));
-    _groupProperties.insert(QStringLiteral("QUmlExtension"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isRequired"))));
-    _groupProperties.insert(QStringLiteral("QUmlExtension"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("metaclass"))));
-    _groupProperties.insert(QStringLiteral("QUmlExtension"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedEnd"))));
-}
-
-void QUmlExtension::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtension")][QStringLiteral("isRequired")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtension")][QStringLiteral("isRequired")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExtension");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtension")][QStringLiteral("isRequired")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtension")][QStringLiteral("isRequired")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtension")][QStringLiteral("isRequired")][QtModeling::DocumentationRole] = QStringLiteral("Indicates whether an instance of the extending stereotype must be created when an instance of the extended class is created. The attribute value is derived from the value of the lower property of the ExtensionEnd referenced by Extension::ownedEnd; a lower value of 1 means that isRequired is true, but otherwise it is false. Since the default value of ExtensionEnd::lower is 0, the default value of isRequired is false.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtension")][QStringLiteral("isRequired")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtension")][QStringLiteral("isRequired")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtension")][QStringLiteral("isRequired")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtension")][QStringLiteral("metaclass")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtension")][QStringLiteral("metaclass")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExtension");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtension")][QStringLiteral("metaclass")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtension")][QStringLiteral("metaclass")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtension")][QStringLiteral("metaclass")][QtModeling::DocumentationRole] = QStringLiteral("References the Class that is extended through an Extension. The property is derived from the type of the memberEnd that is not the ownedEnd.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtension")][QStringLiteral("metaclass")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtension")][QStringLiteral("metaclass")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtension")][QStringLiteral("metaclass")][QtModeling::OppositeEndRole] = QStringLiteral("Class-extension");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtension")][QStringLiteral("ownedEnd")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtension")][QStringLiteral("ownedEnd")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExtension");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtension")][QStringLiteral("ownedEnd")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtension")][QStringLiteral("ownedEnd")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtension")][QStringLiteral("ownedEnd")][QtModeling::DocumentationRole] = QStringLiteral("References the end of the extension that is typed by a Stereotype.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtension")][QStringLiteral("ownedEnd")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("Association-ownedEnd");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtension")][QStringLiteral("ownedEnd")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtension")][QStringLiteral("ownedEnd")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlextension.h b/src/uml/qumlextension.h
index dde313e5..2fb3389b 100644
--- a/src/uml/qumlextension.h
+++ b/src/uml/qumlextension.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlAssociation>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -59,10 +58,10 @@ class QUmlProperty;
 class Q_UML_EXPORT QUmlExtension : public QUmlAssociation
 {
 public:
-    explicit QUmlExtension(bool createQObject = true);
+    explicit QUmlExtension(bool createQModelingObject = true);
     virtual ~QUmlExtension();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     bool isRequired() const;
@@ -77,9 +76,6 @@ public:
 
 protected:
     QUmlExtensionEnd *_ownedEnd;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlextensionend.cpp b/src/uml/qumlextensionend.cpp
index e3f9b746..195b0ace 100644
--- a/src/uml/qumlextensionend.cpp
+++ b/src/uml/qumlextensionend.cpp
@@ -74,26 +74,24 @@
 
     \brief An extension end is used to tie an extension to a stereotype when extending a metaclass.The default multiplicity of an extension end is 0..1.
  */
-QUmlExtensionEnd::QUmlExtensionEnd(bool createQObject) :
+QUmlExtensionEnd::QUmlExtensionEnd(bool createQModelingObject) :
     QUmlProperty(false),
     _type(0)
 {
-    if (createQObject)
-        _qObject = new QUmlExtensionEndObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlExtensionEndObject(this));
 }
 
 QUmlExtensionEnd::~QUmlExtensionEnd()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlExtensionEnd::clone() const
+QModelingElement *QUmlExtensionEnd::clone() const
 {
     QUmlExtensionEnd *c = new QUmlExtensionEnd;
     foreach (QUmlComment *element, ownedComments())
@@ -190,8 +188,8 @@ void QUmlExtensionEnd::setType(QUmlStereotype *type)
 
     if (_type != type) {
         _type = type;
-        if (type && type->asQObject() && this->asQObject())
-            QObject::connect(type->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setType()));
+        if (type && type->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(type->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setType()));
     }
 }
 
@@ -207,75 +205,3 @@ int QUmlExtensionEnd::lowerBound() const
     return int ();
 }
 
-void QUmlExtensionEnd::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isOrdered"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isUnique"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lowerValue"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upper"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperValue"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("featuringClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isStatic"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlConnectableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ends"))));
-    _groupProperties.insert(QStringLiteral("QUmlConnectableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlDeploymentTarget"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deployedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlDeploymentTarget"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deployments"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("aggregation"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("association"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("associationEnd"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("class_"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("datatype"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("default_"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("defaultValue"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interface_"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isComposite"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isDerived"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isDerivedUnion"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isID"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isReadOnly"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("opposite"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningAssociation"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedProperties"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("subsettedProperties"))));
-    _groupProperties.insert(QStringLiteral("QUmlExtensionEnd"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lower"))));
-    _groupProperties.insert(QStringLiteral("QUmlExtensionEnd"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
-}
-
-void QUmlExtensionEnd::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtensionEnd")][QStringLiteral("lower")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtensionEnd")][QStringLiteral("lower")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExtensionEnd");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtensionEnd")][QStringLiteral("lower")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtensionEnd")][QStringLiteral("lower")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtensionEnd")][QStringLiteral("lower")][QtModeling::DocumentationRole] = QStringLiteral("This redefinition changes the default multiplicity of association ends, since model elements are usually extended by 0 or 1 instance of the extension stereotype.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtensionEnd")][QStringLiteral("lower")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("MultiplicityElement-lower");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtensionEnd")][QStringLiteral("lower")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtensionEnd")][QStringLiteral("lower")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtensionEnd")][QStringLiteral("type")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtensionEnd")][QStringLiteral("type")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExtensionEnd");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtensionEnd")][QStringLiteral("type")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtensionEnd")][QStringLiteral("type")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtensionEnd")][QStringLiteral("type")][QtModeling::DocumentationRole] = QStringLiteral("References the type of the ExtensionEnd. Note that this association restricts the possible types of an ExtensionEnd to only be Stereotypes.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtensionEnd")][QStringLiteral("type")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("TypedElement-type");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtensionEnd")][QStringLiteral("type")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtensionEnd")][QStringLiteral("type")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlextensionend.h b/src/uml/qumlextensionend.h
index 70da7659..0190214e 100644
--- a/src/uml/qumlextensionend.h
+++ b/src/uml/qumlextensionend.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlProperty>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlStereotype;
 class Q_UML_EXPORT QUmlExtensionEnd : public QUmlProperty
 {
 public:
-    explicit QUmlExtensionEnd(bool createQObject = true);
+    explicit QUmlExtensionEnd(bool createQModelingObject = true);
     virtual ~QUmlExtensionEnd();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     int lower() const;
@@ -73,9 +72,6 @@ public:
 
 protected:
     QUmlStereotype *_type;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlextensionpoint.cpp b/src/uml/qumlextensionpoint.cpp
index f1d4b4c7..074369cc 100644
--- a/src/uml/qumlextensionpoint.cpp
+++ b/src/uml/qumlextensionpoint.cpp
@@ -60,25 +60,23 @@
 
     \brief An extension point identifies a point in the behavior of a use case where that behavior can be extended by the behavior of some other (extending) use case, as specified by an extend relationship.
  */
-QUmlExtensionPoint::QUmlExtensionPoint(bool createQObject) :
+QUmlExtensionPoint::QUmlExtensionPoint(bool createQModelingObject) :
     _useCase(0)
 {
-    if (createQObject)
-        _qObject = new QUmlExtensionPointObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlExtensionPointObject(this));
 }
 
 QUmlExtensionPoint::~QUmlExtensionPoint()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlExtensionPoint::clone() const
+QModelingElement *QUmlExtensionPoint::clone() const
 {
     QUmlExtensionPoint *c = new QUmlExtensionPoint;
     foreach (QUmlComment *element, ownedComments())
@@ -115,43 +113,11 @@ void QUmlExtensionPoint::setUseCase(QUmlUseCase *useCase)
         // Adjust subsetted properties
 
         _useCase = useCase;
-        if (useCase && useCase->asQObject() && this->asQObject())
-            QObject::connect(useCase->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setUseCase()));
+        if (useCase && useCase->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(useCase->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setUseCase()));
 
         // Adjust subsetted properties
         setNamespace(useCase);
     }
 }
 
-void QUmlExtensionPoint::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlExtensionPoint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCase"))));
-}
-
-void QUmlExtensionPoint::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtensionPoint")][QStringLiteral("useCase")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtensionPoint")][QStringLiteral("useCase")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExtensionPoint");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtensionPoint")][QStringLiteral("useCase")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtensionPoint")][QStringLiteral("useCase")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtensionPoint")][QStringLiteral("useCase")][QtModeling::DocumentationRole] = QStringLiteral("References the use case that owns this extension point.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtensionPoint")][QStringLiteral("useCase")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtensionPoint")][QStringLiteral("useCase")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtensionPoint")][QStringLiteral("useCase")][QtModeling::OppositeEndRole] = QStringLiteral("UseCase-extensionPoint");
-
-}
-
diff --git a/src/uml/qumlextensionpoint.h b/src/uml/qumlextensionpoint.h
index 2afde554..1865165c 100644
--- a/src/uml/qumlextensionpoint.h
+++ b/src/uml/qumlextensionpoint.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlRedefinableElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlUseCase;
 class Q_UML_EXPORT QUmlExtensionPoint : public QUmlRedefinableElement
 {
 public:
-    explicit QUmlExtensionPoint(bool createQObject = true);
+    explicit QUmlExtensionPoint(bool createQModelingObject = true);
     virtual ~QUmlExtensionPoint();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlUseCase *useCase() const;
@@ -68,9 +67,6 @@ public:
 
 protected:
     QUmlUseCase *_useCase;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlfeature.cpp b/src/uml/qumlfeature.cpp
index 2143dff1..a99b0a5a 100644
--- a/src/uml/qumlfeature.cpp
+++ b/src/uml/qumlfeature.cpp
@@ -60,15 +60,13 @@
 QUmlFeature::QUmlFeature() :
     _isStatic(false)
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlFeature::~QUmlFeature()
 {
 }
 
-QModelingObject *QUmlFeature::clone() const
+QModelingElement *QUmlFeature::clone() const
 {
     QUmlFeature *c = new QUmlFeature;
     foreach (QUmlComment *element, ownedComments())
@@ -102,8 +100,8 @@ void QUmlFeature::addFeaturingClassifier(QUmlClassifier *featuringClassifier)
 
     if (!_featuringClassifiers.contains(featuringClassifier)) {
         _featuringClassifiers.insert(featuringClassifier);
-        if (featuringClassifier && featuringClassifier->asQObject() && this->asQObject())
-            QObject::connect(featuringClassifier->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeFeaturingClassifier(QObject *)));
+        if (featuringClassifier && featuringClassifier->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(featuringClassifier->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeFeaturingClassifier(QObject *)));
 
         // Adjust opposite properties
         if (featuringClassifier) {
@@ -142,49 +140,7 @@ void QUmlFeature::setStatic(bool isStatic)
 
     if (_isStatic != isStatic) {
         _isStatic = isStatic;
-        _modifiedResettableProperties << QStringLiteral("isStatic");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isStatic");
     }
 }
 
-void QUmlFeature::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("featuringClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isStatic"))));
-}
-
-void QUmlFeature::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlFeature")][QStringLiteral("featuringClassifiers")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlFeature")][QStringLiteral("featuringClassifiers")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlFeature");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlFeature")][QStringLiteral("featuringClassifiers")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlFeature")][QStringLiteral("featuringClassifiers")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlFeature")][QStringLiteral("featuringClassifiers")][QtModeling::DocumentationRole] = QStringLiteral("The Classifiers that have this Feature as a feature.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlFeature")][QStringLiteral("featuringClassifiers")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlFeature")][QStringLiteral("featuringClassifiers")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_member_memberNamespace-memberNamespace");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlFeature")][QStringLiteral("featuringClassifiers")][QtModeling::OppositeEndRole] = QStringLiteral("Classifier-feature");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlFeature")][QStringLiteral("isStatic")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlFeature")][QStringLiteral("isStatic")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlFeature");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlFeature")][QStringLiteral("isStatic")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlFeature")][QStringLiteral("isStatic")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlFeature")][QStringLiteral("isStatic")][QtModeling::DocumentationRole] = QStringLiteral("Specifies whether this feature characterizes individual instances classified by the classifier (false) or the classifier itself (true).");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlFeature")][QStringLiteral("isStatic")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlFeature")][QStringLiteral("isStatic")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlFeature")][QStringLiteral("isStatic")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlfeature.h b/src/uml/qumlfeature.h
index e52eecbc..566c60aa 100644
--- a/src/uml/qumlfeature.h
+++ b/src/uml/qumlfeature.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlRedefinableElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -59,7 +58,7 @@ class Q_UML_EXPORT QUmlFeature : public QUmlRedefinableElement
 public:
     virtual ~QUmlFeature();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlClassifier *> featuringClassifiers() const;
@@ -73,9 +72,6 @@ protected:
 
     QSet<QUmlClassifier *> _featuringClassifiers;
     bool _isStatic;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlfinalnode.cpp b/src/uml/qumlfinalnode.cpp
index 7e8d448a..cb33ee83 100644
--- a/src/uml/qumlfinalnode.cpp
+++ b/src/uml/qumlfinalnode.cpp
@@ -66,15 +66,13 @@
  */
 QUmlFinalNode::QUmlFinalNode()
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlFinalNode::~QUmlFinalNode()
 {
 }
 
-QModelingObject *QUmlFinalNode::clone() const
+QModelingElement *QUmlFinalNode::clone() const
 {
     QUmlFinalNode *c = new QUmlFinalNode;
     foreach (QUmlComment *element, ownedComments())
@@ -103,33 +101,3 @@ QModelingObject *QUmlFinalNode::clone() const
     return c;
 }
 
-void QUmlFinalNode::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-}
-
-void QUmlFinalNode::setPropertyData()
-{
-}
-
diff --git a/src/uml/qumlfinalnode.h b/src/uml/qumlfinalnode.h
index 8dc4ec8b..c9d7df6c 100644
--- a/src/uml/qumlfinalnode.h
+++ b/src/uml/qumlfinalnode.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlControlNode>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,15 +56,12 @@ class Q_UML_EXPORT QUmlFinalNode : public QUmlControlNode
 public:
     virtual ~QUmlFinalNode();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
 
 protected:
     explicit QUmlFinalNode();
 
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlfinalstate.cpp b/src/uml/qumlfinalstate.cpp
index f0f8c5f0..3079ed5c 100644
--- a/src/uml/qumlfinalstate.cpp
+++ b/src/uml/qumlfinalstate.cpp
@@ -71,25 +71,23 @@
 
     \brief A special kind of state signifying that the enclosing region is completed. If the enclosing region is directly contained in a state machine and all other regions in the state machine also are completed, then it means that the entire state machine is completed.
  */
-QUmlFinalState::QUmlFinalState(bool createQObject) :
+QUmlFinalState::QUmlFinalState(bool createQModelingObject) :
     QUmlState(false)
 {
-    if (createQObject)
-        _qObject = new QUmlFinalStateObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlFinalStateObject(this));
 }
 
 QUmlFinalState::~QUmlFinalState()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlFinalState::clone() const
+QModelingElement *QUmlFinalState::clone() const
 {
     QUmlFinalState *c = new QUmlFinalState;
     foreach (QUmlComment *element, ownedComments())
@@ -132,48 +130,3 @@ QModelingObject *QUmlFinalState::clone() const
     return c;
 }
 
-void QUmlFinalState::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlVertex"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("container"))));
-    _groupProperties.insert(QStringLiteral("QUmlVertex"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlVertex"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("connections"))));
-    _groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("connectionPoints"))));
-    _groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deferrableTriggers"))));
-    _groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("doActivity"))));
-    _groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("entry"))));
-    _groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("exit"))));
-    _groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isComposite"))));
-    _groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isOrthogonal"))));
-    _groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isSimple"))));
-    _groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isSubmachineState"))));
-    _groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedState"))));
-    _groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContext"))));
-    _groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("regions"))));
-    _groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("stateInvariant"))));
-    _groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("submachine"))));
-}
-
-void QUmlFinalState::setPropertyData()
-{
-}
-
diff --git a/src/uml/qumlfinalstate.h b/src/uml/qumlfinalstate.h
index d26cdb9d..30949048 100644
--- a/src/uml/qumlfinalstate.h
+++ b/src/uml/qumlfinalstate.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlState>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,16 +54,13 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlFinalState : public QUmlState
 {
 public:
-    explicit QUmlFinalState(bool createQObject = true);
+    explicit QUmlFinalState(bool createQModelingObject = true);
     virtual ~QUmlFinalState();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
 
 protected:
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlflowfinalnode.cpp b/src/uml/qumlflowfinalnode.cpp
index 3ba781af..524541d1 100644
--- a/src/uml/qumlflowfinalnode.cpp
+++ b/src/uml/qumlflowfinalnode.cpp
@@ -66,24 +66,22 @@
 
     \brief A flow final node is a final node that terminates a flow.
  */
-QUmlFlowFinalNode::QUmlFlowFinalNode(bool createQObject)
+QUmlFlowFinalNode::QUmlFlowFinalNode(bool createQModelingObject)
 {
-    if (createQObject)
-        _qObject = new QUmlFlowFinalNodeObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlFlowFinalNodeObject(this));
 }
 
 QUmlFlowFinalNode::~QUmlFlowFinalNode()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlFlowFinalNode::clone() const
+QModelingElement *QUmlFlowFinalNode::clone() const
 {
     QUmlFlowFinalNode *c = new QUmlFlowFinalNode;
     foreach (QUmlComment *element, ownedComments())
@@ -112,33 +110,3 @@ QModelingObject *QUmlFlowFinalNode::clone() const
     return c;
 }
 
-void QUmlFlowFinalNode::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-}
-
-void QUmlFlowFinalNode::setPropertyData()
-{
-}
-
diff --git a/src/uml/qumlflowfinalnode.h b/src/uml/qumlflowfinalnode.h
index b0439b8c..e6eb9db3 100644
--- a/src/uml/qumlflowfinalnode.h
+++ b/src/uml/qumlflowfinalnode.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlFinalNode>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,16 +54,13 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlFlowFinalNode : public QUmlFinalNode
 {
 public:
-    explicit QUmlFlowFinalNode(bool createQObject = true);
+    explicit QUmlFlowFinalNode(bool createQModelingObject = true);
     virtual ~QUmlFlowFinalNode();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
 
 protected:
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlforknode.cpp b/src/uml/qumlforknode.cpp
index 672b6011..ac4f29e6 100644
--- a/src/uml/qumlforknode.cpp
+++ b/src/uml/qumlforknode.cpp
@@ -66,24 +66,22 @@
 
     \brief A fork node is a control node that splits a flow into multiple concurrent flows.
  */
-QUmlForkNode::QUmlForkNode(bool createQObject)
+QUmlForkNode::QUmlForkNode(bool createQModelingObject)
 {
-    if (createQObject)
-        _qObject = new QUmlForkNodeObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlForkNodeObject(this));
 }
 
 QUmlForkNode::~QUmlForkNode()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlForkNode::clone() const
+QModelingElement *QUmlForkNode::clone() const
 {
     QUmlForkNode *c = new QUmlForkNode;
     foreach (QUmlComment *element, ownedComments())
@@ -112,33 +110,3 @@ QModelingObject *QUmlForkNode::clone() const
     return c;
 }
 
-void QUmlForkNode::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-}
-
-void QUmlForkNode::setPropertyData()
-{
-}
-
diff --git a/src/uml/qumlforknode.h b/src/uml/qumlforknode.h
index 4141b1e6..b9bef0f3 100644
--- a/src/uml/qumlforknode.h
+++ b/src/uml/qumlforknode.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlControlNode>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,16 +54,13 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlForkNode : public QUmlControlNode
 {
 public:
-    explicit QUmlForkNode(bool createQObject = true);
+    explicit QUmlForkNode(bool createQModelingObject = true);
     virtual ~QUmlForkNode();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
 
 protected:
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlfunctionbehavior.cpp b/src/uml/qumlfunctionbehavior.cpp
index 42eab215..c363e658 100644
--- a/src/uml/qumlfunctionbehavior.cpp
+++ b/src/uml/qumlfunctionbehavior.cpp
@@ -90,25 +90,23 @@
 
     \brief A function behavior is an opaque behavior that does not access or modify any objects or other external data.
  */
-QUmlFunctionBehavior::QUmlFunctionBehavior(bool createQObject) :
+QUmlFunctionBehavior::QUmlFunctionBehavior(bool createQModelingObject) :
     QUmlOpaqueBehavior(false)
 {
-    if (createQObject)
-        _qObject = new QUmlFunctionBehaviorObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlFunctionBehaviorObject(this));
 }
 
 QUmlFunctionBehavior::~QUmlFunctionBehavior()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlFunctionBehavior::clone() const
+QModelingElement *QUmlFunctionBehavior::clone() const
 {
     QUmlFunctionBehavior *c = new QUmlFunctionBehavior;
     foreach (QUmlComment *element, ownedComments())
@@ -191,73 +189,3 @@ QModelingObject *QUmlFunctionBehavior::clone() const
     return c;
 }
 
-void QUmlFunctionBehavior::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedConnectors"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parts"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("roles"))));
-    _groupProperties.insert(QStringLiteral("QUmlEncapsulatedClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedPorts"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifierBehavior"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interfaceRealizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedBehaviors"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extensions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isActive"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedReceptions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superClasses"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameters"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameterSets"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("postconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("preconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedBehaviors"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("specification"))));
-    _groupProperties.insert(QStringLiteral("QUmlOpaqueBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("bodies"))));
-    _groupProperties.insert(QStringLiteral("QUmlOpaqueBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("languages"))));
-}
-
-void QUmlFunctionBehavior::setPropertyData()
-{
-}
-
diff --git a/src/uml/qumlfunctionbehavior.h b/src/uml/qumlfunctionbehavior.h
index 0fe4909a..43ecc434 100644
--- a/src/uml/qumlfunctionbehavior.h
+++ b/src/uml/qumlfunctionbehavior.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlOpaqueBehavior>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,16 +54,13 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlFunctionBehavior : public QUmlOpaqueBehavior
 {
 public:
-    explicit QUmlFunctionBehavior(bool createQObject = true);
+    explicit QUmlFunctionBehavior(bool createQModelingObject = true);
     virtual ~QUmlFunctionBehavior();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
 
 protected:
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlgate.cpp b/src/uml/qumlgate.cpp
index 25393bd2..36f7efa2 100644
--- a/src/uml/qumlgate.cpp
+++ b/src/uml/qumlgate.cpp
@@ -58,24 +58,22 @@
 
     \brief A gate is a connection point for relating a message outside an interaction fragment with a message inside the interaction fragment.
  */
-QUmlGate::QUmlGate(bool createQObject)
+QUmlGate::QUmlGate(bool createQModelingObject)
 {
-    if (createQObject)
-        _qObject = new QUmlGateObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlGateObject(this));
 }
 
 QUmlGate::~QUmlGate()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlGate::clone() const
+QModelingElement *QUmlGate::clone() const
 {
     QUmlGate *c = new QUmlGate;
     foreach (QUmlComment *element, ownedComments())
@@ -91,23 +89,3 @@ QModelingObject *QUmlGate::clone() const
     return c;
 }
 
-void QUmlGate::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlMessageEnd"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("message"))));
-}
-
-void QUmlGate::setPropertyData()
-{
-}
-
diff --git a/src/uml/qumlgate.h b/src/uml/qumlgate.h
index 1cda5ef3..8e66d4c1 100644
--- a/src/uml/qumlgate.h
+++ b/src/uml/qumlgate.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlMessageEnd>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,16 +54,13 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlGate : public QUmlMessageEnd
 {
 public:
-    explicit QUmlGate(bool createQObject = true);
+    explicit QUmlGate(bool createQModelingObject = true);
     virtual ~QUmlGate();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
 
 protected:
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlgeneralization.cpp b/src/uml/qumlgeneralization.cpp
index 661f5df7..2f2ef948 100644
--- a/src/uml/qumlgeneralization.cpp
+++ b/src/uml/qumlgeneralization.cpp
@@ -54,27 +54,25 @@
 
     \brief A generalization is a taxonomic relationship between a more general classifier and a more specific classifier. Each instance of the specific classifier is also an indirect instance of the general classifier. Thus, the specific classifier inherits the features of the more general classifier.A generalization relates a specific classifier to a more general classifier, and is owned by the specific classifier.
  */
-QUmlGeneralization::QUmlGeneralization(bool createQObject) :
+QUmlGeneralization::QUmlGeneralization(bool createQModelingObject) :
     _general(0),
     _isSubstitutable(true),
     _specific(0)
 {
-    if (createQObject)
-        _qObject = new QUmlGeneralizationObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlGeneralizationObject(this));
 }
 
 QUmlGeneralization::~QUmlGeneralization()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlGeneralization::clone() const
+QModelingElement *QUmlGeneralization::clone() const
 {
     QUmlGeneralization *c = new QUmlGeneralization;
     foreach (QUmlComment *element, ownedComments())
@@ -110,8 +108,8 @@ void QUmlGeneralization::setGeneral(QUmlClassifier *general)
         removeTarget(_general);
 
         _general = general;
-        if (general && general->asQObject() && this->asQObject())
-            QObject::connect(general->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setGeneral()));
+        if (general && general->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(general->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setGeneral()));
 
         // Adjust subsetted properties
         if (general) {
@@ -136,8 +134,8 @@ void QUmlGeneralization::addGeneralizationSet(QUmlGeneralizationSet *generalizat
 
     if (!_generalizationSets.contains(generalizationSet)) {
         _generalizationSets.insert(generalizationSet);
-        if (generalizationSet && generalizationSet->asQObject() && this->asQObject())
-            QObject::connect(generalizationSet->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeGeneralizationSet(QObject *)));
+        if (generalizationSet && generalizationSet->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(generalizationSet->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeGeneralizationSet(QObject *)));
 
         // Adjust opposite properties
         if (generalizationSet) {
@@ -176,7 +174,7 @@ void QUmlGeneralization::setSubstitutable(bool isSubstitutable)
 
     if (_isSubstitutable != isSubstitutable) {
         _isSubstitutable = isSubstitutable;
-        _modifiedResettableProperties << QStringLiteral("isSubstitutable");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isSubstitutable");
     }
 }
 
@@ -199,8 +197,8 @@ void QUmlGeneralization::setSpecific(QUmlClassifier *specific)
         removeSource(_specific);
 
         _specific = specific;
-        if (specific && specific->asQObject() && this->asQObject())
-            QObject::connect(specific->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setSpecific()));
+        if (specific && specific->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(specific->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setSpecific()));
 
         // Adjust subsetted properties
         setOwner(specific);
@@ -210,59 +208,3 @@ void QUmlGeneralization::setSpecific(QUmlClassifier *specific)
     }
 }
 
-void QUmlGeneralization::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
-    _groupProperties.insert(QStringLiteral("QUmlGeneralization"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("general"))));
-    _groupProperties.insert(QStringLiteral("QUmlGeneralization"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizationSets"))));
-    _groupProperties.insert(QStringLiteral("QUmlGeneralization"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isSubstitutable"))));
-    _groupProperties.insert(QStringLiteral("QUmlGeneralization"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("specific"))));
-}
-
-void QUmlGeneralization::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("general")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("general")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlGeneralization");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("general")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("general")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("general")][QtModeling::DocumentationRole] = QStringLiteral("References the general classifier in the Generalization relationship.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("general")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("general")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("DirectedRelationship-target");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("general")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("generalizationSets")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("generalizationSets")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlGeneralization");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("generalizationSets")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("generalizationSets")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("generalizationSets")][QtModeling::DocumentationRole] = QStringLiteral("Designates a set in which instances of Generalization is considered members.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("generalizationSets")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("generalizationSets")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("generalizationSets")][QtModeling::OppositeEndRole] = QStringLiteral("GeneralizationSet-generalization");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("isSubstitutable")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("isSubstitutable")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlGeneralization");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("isSubstitutable")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("isSubstitutable")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("isSubstitutable")][QtModeling::DocumentationRole] = QStringLiteral("Indicates whether the specific classifier can be used wherever the general classifier can be used. If true, the execution traces of the specific classifier will be a superset of the execution traces of the general classifier.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("isSubstitutable")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("isSubstitutable")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("isSubstitutable")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("specific")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("specific")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlGeneralization");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("specific")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("specific")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("specific")][QtModeling::DocumentationRole] = QStringLiteral("References the specializing classifier in the Generalization relationship.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("specific")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("specific")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner DirectedRelationship-source");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("specific")][QtModeling::OppositeEndRole] = QStringLiteral("Classifier-generalization");
-
-}
-
diff --git a/src/uml/qumlgeneralization.h b/src/uml/qumlgeneralization.h
index 05b3f733..47592ed2 100644
--- a/src/uml/qumlgeneralization.h
+++ b/src/uml/qumlgeneralization.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlDirectedRelationship>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlGeneralizationSet;
 class Q_UML_EXPORT QUmlGeneralization : public QUmlDirectedRelationship
 {
 public:
-    explicit QUmlGeneralization(bool createQObject = true);
+    explicit QUmlGeneralization(bool createQModelingObject = true);
     virtual ~QUmlGeneralization();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlClassifier *general() const;
@@ -79,9 +78,6 @@ protected:
     QSet<QUmlGeneralizationSet *> _generalizationSets;
     bool _isSubstitutable;
     QUmlClassifier *_specific;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlgeneralizationset.cpp b/src/uml/qumlgeneralizationset.cpp
index 7d62d6c3..c15d4db4 100644
--- a/src/uml/qumlgeneralizationset.cpp
+++ b/src/uml/qumlgeneralizationset.cpp
@@ -61,27 +61,25 @@
 
     \brief A generalization set is a packageable element whose instances define collections of subsets of generalization relationships.
  */
-QUmlGeneralizationSet::QUmlGeneralizationSet(bool createQObject) :
+QUmlGeneralizationSet::QUmlGeneralizationSet(bool createQModelingObject) :
     _isCovering(false),
     _isDisjoint(false),
     _powertype(0)
 {
-    if (createQObject)
-        _qObject = new QUmlGeneralizationSetObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlGeneralizationSetObject(this));
 }
 
 QUmlGeneralizationSet::~QUmlGeneralizationSet()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlGeneralizationSet::clone() const
+QModelingElement *QUmlGeneralizationSet::clone() const
 {
     QUmlGeneralizationSet *c = new QUmlGeneralizationSet;
     foreach (QUmlComment *element, ownedComments())
@@ -123,8 +121,8 @@ void QUmlGeneralizationSet::addGeneralization(QUmlGeneralization *generalization
 
     if (!_generalizations.contains(generalization)) {
         _generalizations.insert(generalization);
-        if (generalization && generalization->asQObject() && this->asQObject())
-            QObject::connect(generalization->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeGeneralization(QObject *)));
+        if (generalization && generalization->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(generalization->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeGeneralization(QObject *)));
 
         // Adjust opposite properties
         if (generalization) {
@@ -163,7 +161,7 @@ void QUmlGeneralizationSet::setCovering(bool isCovering)
 
     if (_isCovering != isCovering) {
         _isCovering = isCovering;
-        _modifiedResettableProperties << QStringLiteral("isCovering");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isCovering");
     }
 }
 
@@ -183,7 +181,7 @@ void QUmlGeneralizationSet::setDisjoint(bool isDisjoint)
 
     if (_isDisjoint != isDisjoint) {
         _isDisjoint = isDisjoint;
-        _modifiedResettableProperties << QStringLiteral("isDisjoint");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isDisjoint");
     }
 }
 
@@ -203,69 +201,8 @@ void QUmlGeneralizationSet::setPowertype(QUmlClassifier *powertype)
 
     if (_powertype != powertype) {
         _powertype = powertype;
-        if (powertype && powertype->asQObject() && this->asQObject())
-            QObject::connect(powertype->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setPowertype()));
+        if (powertype && powertype->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(powertype->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setPowertype()));
     }
 }
 
-void QUmlGeneralizationSet::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlGeneralizationSet"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlGeneralizationSet"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isCovering"))));
-    _groupProperties.insert(QStringLiteral("QUmlGeneralizationSet"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isDisjoint"))));
-    _groupProperties.insert(QStringLiteral("QUmlGeneralizationSet"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertype"))));
-}
-
-void QUmlGeneralizationSet::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("generalizations")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("generalizations")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlGeneralizationSet");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("generalizations")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("generalizations")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("generalizations")][QtModeling::DocumentationRole] = QStringLiteral("Designates the instances of Generalization which are members of a given GeneralizationSet.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("generalizations")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("generalizations")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("generalizations")][QtModeling::OppositeEndRole] = QStringLiteral("Generalization-generalizationSet");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("isCovering")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("isCovering")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlGeneralizationSet");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("isCovering")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("isCovering")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("isCovering")][QtModeling::DocumentationRole] = QStringLiteral("Indicates (via the associated Generalizations) whether or not the set of specific Classifiers are covering for a particular general classifier. When isCovering is true, every instance of a particular general Classifier is also an instance of at least one of its specific Classifiers for the GeneralizationSet. When isCovering is false, there are one or more instances of the particular general Classifier that are not instances of at least one of its specific Classifiers defined for the GeneralizationSet.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("isCovering")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("isCovering")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("isCovering")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("isDisjoint")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("isDisjoint")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlGeneralizationSet");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("isDisjoint")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("isDisjoint")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("isDisjoint")][QtModeling::DocumentationRole] = QStringLiteral("Indicates whether or not the set of specific Classifiers in a Generalization relationship have instance in common. If isDisjoint is true, the specific Classifiers for a particular GeneralizationSet have no members in common; that is, their intersection is empty. If isDisjoint is false, the specific Classifiers in a particular GeneralizationSet have one or more members in common; that is, their intersection is not empty. For example, Person could have two Generalization relationships, each with the different specific Classifier: Manager or Staff. This would be disjoint because every instance of Person must either be a Manager or Staff. In contrast, Person could have two Generalization relationships involving two specific (and non-covering) Classifiers: Sales Person and Manager. This GeneralizationSet would not be disjoint because there are instances of Person which can be a Sales Person and a Manager.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("isDisjoint")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("isDisjoint")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("isDisjoint")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("powertype")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("powertype")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlGeneralizationSet");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("powertype")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("powertype")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("powertype")][QtModeling::DocumentationRole] = QStringLiteral("Designates the Classifier that is defined as the power type for the associated GeneralizationSet.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("powertype")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("powertype")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("powertype")][QtModeling::OppositeEndRole] = QStringLiteral("Classifier-powertypeExtent");
-
-}
-
diff --git a/src/uml/qumlgeneralizationset.h b/src/uml/qumlgeneralizationset.h
index de32b954..d4d23c7c 100644
--- a/src/uml/qumlgeneralizationset.h
+++ b/src/uml/qumlgeneralizationset.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlPackageableElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlGeneralization;
 class Q_UML_EXPORT QUmlGeneralizationSet : public QUmlPackageableElement
 {
 public:
-    explicit QUmlGeneralizationSet(bool createQObject = true);
+    explicit QUmlGeneralizationSet(bool createQModelingObject = true);
     virtual ~QUmlGeneralizationSet();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlGeneralization *> generalizations() const;
@@ -79,9 +78,6 @@ protected:
     bool _isCovering;
     bool _isDisjoint;
     QUmlClassifier *_powertype;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlgeneralordering.cpp b/src/uml/qumlgeneralordering.cpp
index 7f5e6097..ad4837cc 100644
--- a/src/uml/qumlgeneralordering.cpp
+++ b/src/uml/qumlgeneralordering.cpp
@@ -58,26 +58,24 @@
 
     \brief A general ordering represents a binary relation between two occurrence specifications, to describe that one occurrence specification must occur before the other in a valid trace. This mechanism provides the ability to define partial orders of occurrence cpecifications that may otherwise not have a specified order.
  */
-QUmlGeneralOrdering::QUmlGeneralOrdering(bool createQObject) :
+QUmlGeneralOrdering::QUmlGeneralOrdering(bool createQModelingObject) :
     _after(0),
     _before(0)
 {
-    if (createQObject)
-        _qObject = new QUmlGeneralOrderingObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlGeneralOrderingObject(this));
 }
 
 QUmlGeneralOrdering::~QUmlGeneralOrdering()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlGeneralOrdering::clone() const
+QModelingElement *QUmlGeneralOrdering::clone() const
 {
     QUmlGeneralOrdering *c = new QUmlGeneralOrdering;
     foreach (QUmlComment *element, ownedComments())
@@ -113,8 +111,8 @@ void QUmlGeneralOrdering::setAfter(QUmlOccurrenceSpecification *after)
 
     if (_after != after) {
         _after = after;
-        if (after && after->asQObject() && this->asQObject())
-            QObject::connect(after->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setAfter()));
+        if (after && after->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(after->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setAfter()));
     }
 }
 
@@ -134,47 +132,8 @@ void QUmlGeneralOrdering::setBefore(QUmlOccurrenceSpecification *before)
 
     if (_before != before) {
         _before = before;
-        if (before && before->asQObject() && this->asQObject())
-            QObject::connect(before->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setBefore()));
+        if (before && before->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(before->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setBefore()));
     }
 }
 
-void QUmlGeneralOrdering::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlGeneralOrdering"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("after"))));
-    _groupProperties.insert(QStringLiteral("QUmlGeneralOrdering"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("before"))));
-}
-
-void QUmlGeneralOrdering::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralOrdering")][QStringLiteral("after")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralOrdering")][QStringLiteral("after")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlGeneralOrdering");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralOrdering")][QStringLiteral("after")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralOrdering")][QStringLiteral("after")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralOrdering")][QStringLiteral("after")][QtModeling::DocumentationRole] = QStringLiteral("The OccurrenceSpecification referenced comes after the OccurrenceSpecification referenced by before.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralOrdering")][QStringLiteral("after")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralOrdering")][QStringLiteral("after")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralOrdering")][QStringLiteral("after")][QtModeling::OppositeEndRole] = QStringLiteral("OccurrenceSpecification-toBefore");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralOrdering")][QStringLiteral("before")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralOrdering")][QStringLiteral("before")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlGeneralOrdering");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralOrdering")][QStringLiteral("before")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralOrdering")][QStringLiteral("before")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralOrdering")][QStringLiteral("before")][QtModeling::DocumentationRole] = QStringLiteral("The OccurrenceSpecification referenced comes before the OccurrenceSpecification referenced by after.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralOrdering")][QStringLiteral("before")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralOrdering")][QStringLiteral("before")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralOrdering")][QStringLiteral("before")][QtModeling::OppositeEndRole] = QStringLiteral("OccurrenceSpecification-toAfter");
-
-}
-
diff --git a/src/uml/qumlgeneralordering.h b/src/uml/qumlgeneralordering.h
index 1048745b..3941419e 100644
--- a/src/uml/qumlgeneralordering.h
+++ b/src/uml/qumlgeneralordering.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlNamedElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlOccurrenceSpecification;
 class Q_UML_EXPORT QUmlGeneralOrdering : public QUmlNamedElement
 {
 public:
-    explicit QUmlGeneralOrdering(bool createQObject = true);
+    explicit QUmlGeneralOrdering(bool createQModelingObject = true);
     virtual ~QUmlGeneralOrdering();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlOccurrenceSpecification *after() const;
@@ -71,9 +70,6 @@ public:
 protected:
     QUmlOccurrenceSpecification *_after;
     QUmlOccurrenceSpecification *_before;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlimage.cpp b/src/uml/qumlimage.cpp
index a9630495..6ec93ec1 100644
--- a/src/uml/qumlimage.cpp
+++ b/src/uml/qumlimage.cpp
@@ -52,24 +52,22 @@
 
     \brief Physical definition of a graphical image.
  */
-QUmlImage::QUmlImage(bool createQObject)
+QUmlImage::QUmlImage(bool createQModelingObject)
 {
-    if (createQObject)
-        _qObject = new QUmlImageObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlImageObject(this));
 }
 
 QUmlImage::~QUmlImage()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlImage::clone() const
+QModelingElement *QUmlImage::clone() const
 {
     QUmlImage *c = new QUmlImage;
     foreach (QUmlComment *element, ownedComments())
@@ -139,46 +137,3 @@ void QUmlImage::setLocation(QString location)
     }
 }
 
-void QUmlImage::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlImage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("content"))));
-    _groupProperties.insert(QStringLiteral("QUmlImage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("format"))));
-    _groupProperties.insert(QStringLiteral("QUmlImage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("location"))));
-}
-
-void QUmlImage::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlImage")][QStringLiteral("content")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlImage")][QStringLiteral("content")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlImage");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlImage")][QStringLiteral("content")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlImage")][QStringLiteral("content")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlImage")][QStringLiteral("content")][QtModeling::DocumentationRole] = QStringLiteral("This contains the serialization of the image according to the format. The value could represent a bitmap, image such as a GIF file, or drawing 'instructions' using a standard such as Scalable Vector Graphic (SVG) (which is XML based).");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlImage")][QStringLiteral("content")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlImage")][QStringLiteral("content")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlImage")][QStringLiteral("content")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlImage")][QStringLiteral("format")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlImage")][QStringLiteral("format")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlImage");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlImage")][QStringLiteral("format")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlImage")][QStringLiteral("format")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlImage")][QStringLiteral("format")][QtModeling::DocumentationRole] = QStringLiteral("This indicates the format of the content - which is how the string content should be interpreted. The following values are reserved: SVG, GIF, PNG, JPG, WMF, EMF, BMP. In addition the prefix 'MIME: ' is also reserved. This option can be used as an alternative to express the reserved values above, for example 'SVG' could instead be expressed as 'MIME: image/svg+xml'.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlImage")][QStringLiteral("format")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlImage")][QStringLiteral("format")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlImage")][QStringLiteral("format")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlImage")][QStringLiteral("location")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlImage")][QStringLiteral("location")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlImage");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlImage")][QStringLiteral("location")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlImage")][QStringLiteral("location")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlImage")][QStringLiteral("location")][QtModeling::DocumentationRole] = QStringLiteral("This contains a location that can be used by a tool to locate the image as an alternative to embedding it in the stereotype.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlImage")][QStringLiteral("location")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlImage")][QStringLiteral("location")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlImage")][QStringLiteral("location")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlimage.h b/src/uml/qumlimage.h
index 6e4e1e91..83bc8724 100644
--- a/src/uml/qumlimage.h
+++ b/src/uml/qumlimage.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,10 +54,10 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlImage : public QUmlElement
 {
 public:
-    explicit QUmlImage(bool createQObject = true);
+    explicit QUmlImage(bool createQModelingObject = true);
     virtual ~QUmlImage();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QString content() const;
@@ -72,9 +71,6 @@ protected:
     QString _content;
     QString _format;
     QString _location;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlinclude.cpp b/src/uml/qumlinclude.cpp
index d3d8e4b9..93901cca 100644
--- a/src/uml/qumlinclude.cpp
+++ b/src/uml/qumlinclude.cpp
@@ -58,26 +58,24 @@
 
     \brief An include relationship defines that a use case contains the behavior defined in another use case.
  */
-QUmlInclude::QUmlInclude(bool createQObject) :
+QUmlInclude::QUmlInclude(bool createQModelingObject) :
     _addition(0),
     _includingCase(0)
 {
-    if (createQObject)
-        _qObject = new QUmlIncludeObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlIncludeObject(this));
 }
 
 QUmlInclude::~QUmlInclude()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlInclude::clone() const
+QModelingElement *QUmlInclude::clone() const
 {
     QUmlInclude *c = new QUmlInclude;
     foreach (QUmlComment *element, ownedComments())
@@ -116,8 +114,8 @@ void QUmlInclude::setAddition(QUmlUseCase *addition)
         removeTarget(_addition);
 
         _addition = addition;
-        if (addition && addition->asQObject() && this->asQObject())
-            QObject::connect(addition->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setAddition()));
+        if (addition && addition->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(addition->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setAddition()));
 
         // Adjust subsetted properties
         if (addition) {
@@ -145,8 +143,8 @@ void QUmlInclude::setIncludingCase(QUmlUseCase *includingCase)
         removeSource(_includingCase);
 
         _includingCase = includingCase;
-        if (includingCase && includingCase->asQObject() && this->asQObject())
-            QObject::connect(includingCase->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setIncludingCase()));
+        if (includingCase && includingCase->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(includingCase->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setIncludingCase()));
 
         // Adjust subsetted properties
         if (includingCase) {
@@ -156,45 +154,3 @@ void QUmlInclude::setIncludingCase(QUmlUseCase *includingCase)
     }
 }
 
-void QUmlInclude::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlInclude"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("addition"))));
-    _groupProperties.insert(QStringLiteral("QUmlInclude"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("includingCase"))));
-}
-
-void QUmlInclude::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInclude")][QStringLiteral("addition")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInclude")][QStringLiteral("addition")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInclude");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInclude")][QStringLiteral("addition")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInclude")][QStringLiteral("addition")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInclude")][QStringLiteral("addition")][QtModeling::DocumentationRole] = QStringLiteral("References the use case that is to be included.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInclude")][QStringLiteral("addition")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInclude")][QStringLiteral("addition")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("DirectedRelationship-target");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInclude")][QStringLiteral("addition")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInclude")][QStringLiteral("includingCase")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInclude")][QStringLiteral("includingCase")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInclude");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInclude")][QStringLiteral("includingCase")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInclude")][QStringLiteral("includingCase")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInclude")][QStringLiteral("includingCase")][QtModeling::DocumentationRole] = QStringLiteral("References the use case which will include the addition and owns the include relationship.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInclude")][QStringLiteral("includingCase")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInclude")][QStringLiteral("includingCase")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("DirectedRelationship-source NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInclude")][QStringLiteral("includingCase")][QtModeling::OppositeEndRole] = QStringLiteral("UseCase-include");
-
-}
-
diff --git a/src/uml/qumlinclude.h b/src/uml/qumlinclude.h
index e35bbc50..b7a6db93 100644
--- a/src/uml/qumlinclude.h
+++ b/src/uml/qumlinclude.h
@@ -46,7 +46,6 @@
 #include <QtUml/QUmlDirectedRelationship>
 #include <QtUml/QUmlNamedElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlUseCase;
 class Q_UML_EXPORT QUmlInclude : public QUmlDirectedRelationship, public QUmlNamedElement
 {
 public:
-    explicit QUmlInclude(bool createQObject = true);
+    explicit QUmlInclude(bool createQModelingObject = true);
     virtual ~QUmlInclude();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlUseCase *addition() const;
@@ -72,9 +71,6 @@ public:
 protected:
     QUmlUseCase *_addition;
     QUmlUseCase *_includingCase;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlinformationflow.cpp b/src/uml/qumlinformationflow.cpp
index f63c60b9..067c2971 100644
--- a/src/uml/qumlinformationflow.cpp
+++ b/src/uml/qumlinformationflow.cpp
@@ -64,24 +64,22 @@
 
     \brief An information flow specifies that one or more information items circulates from its sources to its targets. Information flows require some kind of information channel for transmitting information items from the source to the destination. An information channel is represented in various ways depending on the nature of its sources and targets. It may be represented by connectors, links, associations, or even dependencies. For example, if the source and destination are parts in some composite structure such as a collaboration, then the information channel is likely to be represented by a connector between them. Or, if the source and target are objects (which are a kind of instance specification), they may be represented by a link that joins the two, and so on.
  */
-QUmlInformationFlow::QUmlInformationFlow(bool createQObject)
+QUmlInformationFlow::QUmlInformationFlow(bool createQModelingObject)
 {
-    if (createQObject)
-        _qObject = new QUmlInformationFlowObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlInformationFlowObject(this));
 }
 
 QUmlInformationFlow::~QUmlInformationFlow()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlInformationFlow::clone() const
+QModelingElement *QUmlInformationFlow::clone() const
 {
     QUmlInformationFlow *c = new QUmlInformationFlow;
     foreach (QUmlComment *element, ownedComments())
@@ -131,8 +129,8 @@ void QUmlInformationFlow::addConveyed(QUmlClassifier *conveyed)
 
     if (!_conveyed.contains(conveyed)) {
         _conveyed.insert(conveyed);
-        if (conveyed && conveyed->asQObject() && this->asQObject())
-            QObject::connect(conveyed->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeConveyed(QObject *)));
+        if (conveyed && conveyed->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(conveyed->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeConveyed(QObject *)));
     }
 }
 
@@ -161,8 +159,8 @@ void QUmlInformationFlow::addInformationSource(QUmlNamedElement *informationSour
 
     if (!_informationSources.contains(informationSource)) {
         _informationSources.insert(informationSource);
-        if (informationSource && informationSource->asQObject() && this->asQObject())
-            QObject::connect(informationSource->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeInformationSource(QObject *)));
+        if (informationSource && informationSource->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(informationSource->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeInformationSource(QObject *)));
 
         // Adjust subsetted properties
         addSource(informationSource);
@@ -197,8 +195,8 @@ void QUmlInformationFlow::addInformationTarget(QUmlNamedElement *informationTarg
 
     if (!_informationTargets.contains(informationTarget)) {
         _informationTargets.insert(informationTarget);
-        if (informationTarget && informationTarget->asQObject() && this->asQObject())
-            QObject::connect(informationTarget->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeInformationTarget(QObject *)));
+        if (informationTarget && informationTarget->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(informationTarget->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeInformationTarget(QObject *)));
 
         // Adjust subsetted properties
         addTarget(informationTarget);
@@ -233,8 +231,8 @@ void QUmlInformationFlow::addRealization(QUmlRelationship *realization)
 
     if (!_realizations.contains(realization)) {
         _realizations.insert(realization);
-        if (realization && realization->asQObject() && this->asQObject())
-            QObject::connect(realization->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeRealization(QObject *)));
+        if (realization && realization->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(realization->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeRealization(QObject *)));
     }
 }
 
@@ -263,8 +261,8 @@ void QUmlInformationFlow::addRealizingActivityEdge(QUmlActivityEdge *realizingAc
 
     if (!_realizingActivityEdges.contains(realizingActivityEdge)) {
         _realizingActivityEdges.insert(realizingActivityEdge);
-        if (realizingActivityEdge && realizingActivityEdge->asQObject() && this->asQObject())
-            QObject::connect(realizingActivityEdge->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeRealizingActivityEdge(QObject *)));
+        if (realizingActivityEdge && realizingActivityEdge->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(realizingActivityEdge->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeRealizingActivityEdge(QObject *)));
     }
 }
 
@@ -293,8 +291,8 @@ void QUmlInformationFlow::addRealizingConnector(QUmlConnector *realizingConnecto
 
     if (!_realizingConnectors.contains(realizingConnector)) {
         _realizingConnectors.insert(realizingConnector);
-        if (realizingConnector && realizingConnector->asQObject() && this->asQObject())
-            QObject::connect(realizingConnector->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeRealizingConnector(QObject *)));
+        if (realizingConnector && realizingConnector->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(realizingConnector->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeRealizingConnector(QObject *)));
     }
 }
 
@@ -323,8 +321,8 @@ void QUmlInformationFlow::addRealizingMessage(QUmlMessage *realizingMessage)
 
     if (!_realizingMessages.contains(realizingMessage)) {
         _realizingMessages.insert(realizingMessage);
-        if (realizingMessage && realizingMessage->asQObject() && this->asQObject())
-            QObject::connect(realizingMessage->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeRealizingMessage(QObject *)));
+        if (realizingMessage && realizingMessage->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(realizingMessage->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeRealizingMessage(QObject *)));
     }
 }
 
@@ -337,97 +335,3 @@ void QUmlInformationFlow::removeRealizingMessage(QUmlMessage *realizingMessage)
     }
 }
 
-void QUmlInformationFlow::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlInformationFlow"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("conveyed"))));
-    _groupProperties.insert(QStringLiteral("QUmlInformationFlow"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("informationSources"))));
-    _groupProperties.insert(QStringLiteral("QUmlInformationFlow"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("informationTargets"))));
-    _groupProperties.insert(QStringLiteral("QUmlInformationFlow"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("realizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlInformationFlow"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("realizingActivityEdges"))));
-    _groupProperties.insert(QStringLiteral("QUmlInformationFlow"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("realizingConnectors"))));
-    _groupProperties.insert(QStringLiteral("QUmlInformationFlow"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("realizingMessages"))));
-}
-
-void QUmlInformationFlow::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("conveyed")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("conveyed")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInformationFlow");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("conveyed")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("conveyed")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("conveyed")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the information items that may circulate on this information flow.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("conveyed")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("conveyed")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("conveyed")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("informationSources")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("informationSources")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInformationFlow");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("informationSources")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("informationSources")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("informationSources")][QtModeling::DocumentationRole] = QStringLiteral("Defines from which source the conveyed InformationItems are initiated.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("informationSources")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("informationSources")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("DirectedRelationship-source");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("informationSources")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("informationTargets")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("informationTargets")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInformationFlow");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("informationTargets")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("informationTargets")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("informationTargets")][QtModeling::DocumentationRole] = QStringLiteral("Defines to which target the conveyed InformationItems are directed.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("informationTargets")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("informationTargets")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("DirectedRelationship-target");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("informationTargets")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizations")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizations")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInformationFlow");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizations")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizations")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizations")][QtModeling::DocumentationRole] = QStringLiteral("Determines which Relationship will realize the specified flow");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizations")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizations")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizations")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingActivityEdges")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingActivityEdges")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInformationFlow");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingActivityEdges")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingActivityEdges")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingActivityEdges")][QtModeling::DocumentationRole] = QStringLiteral("Determines which ActivityEdges will realize the specified flow.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingActivityEdges")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingActivityEdges")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingActivityEdges")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingConnectors")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingConnectors")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInformationFlow");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingConnectors")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingConnectors")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingConnectors")][QtModeling::DocumentationRole] = QStringLiteral("Determines which Connectors will realize the specified flow.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingConnectors")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingConnectors")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingConnectors")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingMessages")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingMessages")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInformationFlow");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingMessages")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingMessages")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingMessages")][QtModeling::DocumentationRole] = QStringLiteral("Determines which Messages will realize the specified flow.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingMessages")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingMessages")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingMessages")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlinformationflow.h b/src/uml/qumlinformationflow.h
index e40380c7..8b3717a9 100644
--- a/src/uml/qumlinformationflow.h
+++ b/src/uml/qumlinformationflow.h
@@ -46,7 +46,6 @@
 #include <QtUml/QUmlDirectedRelationship>
 #include <QtUml/QUmlPackageableElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -63,10 +62,10 @@ class QUmlRelationship;
 class Q_UML_EXPORT QUmlInformationFlow : public QUmlDirectedRelationship, public QUmlPackageableElement
 {
 public:
-    explicit QUmlInformationFlow(bool createQObject = true);
+    explicit QUmlInformationFlow(bool createQModelingObject = true);
     virtual ~QUmlInformationFlow();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlClassifier *> conveyed() const;
@@ -99,9 +98,6 @@ protected:
     QSet<QUmlActivityEdge *> _realizingActivityEdges;
     QSet<QUmlConnector *> _realizingConnectors;
     QSet<QUmlMessage *> _realizingMessages;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlinformationitem.cpp b/src/uml/qumlinformationitem.cpp
index f421b7fb..12bdd28f 100644
--- a/src/uml/qumlinformationitem.cpp
+++ b/src/uml/qumlinformationitem.cpp
@@ -77,24 +77,22 @@
 
     \brief An information item is an abstraction of all kinds of information that can be exchanged between objects. It is a kind of classifier intended for representing information in a very abstract way, one which cannot be instantiated.
  */
-QUmlInformationItem::QUmlInformationItem(bool createQObject)
+QUmlInformationItem::QUmlInformationItem(bool createQModelingObject)
 {
-    if (createQObject)
-        _qObject = new QUmlInformationItemObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlInformationItemObject(this));
 }
 
 QUmlInformationItem::~QUmlInformationItem()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlInformationItem::clone() const
+QModelingElement *QUmlInformationItem::clone() const
 {
     QUmlInformationItem *c = new QUmlInformationItem;
     foreach (QUmlComment *element, ownedComments())
@@ -163,8 +161,8 @@ void QUmlInformationItem::addRepresented(QUmlClassifier *represented)
 
     if (!_represented.contains(represented)) {
         _represented.insert(represented);
-        if (represented && represented->asQObject() && this->asQObject())
-            QObject::connect(represented->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeRepresented(QObject *)));
+        if (represented && represented->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(represented->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeRepresented(QObject *)));
     }
 }
 
@@ -177,60 +175,3 @@ void QUmlInformationItem::removeRepresented(QUmlClassifier *represented)
     }
 }
 
-void QUmlInformationItem::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generals"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlInformationItem"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("represented"))));
-}
-
-void QUmlInformationItem::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationItem")][QStringLiteral("represented")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationItem")][QStringLiteral("represented")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInformationItem");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationItem")][QStringLiteral("represented")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationItem")][QStringLiteral("represented")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationItem")][QStringLiteral("represented")][QtModeling::DocumentationRole] = QStringLiteral("Determines the classifiers that will specify the structure and nature of the information. An information item represents all its represented classifiers.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationItem")][QStringLiteral("represented")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationItem")][QStringLiteral("represented")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationItem")][QStringLiteral("represented")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlinformationitem.h b/src/uml/qumlinformationitem.h
index 2f9202a6..336e86e2 100644
--- a/src/uml/qumlinformationitem.h
+++ b/src/uml/qumlinformationitem.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlClassifier>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,10 +54,10 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlInformationItem : public QUmlClassifier
 {
 public:
-    explicit QUmlInformationItem(bool createQObject = true);
+    explicit QUmlInformationItem(bool createQModelingObject = true);
     virtual ~QUmlInformationItem();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlClassifier *> represented() const;
@@ -67,9 +66,6 @@ public:
 
 protected:
     QSet<QUmlClassifier *> _represented;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlinitialnode.cpp b/src/uml/qumlinitialnode.cpp
index 4485c1b8..2fdacfee 100644
--- a/src/uml/qumlinitialnode.cpp
+++ b/src/uml/qumlinitialnode.cpp
@@ -66,24 +66,22 @@
 
     \brief An initial node is a control node at which flow starts when the activity is invoked.
  */
-QUmlInitialNode::QUmlInitialNode(bool createQObject)
+QUmlInitialNode::QUmlInitialNode(bool createQModelingObject)
 {
-    if (createQObject)
-        _qObject = new QUmlInitialNodeObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlInitialNodeObject(this));
 }
 
 QUmlInitialNode::~QUmlInitialNode()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlInitialNode::clone() const
+QModelingElement *QUmlInitialNode::clone() const
 {
     QUmlInitialNode *c = new QUmlInitialNode;
     foreach (QUmlComment *element, ownedComments())
@@ -112,33 +110,3 @@ QModelingObject *QUmlInitialNode::clone() const
     return c;
 }
 
-void QUmlInitialNode::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-}
-
-void QUmlInitialNode::setPropertyData()
-{
-}
-
diff --git a/src/uml/qumlinitialnode.h b/src/uml/qumlinitialnode.h
index e4b4ac34..ce8d894e 100644
--- a/src/uml/qumlinitialnode.h
+++ b/src/uml/qumlinitialnode.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlControlNode>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,16 +54,13 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlInitialNode : public QUmlControlNode
 {
 public:
-    explicit QUmlInitialNode(bool createQObject = true);
+    explicit QUmlInitialNode(bool createQModelingObject = true);
     virtual ~QUmlInitialNode();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
 
 protected:
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlinputpin.cpp b/src/uml/qumlinputpin.cpp
index cbb31269..7fc80b6b 100644
--- a/src/uml/qumlinputpin.cpp
+++ b/src/uml/qumlinputpin.cpp
@@ -71,24 +71,22 @@
 
     \brief An input pin is a pin that holds input values to be consumed by an action.
  */
-QUmlInputPin::QUmlInputPin(bool createQObject)
+QUmlInputPin::QUmlInputPin(bool createQModelingObject)
 {
-    if (createQObject)
-        _qObject = new QUmlInputPinObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlInputPinObject(this));
 }
 
 QUmlInputPin::~QUmlInputPin()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlInputPin::clone() const
+QModelingElement *QUmlInputPin::clone() const
 {
     QUmlInputPin *c = new QUmlInputPin;
     foreach (QUmlComment *element, ownedComments())
@@ -134,46 +132,3 @@ QModelingObject *QUmlInputPin::clone() const
     return c;
 }
 
-void QUmlInputPin::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isOrdered"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isUnique"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lower"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lowerValue"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upper"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperValue"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStates"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isControlType"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ordering"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("selection"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperBound"))));
-    _groupProperties.insert(QStringLiteral("QUmlPin"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isControl"))));
-}
-
-void QUmlInputPin::setPropertyData()
-{
-}
-
diff --git a/src/uml/qumlinputpin.h b/src/uml/qumlinputpin.h
index 0760ae5c..05bb5bd9 100644
--- a/src/uml/qumlinputpin.h
+++ b/src/uml/qumlinputpin.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlPin>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,16 +54,13 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlInputPin : public QUmlPin
 {
 public:
-    explicit QUmlInputPin(bool createQObject = true);
+    explicit QUmlInputPin(bool createQModelingObject = true);
     virtual ~QUmlInputPin();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
 
 protected:
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlinstancespecification.cpp b/src/uml/qumlinstancespecification.cpp
index 6302991c..88f7af7d 100644
--- a/src/uml/qumlinstancespecification.cpp
+++ b/src/uml/qumlinstancespecification.cpp
@@ -64,25 +64,23 @@
 
     \brief An instance specification has the capability of being a deployment target in a deployment relationship, in the case that it is an instance of a node. It is also has the capability of being a deployed artifact, if it is an instance of an artifact.An instance specification is a model element that represents an instance in a modeled system.
  */
-QUmlInstanceSpecification::QUmlInstanceSpecification(bool createQObject) :
+QUmlInstanceSpecification::QUmlInstanceSpecification(bool createQModelingObject) :
     _specification(0)
 {
-    if (createQObject)
-        _qObject = new QUmlInstanceSpecificationObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlInstanceSpecificationObject(this));
 }
 
 QUmlInstanceSpecification::~QUmlInstanceSpecification()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlInstanceSpecification::clone() const
+QModelingElement *QUmlInstanceSpecification::clone() const
 {
     QUmlInstanceSpecification *c = new QUmlInstanceSpecification;
     foreach (QUmlComment *element, ownedComments())
@@ -126,8 +124,8 @@ void QUmlInstanceSpecification::addClassifier(QUmlClassifier *classifier)
 
     if (!_classifiers.contains(classifier)) {
         _classifiers.insert(classifier);
-        if (classifier && classifier->asQObject() && this->asQObject())
-            QObject::connect(classifier->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeClassifier(QObject *)));
+        if (classifier && classifier->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(classifier->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeClassifier(QObject *)));
     }
 }
 
@@ -156,9 +154,9 @@ void QUmlInstanceSpecification::addSlot(QUmlSlot *slot_)
 
     if (!_slots_.contains(slot_)) {
         _slots_.insert(slot_);
-        if (slot_ && slot_->asQObject() && this->asQObject())
-            QObject::connect(slot_->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeSlot(QObject *)));
-        slot_->asQObject()->setParent(this->asQObject());
+        if (slot_ && slot_->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(slot_->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeSlot(QObject *)));
+        slot_->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(slot_);
@@ -176,8 +174,8 @@ void QUmlInstanceSpecification::removeSlot(QUmlSlot *slot_)
 
     if (_slots_.contains(slot_)) {
         _slots_.remove(slot_);
-        if (slot_->asQObject())
-            slot_->asQObject()->setParent(0);
+        if (slot_->asQModelingObject())
+            slot_->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(slot_);
@@ -208,9 +206,9 @@ void QUmlInstanceSpecification::setSpecification(QUmlValueSpecification *specifi
         removeOwnedElement(_specification);
 
         _specification = specification;
-        if (specification && specification->asQObject() && this->asQObject())
-            QObject::connect(specification->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setSpecification()));
-        specification->asQObject()->setParent(this->asQObject());
+        if (specification && specification->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(specification->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setSpecification()));
+        specification->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (specification) {
@@ -219,56 +217,3 @@ void QUmlInstanceSpecification::setSpecification(QUmlValueSpecification *specifi
     }
 }
 
-void QUmlInstanceSpecification::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlDeploymentTarget"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deployedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlDeploymentTarget"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deployments"))));
-    _groupProperties.insert(QStringLiteral("QUmlInstanceSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlInstanceSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("slots_"))));
-    _groupProperties.insert(QStringLiteral("QUmlInstanceSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("specification"))));
-}
-
-void QUmlInstanceSpecification::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceSpecification")][QStringLiteral("classifiers")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceSpecification")][QStringLiteral("classifiers")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInstanceSpecification");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceSpecification")][QStringLiteral("classifiers")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceSpecification")][QStringLiteral("classifiers")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceSpecification")][QStringLiteral("classifiers")][QtModeling::DocumentationRole] = QStringLiteral("The classifier or classifiers of the represented instance. If multiple classifiers are specified, the instance is classified by all of them.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceSpecification")][QStringLiteral("classifiers")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceSpecification")][QStringLiteral("classifiers")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceSpecification")][QStringLiteral("classifiers")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceSpecification")][QStringLiteral("slots_")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceSpecification")][QStringLiteral("slots_")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInstanceSpecification");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceSpecification")][QStringLiteral("slots_")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceSpecification")][QStringLiteral("slots_")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceSpecification")][QStringLiteral("slots_")][QtModeling::DocumentationRole] = QStringLiteral("A slot giving the value or values of a structural feature of the instance. An instance specification can have one slot per structural feature of its classifiers, including inherited features. It is not necessary to model a slot for each structural feature, in which case the instance specification is a partial description.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceSpecification")][QStringLiteral("slots_")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceSpecification")][QStringLiteral("slots_")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceSpecification")][QStringLiteral("slots_")][QtModeling::OppositeEndRole] = QStringLiteral("Slot-owningInstance");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceSpecification")][QStringLiteral("specification")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceSpecification")][QStringLiteral("specification")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInstanceSpecification");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceSpecification")][QStringLiteral("specification")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceSpecification")][QStringLiteral("specification")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceSpecification")][QStringLiteral("specification")][QtModeling::DocumentationRole] = QStringLiteral("A specification of how to compute, derive, or construct the instance.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceSpecification")][QStringLiteral("specification")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceSpecification")][QStringLiteral("specification")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceSpecification")][QStringLiteral("specification")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlinstancespecification.h b/src/uml/qumlinstancespecification.h
index 9ef2ff16..cf76adb4 100644
--- a/src/uml/qumlinstancespecification.h
+++ b/src/uml/qumlinstancespecification.h
@@ -47,7 +47,6 @@
 #include <QtUml/QUmlPackageableElement>
 #include <QtUml/QUmlDeploymentTarget>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -61,10 +60,10 @@ class QUmlValueSpecification;
 class Q_UML_EXPORT QUmlInstanceSpecification : public QUmlDeployedArtifact, public QUmlPackageableElement, public QUmlDeploymentTarget
 {
 public:
-    explicit QUmlInstanceSpecification(bool createQObject = true);
+    explicit QUmlInstanceSpecification(bool createQModelingObject = true);
     virtual ~QUmlInstanceSpecification();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlClassifier *> classifiers() const;
@@ -80,9 +79,6 @@ protected:
     QSet<QUmlClassifier *> _classifiers;
     QSet<QUmlSlot *> _slots_;
     QUmlValueSpecification *_specification;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlinstancevalue.cpp b/src/uml/qumlinstancevalue.cpp
index 51ed8579..e8ddba28 100644
--- a/src/uml/qumlinstancevalue.cpp
+++ b/src/uml/qumlinstancevalue.cpp
@@ -61,25 +61,23 @@
 
     \brief An instance value is a value specification that identifies an instance.
  */
-QUmlInstanceValue::QUmlInstanceValue(bool createQObject) :
+QUmlInstanceValue::QUmlInstanceValue(bool createQModelingObject) :
     _instance(0)
 {
-    if (createQObject)
-        _qObject = new QUmlInstanceValueObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlInstanceValueObject(this));
 }
 
 QUmlInstanceValue::~QUmlInstanceValue()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlInstanceValue::clone() const
+QModelingElement *QUmlInstanceValue::clone() const
 {
     QUmlInstanceValue *c = new QUmlInstanceValue;
     foreach (QUmlComment *element, ownedComments())
@@ -119,40 +117,8 @@ void QUmlInstanceValue::setInstance(QUmlInstanceSpecification *instance)
 
     if (_instance != instance) {
         _instance = instance;
-        if (instance && instance->asQObject() && this->asQObject())
-            QObject::connect(instance->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setInstance()));
+        if (instance && instance->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(instance->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setInstance()));
     }
 }
 
-void QUmlInstanceValue::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlInstanceValue"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("instance"))));
-}
-
-void QUmlInstanceValue::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceValue")][QStringLiteral("instance")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceValue")][QStringLiteral("instance")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInstanceValue");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceValue")][QStringLiteral("instance")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceValue")][QStringLiteral("instance")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceValue")][QStringLiteral("instance")][QtModeling::DocumentationRole] = QStringLiteral("The instance that is the specified value.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceValue")][QStringLiteral("instance")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceValue")][QStringLiteral("instance")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceValue")][QStringLiteral("instance")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlinstancevalue.h b/src/uml/qumlinstancevalue.h
index b76c4ebe..73c5b000 100644
--- a/src/uml/qumlinstancevalue.h
+++ b/src/uml/qumlinstancevalue.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlValueSpecification>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlInstanceSpecification;
 class Q_UML_EXPORT QUmlInstanceValue : public QUmlValueSpecification
 {
 public:
-    explicit QUmlInstanceValue(bool createQObject = true);
+    explicit QUmlInstanceValue(bool createQModelingObject = true);
     virtual ~QUmlInstanceValue();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlInstanceSpecification *instance() const;
@@ -68,9 +67,6 @@ public:
 
 protected:
     QUmlInstanceSpecification *_instance;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlinteraction.cpp b/src/uml/qumlinteraction.cpp
index e7f998b4..a53428a2 100644
--- a/src/uml/qumlinteraction.cpp
+++ b/src/uml/qumlinteraction.cpp
@@ -97,24 +97,22 @@
 
     \brief An interaction is a unit of behavior that focuses on the observable exchange of information between connectable elements.
  */
-QUmlInteraction::QUmlInteraction(bool createQObject)
+QUmlInteraction::QUmlInteraction(bool createQModelingObject)
 {
-    if (createQObject)
-        _qObject = new QUmlInteractionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlInteractionObject(this));
 }
 
 QUmlInteraction::~QUmlInteraction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlInteraction::clone() const
+QModelingElement *QUmlInteraction::clone() const
 {
     QUmlInteraction *c = new QUmlInteraction;
     foreach (QUmlComment *element, ownedComments())
@@ -229,9 +227,9 @@ void QUmlInteraction::addAction(QUmlAction *action)
 
     if (!_actions.contains(action)) {
         _actions.insert(action);
-        if (action && action->asQObject() && this->asQObject())
-            QObject::connect(action->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeAction(QObject *)));
-        action->asQObject()->setParent(this->asQObject());
+        if (action && action->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(action->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeAction(QObject *)));
+        action->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(action);
@@ -244,8 +242,8 @@ void QUmlInteraction::removeAction(QUmlAction *action)
 
     if (_actions.contains(action)) {
         _actions.remove(action);
-        if (action->asQObject())
-            action->asQObject()->setParent(0);
+        if (action->asQModelingObject())
+            action->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(action);
@@ -268,9 +266,9 @@ void QUmlInteraction::addFormalGate(QUmlGate *formalGate)
 
     if (!_formalGates.contains(formalGate)) {
         _formalGates.insert(formalGate);
-        if (formalGate && formalGate->asQObject() && this->asQObject())
-            QObject::connect(formalGate->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeFormalGate(QObject *)));
-        formalGate->asQObject()->setParent(this->asQObject());
+        if (formalGate && formalGate->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(formalGate->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeFormalGate(QObject *)));
+        formalGate->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedMember(formalGate);
@@ -283,8 +281,8 @@ void QUmlInteraction::removeFormalGate(QUmlGate *formalGate)
 
     if (_formalGates.contains(formalGate)) {
         _formalGates.remove(formalGate);
-        if (formalGate->asQObject())
-            formalGate->asQObject()->setParent(0);
+        if (formalGate->asQModelingObject())
+            formalGate->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedMember(formalGate);
@@ -307,9 +305,9 @@ void QUmlInteraction::addFragment(QUmlInteractionFragment *fragment)
 
     if (!_fragments.contains(fragment)) {
         _fragments.append(fragment);
-        if (fragment && fragment->asQObject() && this->asQObject())
-            QObject::connect(fragment->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeFragment(QObject *)));
-        fragment->asQObject()->setParent(this->asQObject());
+        if (fragment && fragment->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(fragment->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeFragment(QObject *)));
+        fragment->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedMember(fragment);
@@ -327,8 +325,8 @@ void QUmlInteraction::removeFragment(QUmlInteractionFragment *fragment)
 
     if (_fragments.contains(fragment)) {
         _fragments.removeAll(fragment);
-        if (fragment->asQObject())
-            fragment->asQObject()->setParent(0);
+        if (fragment->asQModelingObject())
+            fragment->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedMember(fragment);
@@ -356,9 +354,9 @@ void QUmlInteraction::addLifeline(QUmlLifeline *lifeline)
 
     if (!_lifelines.contains(lifeline)) {
         _lifelines.insert(lifeline);
-        if (lifeline && lifeline->asQObject() && this->asQObject())
-            QObject::connect(lifeline->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeLifeline(QObject *)));
-        lifeline->asQObject()->setParent(this->asQObject());
+        if (lifeline && lifeline->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(lifeline->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeLifeline(QObject *)));
+        lifeline->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedMember(lifeline);
@@ -376,8 +374,8 @@ void QUmlInteraction::removeLifeline(QUmlLifeline *lifeline)
 
     if (_lifelines.contains(lifeline)) {
         _lifelines.remove(lifeline);
-        if (lifeline->asQObject())
-            lifeline->asQObject()->setParent(0);
+        if (lifeline->asQModelingObject())
+            lifeline->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedMember(lifeline);
@@ -405,9 +403,9 @@ void QUmlInteraction::addMessage(QUmlMessage *message)
 
     if (!_messages.contains(message)) {
         _messages.insert(message);
-        if (message && message->asQObject() && this->asQObject())
-            QObject::connect(message->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeMessage(QObject *)));
-        message->asQObject()->setParent(this->asQObject());
+        if (message && message->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(message->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeMessage(QObject *)));
+        message->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedMember(message);
@@ -425,8 +423,8 @@ void QUmlInteraction::removeMessage(QUmlMessage *message)
 
     if (_messages.contains(message)) {
         _messages.remove(message);
-        if (message->asQObject())
-            message->asQObject()->setParent(0);
+        if (message->asQModelingObject())
+            message->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedMember(message);
@@ -438,125 +436,3 @@ void QUmlInteraction::removeMessage(QUmlMessage *message)
     }
 }
 
-void QUmlInteraction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedConnectors"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parts"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("roles"))));
-    _groupProperties.insert(QStringLiteral("QUmlEncapsulatedClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedPorts"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifierBehavior"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interfaceRealizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedBehaviors"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extensions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isActive"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedReceptions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superClasses"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameters"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameterSets"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("postconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("preconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedBehaviors"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("specification"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("covered"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingInteraction"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingOperand"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalOrderings"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteraction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("actions"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteraction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("formalGates"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteraction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("fragments"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteraction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lifelines"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteraction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("messages"))));
-}
-
-void QUmlInteraction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("actions")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("actions")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteraction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("actions")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("actions")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("actions")][QtModeling::DocumentationRole] = QStringLiteral("Actions owned by the Interaction.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("actions")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("actions")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("actions")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("formalGates")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("formalGates")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteraction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("formalGates")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("formalGates")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("formalGates")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the gates that form the message interface between this Interaction and any InteractionUses which reference it.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("formalGates")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("formalGates")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("formalGates")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("fragments")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("fragments")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteraction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("fragments")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("fragments")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("fragments")][QtModeling::DocumentationRole] = QStringLiteral("The ordered set of fragments in the Interaction.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("fragments")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("fragments")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("fragments")][QtModeling::OppositeEndRole] = QStringLiteral("InteractionFragment-enclosingInteraction");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("lifelines")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("lifelines")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteraction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("lifelines")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("lifelines")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("lifelines")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the participants in this Interaction.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("lifelines")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("lifelines")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("lifelines")][QtModeling::OppositeEndRole] = QStringLiteral("Lifeline-interaction");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("messages")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("messages")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteraction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("messages")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("messages")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("messages")][QtModeling::DocumentationRole] = QStringLiteral("The Messages contained in this Interaction.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("messages")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("messages")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("messages")][QtModeling::OppositeEndRole] = QStringLiteral("Message-interaction");
-
-}
-
diff --git a/src/uml/qumlinteraction.h b/src/uml/qumlinteraction.h
index e3c6adf0..2dcde3d2 100644
--- a/src/uml/qumlinteraction.h
+++ b/src/uml/qumlinteraction.h
@@ -46,7 +46,6 @@
 #include <QtUml/QUmlBehavior>
 #include <QtUml/QUmlInteractionFragment>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -61,10 +60,10 @@ class QUmlMessage;
 class Q_UML_EXPORT QUmlInteraction : public QUmlBehavior, public QUmlInteractionFragment
 {
 public:
-    explicit QUmlInteraction(bool createQObject = true);
+    explicit QUmlInteraction(bool createQModelingObject = true);
     virtual ~QUmlInteraction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlAction *> actions() const;
@@ -89,9 +88,6 @@ protected:
     QList<QUmlInteractionFragment *> _fragments;
     QSet<QUmlLifeline *> _lifelines;
     QSet<QUmlMessage *> _messages;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlinteractionconstraint.cpp b/src/uml/qumlinteractionconstraint.cpp
index 58b25036..3d7ee6b4 100644
--- a/src/uml/qumlinteractionconstraint.cpp
+++ b/src/uml/qumlinteractionconstraint.cpp
@@ -60,27 +60,25 @@
 
     \brief An interaction constraint is a Boolean expression that guards an operand in a combined fragment.
  */
-QUmlInteractionConstraint::QUmlInteractionConstraint(bool createQObject) :
+QUmlInteractionConstraint::QUmlInteractionConstraint(bool createQModelingObject) :
     QUmlConstraint(false),
     _maxint(0),
     _minint(0)
 {
-    if (createQObject)
-        _qObject = new QUmlInteractionConstraintObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlInteractionConstraintObject(this));
 }
 
 QUmlInteractionConstraint::~QUmlInteractionConstraint()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlInteractionConstraint::clone() const
+QModelingElement *QUmlInteractionConstraint::clone() const
 {
     QUmlInteractionConstraint *c = new QUmlInteractionConstraint;
     foreach (QUmlComment *element, ownedComments())
@@ -129,9 +127,9 @@ void QUmlInteractionConstraint::setMaxint(QUmlValueSpecification *maxint)
         removeOwnedElement(_maxint);
 
         _maxint = maxint;
-        if (maxint && maxint->asQObject() && this->asQObject())
-            QObject::connect(maxint->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setMaxint()));
-        maxint->asQObject()->setParent(this->asQObject());
+        if (maxint && maxint->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(maxint->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setMaxint()));
+        maxint->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (maxint) {
@@ -159,9 +157,9 @@ void QUmlInteractionConstraint::setMinint(QUmlValueSpecification *minint)
         removeOwnedElement(_minint);
 
         _minint = minint;
-        if (minint && minint->asQObject() && this->asQObject())
-            QObject::connect(minint->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setMinint()));
-        minint->asQObject()->setParent(this->asQObject());
+        if (minint && minint->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(minint->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setMinint()));
+        minint->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (minint) {
@@ -170,47 +168,3 @@ void QUmlInteractionConstraint::setMinint(QUmlValueSpecification *minint)
     }
 }
 
-void QUmlInteractionConstraint::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlConstraint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("constrainedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlConstraint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlConstraint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("specification"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionConstraint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("maxint"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionConstraint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("minint"))));
-}
-
-void QUmlInteractionConstraint::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionConstraint")][QStringLiteral("maxint")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionConstraint")][QStringLiteral("maxint")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteractionConstraint");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionConstraint")][QStringLiteral("maxint")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionConstraint")][QStringLiteral("maxint")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionConstraint")][QStringLiteral("maxint")][QtModeling::DocumentationRole] = QStringLiteral("The maximum number of iterations of a loop");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionConstraint")][QStringLiteral("maxint")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionConstraint")][QStringLiteral("maxint")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionConstraint")][QStringLiteral("maxint")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionConstraint")][QStringLiteral("minint")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionConstraint")][QStringLiteral("minint")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteractionConstraint");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionConstraint")][QStringLiteral("minint")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionConstraint")][QStringLiteral("minint")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionConstraint")][QStringLiteral("minint")][QtModeling::DocumentationRole] = QStringLiteral("The minimum number of iterations of a loop");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionConstraint")][QStringLiteral("minint")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionConstraint")][QStringLiteral("minint")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionConstraint")][QStringLiteral("minint")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlinteractionconstraint.h b/src/uml/qumlinteractionconstraint.h
index d7f094dd..053e99a0 100644
--- a/src/uml/qumlinteractionconstraint.h
+++ b/src/uml/qumlinteractionconstraint.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlConstraint>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlValueSpecification;
 class Q_UML_EXPORT QUmlInteractionConstraint : public QUmlConstraint
 {
 public:
-    explicit QUmlInteractionConstraint(bool createQObject = true);
+    explicit QUmlInteractionConstraint(bool createQModelingObject = true);
     virtual ~QUmlInteractionConstraint();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlValueSpecification *maxint() const;
@@ -71,9 +70,6 @@ public:
 protected:
     QUmlValueSpecification *_maxint;
     QUmlValueSpecification *_minint;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlinteractionfragment.cpp b/src/uml/qumlinteractionfragment.cpp
index d0e5054f..63c79919 100644
--- a/src/uml/qumlinteractionfragment.cpp
+++ b/src/uml/qumlinteractionfragment.cpp
@@ -63,15 +63,13 @@ QUmlInteractionFragment::QUmlInteractionFragment() :
     _enclosingInteraction(0),
     _enclosingOperand(0)
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlInteractionFragment::~QUmlInteractionFragment()
 {
 }
 
-QModelingObject *QUmlInteractionFragment::clone() const
+QModelingElement *QUmlInteractionFragment::clone() const
 {
     QUmlInteractionFragment *c = new QUmlInteractionFragment;
     foreach (QUmlComment *element, ownedComments())
@@ -111,8 +109,8 @@ void QUmlInteractionFragment::addCovered(QUmlLifeline *covered)
 
     if (!_covered.contains(covered)) {
         _covered.insert(covered);
-        if (covered && covered->asQObject() && this->asQObject())
-            QObject::connect(covered->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeCovered(QObject *)));
+        if (covered && covered->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(covered->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeCovered(QObject *)));
 
         // Adjust opposite properties
         if (covered) {
@@ -153,8 +151,8 @@ void QUmlInteractionFragment::setEnclosingInteraction(QUmlInteraction *enclosing
         // Adjust subsetted properties
 
         _enclosingInteraction = enclosingInteraction;
-        if (enclosingInteraction && enclosingInteraction->asQObject() && this->asQObject())
-            QObject::connect(enclosingInteraction->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setEnclosingInteraction()));
+        if (enclosingInteraction && enclosingInteraction->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(enclosingInteraction->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setEnclosingInteraction()));
 
         // Adjust subsetted properties
         setNamespace(enclosingInteraction);
@@ -179,8 +177,8 @@ void QUmlInteractionFragment::setEnclosingOperand(QUmlInteractionOperand *enclos
         // Adjust subsetted properties
 
         _enclosingOperand = enclosingOperand;
-        if (enclosingOperand && enclosingOperand->asQObject() && this->asQObject())
-            QObject::connect(enclosingOperand->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setEnclosingOperand()));
+        if (enclosingOperand && enclosingOperand->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(enclosingOperand->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setEnclosingOperand()));
 
         // Adjust subsetted properties
         setNamespace(enclosingOperand);
@@ -203,9 +201,9 @@ void QUmlInteractionFragment::addGeneralOrdering(QUmlGeneralOrdering *generalOrd
 
     if (!_generalOrderings.contains(generalOrdering)) {
         _generalOrderings.insert(generalOrdering);
-        if (generalOrdering && generalOrdering->asQObject() && this->asQObject())
-            QObject::connect(generalOrdering->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeGeneralOrdering(QObject *)));
-        generalOrdering->asQObject()->setParent(this->asQObject());
+        if (generalOrdering && generalOrdering->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(generalOrdering->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeGeneralOrdering(QObject *)));
+        generalOrdering->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(generalOrdering);
@@ -218,70 +216,11 @@ void QUmlInteractionFragment::removeGeneralOrdering(QUmlGeneralOrdering *general
 
     if (_generalOrderings.contains(generalOrdering)) {
         _generalOrderings.remove(generalOrdering);
-        if (generalOrdering->asQObject())
-            generalOrdering->asQObject()->setParent(0);
+        if (generalOrdering->asQModelingObject())
+            generalOrdering->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(generalOrdering);
     }
 }
 
-void QUmlInteractionFragment::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("covered"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingInteraction"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingOperand"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalOrderings"))));
-}
-
-void QUmlInteractionFragment::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("covered")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("covered")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteractionFragment");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("covered")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("covered")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("covered")][QtModeling::DocumentationRole] = QStringLiteral("References the Lifelines that the InteractionFragment involves.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("covered")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("covered")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("covered")][QtModeling::OppositeEndRole] = QStringLiteral("Lifeline-coveredBy");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("enclosingInteraction")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("enclosingInteraction")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteractionFragment");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("enclosingInteraction")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("enclosingInteraction")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("enclosingInteraction")][QtModeling::DocumentationRole] = QStringLiteral("The Interaction enclosing this InteractionFragment.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("enclosingInteraction")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("enclosingInteraction")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("enclosingInteraction")][QtModeling::OppositeEndRole] = QStringLiteral("Interaction-fragment");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("enclosingOperand")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("enclosingOperand")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteractionFragment");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("enclosingOperand")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("enclosingOperand")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("enclosingOperand")][QtModeling::DocumentationRole] = QStringLiteral("The operand enclosing this InteractionFragment (they may nest recursively)");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("enclosingOperand")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("enclosingOperand")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("enclosingOperand")][QtModeling::OppositeEndRole] = QStringLiteral("InteractionOperand-fragment");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("generalOrderings")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("generalOrderings")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteractionFragment");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("generalOrderings")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("generalOrderings")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("generalOrderings")][QtModeling::DocumentationRole] = QStringLiteral("The general ordering relationships contained in this fragment.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("generalOrderings")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("generalOrderings")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("generalOrderings")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlinteractionfragment.h b/src/uml/qumlinteractionfragment.h
index f209215c..d452d2c5 100644
--- a/src/uml/qumlinteractionfragment.h
+++ b/src/uml/qumlinteractionfragment.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlNamedElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -62,7 +61,7 @@ class Q_UML_EXPORT QUmlInteractionFragment : public virtual QUmlNamedElement
 public:
     virtual ~QUmlInteractionFragment();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlLifeline *> covered() const;
@@ -83,9 +82,6 @@ protected:
     QUmlInteraction *_enclosingInteraction;
     QUmlInteractionOperand *_enclosingOperand;
     QSet<QUmlGeneralOrdering *> _generalOrderings;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlinteractionoperand.cpp b/src/uml/qumlinteractionoperand.cpp
index afd0a17b..ebefd99b 100644
--- a/src/uml/qumlinteractionoperand.cpp
+++ b/src/uml/qumlinteractionoperand.cpp
@@ -66,25 +66,23 @@
 
     \brief An interaction operand is contained in a combined fragment. An interaction operand represents one operand of the expression given by the enclosing combined fragment.
  */
-QUmlInteractionOperand::QUmlInteractionOperand(bool createQObject) :
+QUmlInteractionOperand::QUmlInteractionOperand(bool createQModelingObject) :
     _guard(0)
 {
-    if (createQObject)
-        _qObject = new QUmlInteractionOperandObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlInteractionOperandObject(this));
 }
 
 QUmlInteractionOperand::~QUmlInteractionOperand()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlInteractionOperand::clone() const
+QModelingElement *QUmlInteractionOperand::clone() const
 {
     QUmlInteractionOperand *c = new QUmlInteractionOperand;
     foreach (QUmlComment *element, ownedComments())
@@ -134,9 +132,9 @@ void QUmlInteractionOperand::addFragment(QUmlInteractionFragment *fragment)
 
     if (!_fragments.contains(fragment)) {
         _fragments.append(fragment);
-        if (fragment && fragment->asQObject() && this->asQObject())
-            QObject::connect(fragment->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeFragment(QObject *)));
-        fragment->asQObject()->setParent(this->asQObject());
+        if (fragment && fragment->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(fragment->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeFragment(QObject *)));
+        fragment->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedMember(fragment);
@@ -154,8 +152,8 @@ void QUmlInteractionOperand::removeFragment(QUmlInteractionFragment *fragment)
 
     if (_fragments.contains(fragment)) {
         _fragments.removeAll(fragment);
-        if (fragment->asQObject())
-            fragment->asQObject()->setParent(0);
+        if (fragment->asQModelingObject())
+            fragment->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedMember(fragment);
@@ -186,9 +184,9 @@ void QUmlInteractionOperand::setGuard(QUmlInteractionConstraint *guard)
         removeOwnedElement(_guard);
 
         _guard = guard;
-        if (guard && guard->asQObject() && this->asQObject())
-            QObject::connect(guard->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setGuard()));
-        guard->asQObject()->setParent(this->asQObject());
+        if (guard && guard->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(guard->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setGuard()));
+        guard->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (guard) {
@@ -197,52 +195,3 @@ void QUmlInteractionOperand::setGuard(QUmlInteractionConstraint *guard)
     }
 }
 
-void QUmlInteractionOperand::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("covered"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingInteraction"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingOperand"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalOrderings"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionOperand"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("fragments"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionOperand"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("guard"))));
-}
-
-void QUmlInteractionOperand::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionOperand")][QStringLiteral("fragments")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionOperand")][QStringLiteral("fragments")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteractionOperand");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionOperand")][QStringLiteral("fragments")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionOperand")][QStringLiteral("fragments")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionOperand")][QStringLiteral("fragments")][QtModeling::DocumentationRole] = QStringLiteral("The fragments of the operand.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionOperand")][QStringLiteral("fragments")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionOperand")][QStringLiteral("fragments")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionOperand")][QStringLiteral("fragments")][QtModeling::OppositeEndRole] = QStringLiteral("InteractionFragment-enclosingOperand");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionOperand")][QStringLiteral("guard")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionOperand")][QStringLiteral("guard")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteractionOperand");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionOperand")][QStringLiteral("guard")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionOperand")][QStringLiteral("guard")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionOperand")][QStringLiteral("guard")][QtModeling::DocumentationRole] = QStringLiteral("Constraint of the operand.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionOperand")][QStringLiteral("guard")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionOperand")][QStringLiteral("guard")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionOperand")][QStringLiteral("guard")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlinteractionoperand.h b/src/uml/qumlinteractionoperand.h
index a872b606..fe3e22f2 100644
--- a/src/uml/qumlinteractionoperand.h
+++ b/src/uml/qumlinteractionoperand.h
@@ -46,7 +46,6 @@
 #include <QtUml/QUmlInteractionFragment>
 #include <QtUml/QUmlNamespace>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlInteractionConstraint;
 class Q_UML_EXPORT QUmlInteractionOperand : public QUmlInteractionFragment, public QUmlNamespace
 {
 public:
-    explicit QUmlInteractionOperand(bool createQObject = true);
+    explicit QUmlInteractionOperand(bool createQModelingObject = true);
     virtual ~QUmlInteractionOperand();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QList<QUmlInteractionFragment *> fragments() const;
@@ -73,9 +72,6 @@ public:
 protected:
     QList<QUmlInteractionFragment *> _fragments;
     QUmlInteractionConstraint *_guard;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlinteractionuse.cpp b/src/uml/qumlinteractionuse.cpp
index 76eb6714..5019a148 100644
--- a/src/uml/qumlinteractionuse.cpp
+++ b/src/uml/qumlinteractionuse.cpp
@@ -64,27 +64,25 @@
 
     \brief An interaction use refers to an interaction. The interaction use is a shorthand for copying the contents of the referenced interaction where the interaction use is. To be accurate the copying must take into account substituting parameters with arguments and connect the formal gates with the actual ones.
  */
-QUmlInteractionUse::QUmlInteractionUse(bool createQObject) :
+QUmlInteractionUse::QUmlInteractionUse(bool createQModelingObject) :
     _refersTo(0),
     _returnValue(0),
     _returnValueRecipient(0)
 {
-    if (createQObject)
-        _qObject = new QUmlInteractionUseObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlInteractionUseObject(this));
 }
 
 QUmlInteractionUse::~QUmlInteractionUse()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlInteractionUse::clone() const
+QModelingElement *QUmlInteractionUse::clone() const
 {
     QUmlInteractionUse *c = new QUmlInteractionUse;
     foreach (QUmlComment *element, ownedComments())
@@ -134,9 +132,9 @@ void QUmlInteractionUse::addActualGate(QUmlGate *actualGate)
 
     if (!_actualGates.contains(actualGate)) {
         _actualGates.insert(actualGate);
-        if (actualGate && actualGate->asQObject() && this->asQObject())
-            QObject::connect(actualGate->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeActualGate(QObject *)));
-        actualGate->asQObject()->setParent(this->asQObject());
+        if (actualGate && actualGate->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(actualGate->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeActualGate(QObject *)));
+        actualGate->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(actualGate);
@@ -149,8 +147,8 @@ void QUmlInteractionUse::removeActualGate(QUmlGate *actualGate)
 
     if (_actualGates.contains(actualGate)) {
         _actualGates.remove(actualGate);
-        if (actualGate->asQObject())
-            actualGate->asQObject()->setParent(0);
+        if (actualGate->asQModelingObject())
+            actualGate->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(actualGate);
@@ -173,9 +171,9 @@ void QUmlInteractionUse::addArgument(QUmlValueSpecification *argument)
 
     if (!_arguments.contains(argument)) {
         _arguments.append(argument);
-        if (argument && argument->asQObject() && this->asQObject())
-            QObject::connect(argument->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeArgument(QObject *)));
-        argument->asQObject()->setParent(this->asQObject());
+        if (argument && argument->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(argument->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeArgument(QObject *)));
+        argument->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(argument);
@@ -188,8 +186,8 @@ void QUmlInteractionUse::removeArgument(QUmlValueSpecification *argument)
 
     if (_arguments.contains(argument)) {
         _arguments.removeAll(argument);
-        if (argument->asQObject())
-            argument->asQObject()->setParent(0);
+        if (argument->asQModelingObject())
+            argument->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(argument);
@@ -212,8 +210,8 @@ void QUmlInteractionUse::setRefersTo(QUmlInteraction *refersTo)
 
     if (_refersTo != refersTo) {
         _refersTo = refersTo;
-        if (refersTo && refersTo->asQObject() && this->asQObject())
-            QObject::connect(refersTo->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setRefersTo()));
+        if (refersTo && refersTo->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(refersTo->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setRefersTo()));
     }
 }
 
@@ -236,9 +234,9 @@ void QUmlInteractionUse::setReturnValue(QUmlValueSpecification *returnValue)
         removeOwnedElement(_returnValue);
 
         _returnValue = returnValue;
-        if (returnValue && returnValue->asQObject() && this->asQObject())
-            QObject::connect(returnValue->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setReturnValue()));
-        returnValue->asQObject()->setParent(this->asQObject());
+        if (returnValue && returnValue->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(returnValue->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setReturnValue()));
+        returnValue->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (returnValue) {
@@ -263,81 +261,8 @@ void QUmlInteractionUse::setReturnValueRecipient(QUmlProperty *returnValueRecipi
 
     if (_returnValueRecipient != returnValueRecipient) {
         _returnValueRecipient = returnValueRecipient;
-        if (returnValueRecipient && returnValueRecipient->asQObject() && this->asQObject())
-            QObject::connect(returnValueRecipient->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setReturnValueRecipient()));
+        if (returnValueRecipient && returnValueRecipient->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(returnValueRecipient->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setReturnValueRecipient()));
     }
 }
 
-void QUmlInteractionUse::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("covered"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingInteraction"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingOperand"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalOrderings"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionUse"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("actualGates"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionUse"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("arguments"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionUse"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("refersTo"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionUse"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("returnValue"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionUse"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("returnValueRecipient"))));
-}
-
-void QUmlInteractionUse::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("actualGates")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("actualGates")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteractionUse");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("actualGates")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("actualGates")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("actualGates")][QtModeling::DocumentationRole] = QStringLiteral("The actual gates of the InteractionUse");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("actualGates")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("actualGates")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("actualGates")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("arguments")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("arguments")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteractionUse");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("arguments")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("arguments")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("arguments")][QtModeling::DocumentationRole] = QStringLiteral("The actual arguments of the Interaction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("arguments")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("arguments")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("arguments")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("refersTo")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("refersTo")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteractionUse");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("refersTo")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("refersTo")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("refersTo")][QtModeling::DocumentationRole] = QStringLiteral("Refers to the Interaction that defines its meaning");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("refersTo")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("refersTo")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("refersTo")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("returnValue")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("returnValue")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteractionUse");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("returnValue")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("returnValue")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("returnValue")][QtModeling::DocumentationRole] = QStringLiteral("The value of the executed Interaction.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("returnValue")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("returnValue")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("returnValue")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("returnValueRecipient")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("returnValueRecipient")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteractionUse");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("returnValueRecipient")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("returnValueRecipient")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("returnValueRecipient")][QtModeling::DocumentationRole] = QStringLiteral("The recipient of the return value.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("returnValueRecipient")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("returnValueRecipient")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("returnValueRecipient")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlinteractionuse.h b/src/uml/qumlinteractionuse.h
index c8768839..440cb4bd 100644
--- a/src/uml/qumlinteractionuse.h
+++ b/src/uml/qumlinteractionuse.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlInteractionFragment>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -60,10 +59,10 @@ class QUmlValueSpecification;
 class Q_UML_EXPORT QUmlInteractionUse : public QUmlInteractionFragment
 {
 public:
-    explicit QUmlInteractionUse(bool createQObject = true);
+    explicit QUmlInteractionUse(bool createQModelingObject = true);
     virtual ~QUmlInteractionUse();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlGate *> actualGates() const;
@@ -85,9 +84,6 @@ protected:
     QUmlInteraction *_refersTo;
     QUmlValueSpecification *_returnValue;
     QUmlProperty *_returnValueRecipient;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlinterface.cpp b/src/uml/qumlinterface.cpp
index e3068521..c7072921 100644
--- a/src/uml/qumlinterface.cpp
+++ b/src/uml/qumlinterface.cpp
@@ -80,25 +80,23 @@
 
     \brief Since an interface specifies conformance characteristics, it does not own detailed behavior specifications. Instead, interfaces may own a protocol state machine that specifies event sequences and pre/post conditions for the operations and receptions described by the interface.Interfaces may include receptions (in addition to operations).An interface is a kind of classifier that represents a declaration of a set of coherent public features and obligations. An interface specifies a contract; any instance of a classifier that realizes the interface must fulfill that contract. The obligations that may be associated with an interface are in the form of various kinds of constraints (such as pre- and post-conditions) or protocol specifications, which may impose ordering restrictions on interactions through the interface.
  */
-QUmlInterface::QUmlInterface(bool createQObject) :
+QUmlInterface::QUmlInterface(bool createQModelingObject) :
     _protocol(0)
 {
-    if (createQObject)
-        _qObject = new QUmlInterfaceObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlInterfaceObject(this));
 }
 
 QUmlInterface::~QUmlInterface()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlInterface::clone() const
+QModelingElement *QUmlInterface::clone() const
 {
     QUmlInterface *c = new QUmlInterface;
     foreach (QUmlComment *element, ownedComments())
@@ -177,9 +175,9 @@ void QUmlInterface::addNestedClassifier(QUmlClassifier *nestedClassifier)
 
     if (!_nestedClassifiers.contains(nestedClassifier)) {
         _nestedClassifiers.append(nestedClassifier);
-        if (nestedClassifier && nestedClassifier->asQObject() && this->asQObject())
-            QObject::connect(nestedClassifier->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeNestedClassifier(QObject *)));
-        nestedClassifier->asQObject()->setParent(this->asQObject());
+        if (nestedClassifier && nestedClassifier->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(nestedClassifier->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeNestedClassifier(QObject *)));
+        nestedClassifier->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedMember(nestedClassifier);
@@ -192,8 +190,8 @@ void QUmlInterface::removeNestedClassifier(QUmlClassifier *nestedClassifier)
 
     if (_nestedClassifiers.contains(nestedClassifier)) {
         _nestedClassifiers.removeAll(nestedClassifier);
-        if (nestedClassifier->asQObject())
-            nestedClassifier->asQObject()->setParent(0);
+        if (nestedClassifier->asQModelingObject())
+            nestedClassifier->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedMember(nestedClassifier);
@@ -216,9 +214,9 @@ void QUmlInterface::addOwnedAttribute(QUmlProperty *ownedAttribute)
 
     if (!_ownedAttributes.contains(ownedAttribute)) {
         _ownedAttributes.append(ownedAttribute);
-        if (ownedAttribute && ownedAttribute->asQObject() && this->asQObject())
-            QObject::connect(ownedAttribute->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeOwnedAttribute(QObject *)));
-        ownedAttribute->asQObject()->setParent(this->asQObject());
+        if (ownedAttribute && ownedAttribute->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(ownedAttribute->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeOwnedAttribute(QObject *)));
+        ownedAttribute->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedMember(ownedAttribute);
@@ -237,8 +235,8 @@ void QUmlInterface::removeOwnedAttribute(QUmlProperty *ownedAttribute)
 
     if (_ownedAttributes.contains(ownedAttribute)) {
         _ownedAttributes.removeAll(ownedAttribute);
-        if (ownedAttribute->asQObject())
-            ownedAttribute->asQObject()->setParent(0);
+        if (ownedAttribute->asQModelingObject())
+            ownedAttribute->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedMember(ownedAttribute);
@@ -267,9 +265,9 @@ void QUmlInterface::addOwnedOperation(QUmlOperation *ownedOperation)
 
     if (!_ownedOperations.contains(ownedOperation)) {
         _ownedOperations.append(ownedOperation);
-        if (ownedOperation && ownedOperation->asQObject() && this->asQObject())
-            QObject::connect(ownedOperation->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeOwnedOperation(QObject *)));
-        ownedOperation->asQObject()->setParent(this->asQObject());
+        if (ownedOperation && ownedOperation->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(ownedOperation->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeOwnedOperation(QObject *)));
+        ownedOperation->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addFeature(ownedOperation);
@@ -288,8 +286,8 @@ void QUmlInterface::removeOwnedOperation(QUmlOperation *ownedOperation)
 
     if (_ownedOperations.contains(ownedOperation)) {
         _ownedOperations.removeAll(ownedOperation);
-        if (ownedOperation->asQObject())
-            ownedOperation->asQObject()->setParent(0);
+        if (ownedOperation->asQModelingObject())
+            ownedOperation->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeFeature(ownedOperation);
@@ -318,9 +316,9 @@ void QUmlInterface::addOwnedReception(QUmlReception *ownedReception)
 
     if (!_ownedReceptions.contains(ownedReception)) {
         _ownedReceptions.insert(ownedReception);
-        if (ownedReception && ownedReception->asQObject() && this->asQObject())
-            QObject::connect(ownedReception->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeOwnedReception(QObject *)));
-        ownedReception->asQObject()->setParent(this->asQObject());
+        if (ownedReception && ownedReception->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(ownedReception->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeOwnedReception(QObject *)));
+        ownedReception->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addFeature(ownedReception);
@@ -334,8 +332,8 @@ void QUmlInterface::removeOwnedReception(QUmlReception *ownedReception)
 
     if (_ownedReceptions.contains(ownedReception)) {
         _ownedReceptions.remove(ownedReception);
-        if (ownedReception->asQObject())
-            ownedReception->asQObject()->setParent(0);
+        if (ownedReception->asQModelingObject())
+            ownedReception->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeFeature(ownedReception);
@@ -362,9 +360,9 @@ void QUmlInterface::setProtocol(QUmlProtocolStateMachine *protocol)
         removeOwnedMember(_protocol);
 
         _protocol = protocol;
-        if (protocol && protocol->asQObject() && this->asQObject())
-            QObject::connect(protocol->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setProtocol()));
-        protocol->asQObject()->setParent(this->asQObject());
+        if (protocol && protocol->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(protocol->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setProtocol()));
+        protocol->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (protocol) {
@@ -389,8 +387,8 @@ void QUmlInterface::addRedefinedInterface(QUmlInterface *redefinedInterface)
 
     if (!_redefinedInterfaces.contains(redefinedInterface)) {
         _redefinedInterfaces.insert(redefinedInterface);
-        if (redefinedInterface && redefinedInterface->asQObject() && this->asQObject())
-            QObject::connect(redefinedInterface->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeRedefinedInterface(QObject *)));
+        if (redefinedInterface && redefinedInterface->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(redefinedInterface->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeRedefinedInterface(QObject *)));
 
         // Adjust subsetted properties
         addRedefinedClassifier(redefinedInterface);
@@ -409,110 +407,3 @@ void QUmlInterface::removeRedefinedInterface(QUmlInterface *redefinedInterface)
     }
 }
 
-void QUmlInterface::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generals"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlInterface"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlInterface"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlInterface"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
-    _groupProperties.insert(QStringLiteral("QUmlInterface"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedReceptions"))));
-    _groupProperties.insert(QStringLiteral("QUmlInterface"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("protocol"))));
-    _groupProperties.insert(QStringLiteral("QUmlInterface"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedInterfaces"))));
-}
-
-void QUmlInterface::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("nestedClassifiers")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("nestedClassifiers")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInterface");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("nestedClassifiers")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("nestedClassifiers")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("nestedClassifiers")][QtModeling::DocumentationRole] = QStringLiteral("References all the Classifiers that are defined (nested) within the Class.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("nestedClassifiers")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("nestedClassifiers")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_redefinitionContext_redefinableElement-redefinableElement Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("nestedClassifiers")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedAttributes")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedAttributes")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInterface");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedAttributes")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedAttributes")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedAttributes")][QtModeling::DocumentationRole] = QStringLiteral("The attributes (i.e. the properties) owned by the class.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedAttributes")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedAttributes")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember Classifier-attribute");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedAttributes")][QtModeling::OppositeEndRole] = QStringLiteral("Property-interface");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedOperations")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedOperations")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInterface");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedOperations")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedOperations")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedOperations")][QtModeling::DocumentationRole] = QStringLiteral("The operations owned by the class.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedOperations")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedOperations")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Classifier-feature A_redefinitionContext_redefinableElement-redefinableElement Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedOperations")][QtModeling::OppositeEndRole] = QStringLiteral("Operation-interface");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedReceptions")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedReceptions")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInterface");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedReceptions")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedReceptions")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedReceptions")][QtModeling::DocumentationRole] = QStringLiteral("Receptions that objects providing this interface are willing to accept.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedReceptions")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedReceptions")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Classifier-feature Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedReceptions")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("protocol")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("protocol")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInterface");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("protocol")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("protocol")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("protocol")][QtModeling::DocumentationRole] = QStringLiteral("References a protocol state machine specifying the legal sequences of the invocation of the behavioral features described in the interface.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("protocol")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("protocol")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("protocol")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("redefinedInterfaces")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("redefinedInterfaces")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInterface");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("redefinedInterfaces")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("redefinedInterfaces")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("redefinedInterfaces")][QtModeling::DocumentationRole] = QStringLiteral("References all the Interfaces redefined by this Interface.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("redefinedInterfaces")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("redefinedInterfaces")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Classifier-redefinedClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("redefinedInterfaces")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlinterface.h b/src/uml/qumlinterface.h
index 60803a6c..5522e811 100644
--- a/src/uml/qumlinterface.h
+++ b/src/uml/qumlinterface.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlClassifier>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -60,10 +59,10 @@ class QUmlReception;
 class Q_UML_EXPORT QUmlInterface : public QUmlClassifier
 {
 public:
-    explicit QUmlInterface(bool createQObject = true);
+    explicit QUmlInterface(bool createQModelingObject = true);
     virtual ~QUmlInterface();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QList<QUmlClassifier *> nestedClassifiers() const;
@@ -91,9 +90,6 @@ protected:
     QSet<QUmlReception *> _ownedReceptions;
     QUmlProtocolStateMachine *_protocol;
     QSet<QUmlInterface *> _redefinedInterfaces;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlinterfacerealization.cpp b/src/uml/qumlinterfacerealization.cpp
index 49f0d6d4..4b95c274 100644
--- a/src/uml/qumlinterfacerealization.cpp
+++ b/src/uml/qumlinterfacerealization.cpp
@@ -62,27 +62,25 @@
 
     \brief An interface realization is a specialized realization relationship between a classifier and an interface. This relationship signifies that the realizing classifier conforms to the contract specified by the interface.
  */
-QUmlInterfaceRealization::QUmlInterfaceRealization(bool createQObject) :
+QUmlInterfaceRealization::QUmlInterfaceRealization(bool createQModelingObject) :
     QUmlRealization(false),
     _contract(0),
     _implementingClassifier(0)
 {
-    if (createQObject)
-        _qObject = new QUmlInterfaceRealizationObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlInterfaceRealizationObject(this));
 }
 
 QUmlInterfaceRealization::~QUmlInterfaceRealization()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlInterfaceRealization::clone() const
+QModelingElement *QUmlInterfaceRealization::clone() const
 {
     QUmlInterfaceRealization *c = new QUmlInterfaceRealization;
     foreach (QUmlComment *element, ownedComments())
@@ -131,8 +129,8 @@ void QUmlInterfaceRealization::setContract(QUmlInterface *contract)
         removeSupplier(_contract);
 
         _contract = contract;
-        if (contract && contract->asQObject() && this->asQObject())
-            QObject::connect(contract->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setContract()));
+        if (contract && contract->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(contract->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setContract()));
 
         // Adjust subsetted properties
         if (contract) {
@@ -160,8 +158,8 @@ void QUmlInterfaceRealization::setImplementingClassifier(QUmlBehavioredClassifie
         removeClient(_implementingClassifier);
 
         _implementingClassifier = implementingClassifier;
-        if (implementingClassifier && implementingClassifier->asQObject() && this->asQObject())
-            QObject::connect(implementingClassifier->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setImplementingClassifier()));
+        if (implementingClassifier && implementingClassifier->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(implementingClassifier->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setImplementingClassifier()));
 
         // Adjust subsetted properties
         setOwner(implementingClassifier);
@@ -171,50 +169,3 @@ void QUmlInterfaceRealization::setImplementingClassifier(QUmlBehavioredClassifie
     }
 }
 
-void QUmlInterfaceRealization::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
-    _groupProperties.insert(QStringLiteral("QUmlDependency"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clients"))));
-    _groupProperties.insert(QStringLiteral("QUmlDependency"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("suppliers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAbstraction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("mapping"))));
-    _groupProperties.insert(QStringLiteral("QUmlInterfaceRealization"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("contract"))));
-    _groupProperties.insert(QStringLiteral("QUmlInterfaceRealization"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("implementingClassifier"))));
-}
-
-void QUmlInterfaceRealization::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterfaceRealization")][QStringLiteral("contract")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterfaceRealization")][QStringLiteral("contract")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInterfaceRealization");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterfaceRealization")][QStringLiteral("contract")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterfaceRealization")][QStringLiteral("contract")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterfaceRealization")][QStringLiteral("contract")][QtModeling::DocumentationRole] = QStringLiteral("References the Interface specifying the conformance contract.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterfaceRealization")][QStringLiteral("contract")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterfaceRealization")][QStringLiteral("contract")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Dependency-supplier");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterfaceRealization")][QStringLiteral("contract")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterfaceRealization")][QStringLiteral("implementingClassifier")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterfaceRealization")][QStringLiteral("implementingClassifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInterfaceRealization");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterfaceRealization")][QStringLiteral("implementingClassifier")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterfaceRealization")][QStringLiteral("implementingClassifier")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterfaceRealization")][QStringLiteral("implementingClassifier")][QtModeling::DocumentationRole] = QStringLiteral("References the BehavioredClassifier that owns this Interfacerealization (i.e., the classifier that realizes the Interface to which it points).");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterfaceRealization")][QStringLiteral("implementingClassifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterfaceRealization")][QStringLiteral("implementingClassifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner Dependency-client");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterfaceRealization")][QStringLiteral("implementingClassifier")][QtModeling::OppositeEndRole] = QStringLiteral("BehavioredClassifier-interfaceRealization");
-
-}
-
diff --git a/src/uml/qumlinterfacerealization.h b/src/uml/qumlinterfacerealization.h
index f544f53b..03abd09d 100644
--- a/src/uml/qumlinterfacerealization.h
+++ b/src/uml/qumlinterfacerealization.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlRealization>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlInterface;
 class Q_UML_EXPORT QUmlInterfaceRealization : public QUmlRealization
 {
 public:
-    explicit QUmlInterfaceRealization(bool createQObject = true);
+    explicit QUmlInterfaceRealization(bool createQModelingObject = true);
     virtual ~QUmlInterfaceRealization();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlInterface *contract() const;
@@ -72,9 +71,6 @@ public:
 protected:
     QUmlInterface *_contract;
     QUmlBehavioredClassifier *_implementingClassifier;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlinterruptibleactivityregion.cpp b/src/uml/qumlinterruptibleactivityregion.cpp
index 7825ce4b..7ff34036 100644
--- a/src/uml/qumlinterruptibleactivityregion.cpp
+++ b/src/uml/qumlinterruptibleactivityregion.cpp
@@ -61,24 +61,22 @@
 
     \brief An interruptible activity region is an activity group that supports termination of tokens flowing in the portions of an activity.
  */
-QUmlInterruptibleActivityRegion::QUmlInterruptibleActivityRegion(bool createQObject)
+QUmlInterruptibleActivityRegion::QUmlInterruptibleActivityRegion(bool createQModelingObject)
 {
-    if (createQObject)
-        _qObject = new QUmlInterruptibleActivityRegionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlInterruptibleActivityRegionObject(this));
 }
 
 QUmlInterruptibleActivityRegion::~QUmlInterruptibleActivityRegion()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlInterruptibleActivityRegion::clone() const
+QModelingElement *QUmlInterruptibleActivityRegion::clone() const
 {
     QUmlInterruptibleActivityRegion *c = new QUmlInterruptibleActivityRegion;
     foreach (QUmlComment *element, ownedComments())
@@ -116,8 +114,8 @@ void QUmlInterruptibleActivityRegion::addInterruptingEdge(QUmlActivityEdge *inte
 
     if (!_interruptingEdges.contains(interruptingEdge)) {
         _interruptingEdges.insert(interruptingEdge);
-        if (interruptingEdge && interruptingEdge->asQObject() && this->asQObject())
-            QObject::connect(interruptingEdge->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeInterruptingEdge(QObject *)));
+        if (interruptingEdge && interruptingEdge->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(interruptingEdge->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeInterruptingEdge(QObject *)));
 
         // Adjust opposite properties
         if (interruptingEdge) {
@@ -156,8 +154,8 @@ void QUmlInterruptibleActivityRegion::addNode(QUmlActivityNode *node)
 
     if (!_nodes.contains(node)) {
         _nodes.insert(node);
-        if (node && node->asQObject() && this->asQObject())
-            QObject::connect(node->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeNode(QObject *)));
+        if (node && node->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(node->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeNode(QObject *)));
 
         // Adjust subsetted properties
         addContainedNode(node);
@@ -186,47 +184,3 @@ void QUmlInterruptibleActivityRegion::removeNode(QUmlActivityNode *node)
     }
 }
 
-void QUmlInterruptibleActivityRegion::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("containedEdges"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("containedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inActivity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("subgroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superGroup"))));
-    _groupProperties.insert(QStringLiteral("QUmlInterruptibleActivityRegion"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interruptingEdges"))));
-    _groupProperties.insert(QStringLiteral("QUmlInterruptibleActivityRegion"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nodes"))));
-}
-
-void QUmlInterruptibleActivityRegion::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterruptibleActivityRegion")][QStringLiteral("interruptingEdges")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterruptibleActivityRegion")][QStringLiteral("interruptingEdges")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInterruptibleActivityRegion");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterruptibleActivityRegion")][QStringLiteral("interruptingEdges")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterruptibleActivityRegion")][QStringLiteral("interruptingEdges")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterruptibleActivityRegion")][QStringLiteral("interruptingEdges")][QtModeling::DocumentationRole] = QStringLiteral("The edges leaving the region that will abort other tokens flowing in the region.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterruptibleActivityRegion")][QStringLiteral("interruptingEdges")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterruptibleActivityRegion")][QStringLiteral("interruptingEdges")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterruptibleActivityRegion")][QStringLiteral("interruptingEdges")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityEdge-interrupts");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterruptibleActivityRegion")][QStringLiteral("nodes")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterruptibleActivityRegion")][QStringLiteral("nodes")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInterruptibleActivityRegion");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterruptibleActivityRegion")][QStringLiteral("nodes")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterruptibleActivityRegion")][QStringLiteral("nodes")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterruptibleActivityRegion")][QStringLiteral("nodes")][QtModeling::DocumentationRole] = QStringLiteral("Nodes immediately contained in the group.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterruptibleActivityRegion")][QStringLiteral("nodes")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterruptibleActivityRegion")][QStringLiteral("nodes")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("ActivityGroup-containedNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterruptibleActivityRegion")][QStringLiteral("nodes")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityNode-inInterruptibleRegion");
-
-}
-
diff --git a/src/uml/qumlinterruptibleactivityregion.h b/src/uml/qumlinterruptibleactivityregion.h
index 554644e1..9a4e2c02 100644
--- a/src/uml/qumlinterruptibleactivityregion.h
+++ b/src/uml/qumlinterruptibleactivityregion.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlActivityGroup>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlActivityNode;
 class Q_UML_EXPORT QUmlInterruptibleActivityRegion : public QUmlActivityGroup
 {
 public:
-    explicit QUmlInterruptibleActivityRegion(bool createQObject = true);
+    explicit QUmlInterruptibleActivityRegion(bool createQModelingObject = true);
     virtual ~QUmlInterruptibleActivityRegion();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlActivityEdge *> interruptingEdges() const;
@@ -74,9 +73,6 @@ public:
 protected:
     QSet<QUmlActivityEdge *> _interruptingEdges;
     QSet<QUmlActivityNode *> _nodes;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlinterval.cpp b/src/uml/qumlinterval.cpp
index 8c94b173..41e8cfd7 100644
--- a/src/uml/qumlinterval.cpp
+++ b/src/uml/qumlinterval.cpp
@@ -61,26 +61,24 @@
 
     \brief An interval defines the range between two value specifications.
  */
-QUmlInterval::QUmlInterval(bool createQObject) :
+QUmlInterval::QUmlInterval(bool createQModelingObject) :
     _max(0),
     _min(0)
 {
-    if (createQObject)
-        _qObject = new QUmlIntervalObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlIntervalObject(this));
 }
 
 QUmlInterval::~QUmlInterval()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlInterval::clone() const
+QModelingElement *QUmlInterval::clone() const
 {
     QUmlInterval *c = new QUmlInterval;
     foreach (QUmlComment *element, ownedComments())
@@ -122,8 +120,8 @@ void QUmlInterval::setMax(QUmlValueSpecification *max)
 
     if (_max != max) {
         _max = max;
-        if (max && max->asQObject() && this->asQObject())
-            QObject::connect(max->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setMax()));
+        if (max && max->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(max->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setMax()));
     }
 }
 
@@ -143,50 +141,8 @@ void QUmlInterval::setMin(QUmlValueSpecification *min)
 
     if (_min != min) {
         _min = min;
-        if (min && min->asQObject() && this->asQObject())
-            QObject::connect(min->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setMin()));
+        if (min && min->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(min->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setMin()));
     }
 }
 
-void QUmlInterval::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlInterval"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("max"))));
-    _groupProperties.insert(QStringLiteral("QUmlInterval"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("min"))));
-}
-
-void QUmlInterval::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterval")][QStringLiteral("max")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterval")][QStringLiteral("max")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInterval");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterval")][QStringLiteral("max")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterval")][QStringLiteral("max")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterval")][QStringLiteral("max")][QtModeling::DocumentationRole] = QStringLiteral("Refers to the ValueSpecification denoting the maximum value of the range.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterval")][QStringLiteral("max")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterval")][QStringLiteral("max")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterval")][QStringLiteral("max")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterval")][QStringLiteral("min")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterval")][QStringLiteral("min")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInterval");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterval")][QStringLiteral("min")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterval")][QStringLiteral("min")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterval")][QStringLiteral("min")][QtModeling::DocumentationRole] = QStringLiteral("Refers to the ValueSpecification denoting the minimum value of the range.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterval")][QStringLiteral("min")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterval")][QStringLiteral("min")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterval")][QStringLiteral("min")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlinterval.h b/src/uml/qumlinterval.h
index 1962e947..14d4644e 100644
--- a/src/uml/qumlinterval.h
+++ b/src/uml/qumlinterval.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlValueSpecification>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,10 +54,10 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlInterval : public QUmlValueSpecification
 {
 public:
-    explicit QUmlInterval(bool createQObject = true);
+    explicit QUmlInterval(bool createQModelingObject = true);
     virtual ~QUmlInterval();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlValueSpecification *max() const;
@@ -69,9 +68,6 @@ public:
 protected:
     QUmlValueSpecification *_max;
     QUmlValueSpecification *_min;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlintervalconstraint.cpp b/src/uml/qumlintervalconstraint.cpp
index d0541b1b..ec5f03e8 100644
--- a/src/uml/qumlintervalconstraint.cpp
+++ b/src/uml/qumlintervalconstraint.cpp
@@ -61,26 +61,24 @@
 
     \brief An interval constraint is a constraint that refers to an interval.
  */
-QUmlIntervalConstraint::QUmlIntervalConstraint(bool createQObject) :
+QUmlIntervalConstraint::QUmlIntervalConstraint(bool createQModelingObject) :
     QUmlConstraint(false),
     _specification(0)
 {
-    if (createQObject)
-        _qObject = new QUmlIntervalConstraintObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlIntervalConstraintObject(this));
 }
 
 QUmlIntervalConstraint::~QUmlIntervalConstraint()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlIntervalConstraint::clone() const
+QModelingElement *QUmlIntervalConstraint::clone() const
 {
     QUmlIntervalConstraint *c = new QUmlIntervalConstraint;
     foreach (QUmlComment *element, ownedComments())
@@ -122,42 +120,9 @@ void QUmlIntervalConstraint::setSpecification(QUmlInterval *specification)
 
     if (_specification != specification) {
         _specification = specification;
-        if (specification && specification->asQObject() && this->asQObject())
-            QObject::connect(specification->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setSpecification()));
-        specification->asQObject()->setParent(this->asQObject());
+        if (specification && specification->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(specification->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setSpecification()));
+        specification->asQModelingObject()->setParent(this->asQModelingObject());
     }
 }
 
-void QUmlIntervalConstraint::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlConstraint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("constrainedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlConstraint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlIntervalConstraint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("specification"))));
-}
-
-void QUmlIntervalConstraint::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlIntervalConstraint")][QStringLiteral("specification")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlIntervalConstraint")][QStringLiteral("specification")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlIntervalConstraint");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlIntervalConstraint")][QStringLiteral("specification")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlIntervalConstraint")][QStringLiteral("specification")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlIntervalConstraint")][QStringLiteral("specification")][QtModeling::DocumentationRole] = QStringLiteral("A condition that must be true when evaluated in order for the constraint to be satisfied.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlIntervalConstraint")][QStringLiteral("specification")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("Constraint-specification");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlIntervalConstraint")][QStringLiteral("specification")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlIntervalConstraint")][QStringLiteral("specification")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlintervalconstraint.h b/src/uml/qumlintervalconstraint.h
index 1a74440f..0230170f 100644
--- a/src/uml/qumlintervalconstraint.h
+++ b/src/uml/qumlintervalconstraint.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlConstraint>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlInterval;
 class Q_UML_EXPORT QUmlIntervalConstraint : public QUmlConstraint
 {
 public:
-    explicit QUmlIntervalConstraint(bool createQObject = true);
+    explicit QUmlIntervalConstraint(bool createQModelingObject = true);
     virtual ~QUmlIntervalConstraint();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlInterval *specification() const;
@@ -68,9 +67,6 @@ public:
 
 protected:
     QUmlInterval *_specification;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlinvocationaction.cpp b/src/uml/qumlinvocationaction.cpp
index 1c0e3355..d1ccabe8 100644
--- a/src/uml/qumlinvocationaction.cpp
+++ b/src/uml/qumlinvocationaction.cpp
@@ -72,15 +72,13 @@
 QUmlInvocationAction::QUmlInvocationAction() :
     _onPort(0)
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlInvocationAction::~QUmlInvocationAction()
 {
 }
 
-QModelingObject *QUmlInvocationAction::clone() const
+QModelingElement *QUmlInvocationAction::clone() const
 {
     QUmlInvocationAction *c = new QUmlInvocationAction;
     foreach (QUmlComment *element, ownedComments())
@@ -138,9 +136,9 @@ void QUmlInvocationAction::addArgument(QUmlInputPin *argument)
 
     if (!_arguments.contains(argument)) {
         _arguments.append(argument);
-        if (argument && argument->asQObject() && this->asQObject())
-            QObject::connect(argument->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeArgument(QObject *)));
-        argument->asQObject()->setParent(this->asQObject());
+        if (argument && argument->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(argument->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeArgument(QObject *)));
+        argument->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addInput(argument);
@@ -153,8 +151,8 @@ void QUmlInvocationAction::removeArgument(QUmlInputPin *argument)
 
     if (_arguments.contains(argument)) {
         _arguments.removeAll(argument);
-        if (argument->asQObject())
-            argument->asQObject()->setParent(0);
+        if (argument->asQModelingObject())
+            argument->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeInput(argument);
@@ -177,65 +175,8 @@ void QUmlInvocationAction::setOnPort(QUmlPort *onPort)
 
     if (_onPort != onPort) {
         _onPort = onPort;
-        if (onPort && onPort->asQObject() && this->asQObject())
-            QObject::connect(onPort->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setOnPort()));
+        if (onPort && onPort->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(onPort->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setOnPort()));
     }
 }
 
-void QUmlInvocationAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlInvocationAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("arguments"))));
-    _groupProperties.insert(QStringLiteral("QUmlInvocationAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("onPort"))));
-}
-
-void QUmlInvocationAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInvocationAction")][QStringLiteral("arguments")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInvocationAction")][QStringLiteral("arguments")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInvocationAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInvocationAction")][QStringLiteral("arguments")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInvocationAction")][QStringLiteral("arguments")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInvocationAction")][QStringLiteral("arguments")][QtModeling::DocumentationRole] = QStringLiteral("Specification of the ordered set of argument values that appears during execution.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInvocationAction")][QStringLiteral("arguments")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInvocationAction")][QStringLiteral("arguments")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInvocationAction")][QStringLiteral("arguments")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInvocationAction")][QStringLiteral("onPort")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInvocationAction")][QStringLiteral("onPort")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInvocationAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInvocationAction")][QStringLiteral("onPort")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInvocationAction")][QStringLiteral("onPort")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInvocationAction")][QStringLiteral("onPort")][QtModeling::DocumentationRole] = QStringLiteral("A optional port of the receiver object on which the behavioral feature is invoked.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInvocationAction")][QStringLiteral("onPort")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInvocationAction")][QStringLiteral("onPort")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlInvocationAction")][QStringLiteral("onPort")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlinvocationaction.h b/src/uml/qumlinvocationaction.h
index 18c4a882..a6db8627 100644
--- a/src/uml/qumlinvocationaction.h
+++ b/src/uml/qumlinvocationaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -60,7 +59,7 @@ class Q_UML_EXPORT QUmlInvocationAction : public QUmlAction
 public:
     virtual ~QUmlInvocationAction();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QList<QUmlInputPin *> arguments() const;
@@ -74,9 +73,6 @@ protected:
 
     QList<QUmlInputPin *> _arguments;
     QUmlPort *_onPort;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumljoinnode.cpp b/src/uml/qumljoinnode.cpp
index 1ff43f29..20ccf8c7 100644
--- a/src/uml/qumljoinnode.cpp
+++ b/src/uml/qumljoinnode.cpp
@@ -67,26 +67,24 @@
 
     \brief A join node is a control node that synchronizes multiple flows.Join nodes have a Boolean value specification using the names of the incoming edges to specify the conditions under which the join will emit a token.
  */
-QUmlJoinNode::QUmlJoinNode(bool createQObject) :
+QUmlJoinNode::QUmlJoinNode(bool createQModelingObject) :
     _isCombineDuplicate(true),
     _joinSpec(0)
 {
-    if (createQObject)
-        _qObject = new QUmlJoinNodeObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlJoinNodeObject(this));
 }
 
 QUmlJoinNode::~QUmlJoinNode()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlJoinNode::clone() const
+QModelingElement *QUmlJoinNode::clone() const
 {
     QUmlJoinNode *c = new QUmlJoinNode;
     foreach (QUmlComment *element, ownedComments())
@@ -136,7 +134,7 @@ void QUmlJoinNode::setCombineDuplicate(bool isCombineDuplicate)
 
     if (_isCombineDuplicate != isCombineDuplicate) {
         _isCombineDuplicate = isCombineDuplicate;
-        _modifiedResettableProperties << QStringLiteral("isCombineDuplicate");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isCombineDuplicate");
     }
 }
 
@@ -159,9 +157,9 @@ void QUmlJoinNode::setJoinSpec(QUmlValueSpecification *joinSpec)
         removeOwnedElement(_joinSpec);
 
         _joinSpec = joinSpec;
-        if (joinSpec && joinSpec->asQObject() && this->asQObject())
-            QObject::connect(joinSpec->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setJoinSpec()));
-        joinSpec->asQObject()->setParent(this->asQObject());
+        if (joinSpec && joinSpec->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(joinSpec->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setJoinSpec()));
+        joinSpec->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (joinSpec) {
@@ -170,53 +168,3 @@ void QUmlJoinNode::setJoinSpec(QUmlValueSpecification *joinSpec)
     }
 }
 
-void QUmlJoinNode::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlJoinNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isCombineDuplicate"))));
-    _groupProperties.insert(QStringLiteral("QUmlJoinNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("joinSpec"))));
-}
-
-void QUmlJoinNode::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlJoinNode")][QStringLiteral("isCombineDuplicate")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlJoinNode")][QStringLiteral("isCombineDuplicate")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlJoinNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlJoinNode")][QStringLiteral("isCombineDuplicate")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlJoinNode")][QStringLiteral("isCombineDuplicate")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlJoinNode")][QStringLiteral("isCombineDuplicate")][QtModeling::DocumentationRole] = QStringLiteral("Tells whether tokens having objects with the same identity are combined into one by the join.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlJoinNode")][QStringLiteral("isCombineDuplicate")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlJoinNode")][QStringLiteral("isCombineDuplicate")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlJoinNode")][QStringLiteral("isCombineDuplicate")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlJoinNode")][QStringLiteral("joinSpec")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlJoinNode")][QStringLiteral("joinSpec")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlJoinNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlJoinNode")][QStringLiteral("joinSpec")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlJoinNode")][QStringLiteral("joinSpec")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlJoinNode")][QStringLiteral("joinSpec")][QtModeling::DocumentationRole] = QStringLiteral("A specification giving the conditions under which the join with emit a token. Default is 'and'.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlJoinNode")][QStringLiteral("joinSpec")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlJoinNode")][QStringLiteral("joinSpec")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlJoinNode")][QStringLiteral("joinSpec")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumljoinnode.h b/src/uml/qumljoinnode.h
index 603455d1..f3075de0 100644
--- a/src/uml/qumljoinnode.h
+++ b/src/uml/qumljoinnode.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlControlNode>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlValueSpecification;
 class Q_UML_EXPORT QUmlJoinNode : public QUmlControlNode
 {
 public:
-    explicit QUmlJoinNode(bool createQObject = true);
+    explicit QUmlJoinNode(bool createQModelingObject = true);
     virtual ~QUmlJoinNode();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     bool isCombineDuplicate() const;
@@ -71,9 +70,6 @@ public:
 protected:
     bool _isCombineDuplicate;
     QUmlValueSpecification *_joinSpec;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumllifeline.cpp b/src/uml/qumllifeline.cpp
index 520d38fd..2841fc23 100644
--- a/src/uml/qumllifeline.cpp
+++ b/src/uml/qumllifeline.cpp
@@ -62,28 +62,26 @@
 
     \brief A lifeline represents an individual participant in the interaction. While parts and structural features may have multiplicity greater than 1, lifelines represent only one interacting entity.
  */
-QUmlLifeline::QUmlLifeline(bool createQObject) :
+QUmlLifeline::QUmlLifeline(bool createQModelingObject) :
     _decomposedAs(0),
     _interaction(0),
     _represents(0),
     _selector(0)
 {
-    if (createQObject)
-        _qObject = new QUmlLifelineObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlLifelineObject(this));
 }
 
 QUmlLifeline::~QUmlLifeline()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlLifeline::clone() const
+QModelingElement *QUmlLifeline::clone() const
 {
     QUmlLifeline *c = new QUmlLifeline;
     foreach (QUmlComment *element, ownedComments())
@@ -125,8 +123,8 @@ void QUmlLifeline::addCoveredBy(QUmlInteractionFragment *coveredBy)
 
     if (!_coveredBy.contains(coveredBy)) {
         _coveredBy.insert(coveredBy);
-        if (coveredBy && coveredBy->asQObject() && this->asQObject())
-            QObject::connect(coveredBy->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeCoveredBy(QObject *)));
+        if (coveredBy && coveredBy->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(coveredBy->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeCoveredBy(QObject *)));
 
         // Adjust opposite properties
         if (coveredBy) {
@@ -165,8 +163,8 @@ void QUmlLifeline::setDecomposedAs(QUmlPartDecomposition *decomposedAs)
 
     if (_decomposedAs != decomposedAs) {
         _decomposedAs = decomposedAs;
-        if (decomposedAs && decomposedAs->asQObject() && this->asQObject())
-            QObject::connect(decomposedAs->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setDecomposedAs()));
+        if (decomposedAs && decomposedAs->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(decomposedAs->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setDecomposedAs()));
     }
 }
 
@@ -188,8 +186,8 @@ void QUmlLifeline::setInteraction(QUmlInteraction *interaction)
         // Adjust subsetted properties
 
         _interaction = interaction;
-        if (interaction && interaction->asQObject() && this->asQObject())
-            QObject::connect(interaction->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setInteraction()));
+        if (interaction && interaction->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(interaction->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setInteraction()));
 
         // Adjust subsetted properties
         setNamespace(interaction);
@@ -212,8 +210,8 @@ void QUmlLifeline::setRepresents(QUmlConnectableElement *represents)
 
     if (_represents != represents) {
         _represents = represents;
-        if (represents && represents->asQObject() && this->asQObject())
-            QObject::connect(represents->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setRepresents()));
+        if (represents && represents->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(represents->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setRepresents()));
     }
 }
 
@@ -236,9 +234,9 @@ void QUmlLifeline::setSelector(QUmlValueSpecification *selector)
         removeOwnedElement(_selector);
 
         _selector = selector;
-        if (selector && selector->asQObject() && this->asQObject())
-            QObject::connect(selector->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setSelector()));
-        selector->asQObject()->setParent(this->asQObject());
+        if (selector && selector->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(selector->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setSelector()));
+        selector->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (selector) {
@@ -247,72 +245,3 @@ void QUmlLifeline::setSelector(QUmlValueSpecification *selector)
     }
 }
 
-void QUmlLifeline::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlLifeline"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("coveredBy"))));
-    _groupProperties.insert(QStringLiteral("QUmlLifeline"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("decomposedAs"))));
-    _groupProperties.insert(QStringLiteral("QUmlLifeline"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interaction"))));
-    _groupProperties.insert(QStringLiteral("QUmlLifeline"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("represents"))));
-    _groupProperties.insert(QStringLiteral("QUmlLifeline"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("selector"))));
-}
-
-void QUmlLifeline::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("coveredBy")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("coveredBy")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLifeline");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("coveredBy")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("coveredBy")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("coveredBy")][QtModeling::DocumentationRole] = QStringLiteral("References the InteractionFragments in which this Lifeline takes part.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("coveredBy")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("coveredBy")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("coveredBy")][QtModeling::OppositeEndRole] = QStringLiteral("InteractionFragment-covered");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("decomposedAs")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("decomposedAs")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLifeline");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("decomposedAs")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("decomposedAs")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("decomposedAs")][QtModeling::DocumentationRole] = QStringLiteral("References the Interaction that represents the decomposition.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("decomposedAs")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("decomposedAs")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("decomposedAs")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("interaction")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("interaction")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLifeline");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("interaction")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("interaction")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("interaction")][QtModeling::DocumentationRole] = QStringLiteral("References the Interaction enclosing this Lifeline.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("interaction")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("interaction")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("interaction")][QtModeling::OppositeEndRole] = QStringLiteral("Interaction-lifeline");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("represents")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("represents")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLifeline");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("represents")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("represents")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("represents")][QtModeling::DocumentationRole] = QStringLiteral("References the ConnectableElement within the classifier that contains the enclosing interaction.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("represents")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("represents")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("represents")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("selector")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("selector")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLifeline");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("selector")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("selector")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("selector")][QtModeling::DocumentationRole] = QStringLiteral("If the referenced ConnectableElement is multivalued, then this specifies the specific individual part within that set.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("selector")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("selector")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLifeline")][QStringLiteral("selector")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumllifeline.h b/src/uml/qumllifeline.h
index 5a47e360..d907254d 100644
--- a/src/uml/qumllifeline.h
+++ b/src/uml/qumllifeline.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlNamedElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -61,10 +60,10 @@ class QUmlValueSpecification;
 class Q_UML_EXPORT QUmlLifeline : public QUmlNamedElement
 {
 public:
-    explicit QUmlLifeline(bool createQObject = true);
+    explicit QUmlLifeline(bool createQModelingObject = true);
     virtual ~QUmlLifeline();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlInteractionFragment *> coveredBy() const;
@@ -85,9 +84,6 @@ protected:
     QUmlInteraction *_interaction;
     QUmlConnectableElement *_represents;
     QUmlValueSpecification *_selector;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumllinkaction.cpp b/src/uml/qumllinkaction.cpp
index 3b8cc844..2efb7607 100644
--- a/src/uml/qumllinkaction.cpp
+++ b/src/uml/qumllinkaction.cpp
@@ -72,15 +72,13 @@
  */
 QUmlLinkAction::QUmlLinkAction()
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlLinkAction::~QUmlLinkAction()
 {
 }
 
-QModelingObject *QUmlLinkAction::clone() const
+QModelingElement *QUmlLinkAction::clone() const
 {
     QUmlLinkAction *c = new QUmlLinkAction;
     foreach (QUmlComment *element, ownedComments())
@@ -138,9 +136,9 @@ void QUmlLinkAction::addEndData(QUmlLinkEndData *endData)
 
     if (!_endData.contains(endData)) {
         _endData.insert(endData);
-        if (endData && endData->asQObject() && this->asQObject())
-            QObject::connect(endData->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeEndData(QObject *)));
-        endData->asQObject()->setParent(this->asQObject());
+        if (endData && endData->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(endData->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeEndData(QObject *)));
+        endData->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(endData);
@@ -153,8 +151,8 @@ void QUmlLinkAction::removeEndData(QUmlLinkEndData *endData)
 
     if (_endData.contains(endData)) {
         _endData.remove(endData);
-        if (endData->asQObject())
-            endData->asQObject()->setParent(0);
+        if (endData->asQModelingObject())
+            endData->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(endData);
@@ -177,9 +175,9 @@ void QUmlLinkAction::addInputValue(QUmlInputPin *inputValue)
 
     if (!_inputValues.contains(inputValue)) {
         _inputValues.insert(inputValue);
-        if (inputValue && inputValue->asQObject() && this->asQObject())
-            QObject::connect(inputValue->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeInputValue(QObject *)));
-        inputValue->asQObject()->setParent(this->asQObject());
+        if (inputValue && inputValue->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(inputValue->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeInputValue(QObject *)));
+        inputValue->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addInput(inputValue);
@@ -192,8 +190,8 @@ void QUmlLinkAction::removeInputValue(QUmlInputPin *inputValue)
 
     if (_inputValues.contains(inputValue)) {
         _inputValues.remove(inputValue);
-        if (inputValue->asQObject())
-            inputValue->asQObject()->setParent(0);
+        if (inputValue->asQModelingObject())
+            inputValue->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeInput(inputValue);
@@ -212,60 +210,3 @@ QUmlAssociation *QUmlLinkAction::association() const
     return 0;
 }
 
-void QUmlLinkAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlLinkAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("endData"))));
-    _groupProperties.insert(QStringLiteral("QUmlLinkAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputValues"))));
-}
-
-void QUmlLinkAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkAction")][QStringLiteral("endData")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkAction")][QStringLiteral("endData")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLinkAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkAction")][QStringLiteral("endData")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkAction")][QStringLiteral("endData")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkAction")][QStringLiteral("endData")][QtModeling::DocumentationRole] = QStringLiteral("Data identifying one end of a link by the objects on its ends and qualifiers.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkAction")][QStringLiteral("endData")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkAction")][QStringLiteral("endData")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkAction")][QStringLiteral("endData")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkAction")][QStringLiteral("inputValues")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkAction")][QStringLiteral("inputValues")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLinkAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkAction")][QStringLiteral("inputValues")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkAction")][QStringLiteral("inputValues")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkAction")][QStringLiteral("inputValues")][QtModeling::DocumentationRole] = QStringLiteral("Pins taking end objects and qualifier values as input.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkAction")][QStringLiteral("inputValues")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkAction")][QStringLiteral("inputValues")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkAction")][QStringLiteral("inputValues")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumllinkaction.h b/src/uml/qumllinkaction.h
index 324c1dab..53fcb17a 100644
--- a/src/uml/qumllinkaction.h
+++ b/src/uml/qumllinkaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -61,7 +60,7 @@ class Q_UML_EXPORT QUmlLinkAction : public QUmlAction
 public:
     virtual ~QUmlLinkAction();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlLinkEndData *> endData() const;
@@ -79,9 +78,6 @@ protected:
 
     QSet<QUmlLinkEndData *> _endData;
     QSet<QUmlInputPin *> _inputValues;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumllinkendcreationdata.cpp b/src/uml/qumllinkendcreationdata.cpp
index 4c1e5f86..60451d9f 100644
--- a/src/uml/qumllinkendcreationdata.cpp
+++ b/src/uml/qumllinkendcreationdata.cpp
@@ -55,27 +55,25 @@
 
     \brief A link end creation data is not an action. It is an element that identifies links. It identifies one end of a link to be created by a create link action.
  */
-QUmlLinkEndCreationData::QUmlLinkEndCreationData(bool createQObject) :
+QUmlLinkEndCreationData::QUmlLinkEndCreationData(bool createQModelingObject) :
     QUmlLinkEndData(false),
     _insertAt(0),
     _isReplaceAll(false)
 {
-    if (createQObject)
-        _qObject = new QUmlLinkEndCreationDataObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlLinkEndCreationDataObject(this));
 }
 
 QUmlLinkEndCreationData::~QUmlLinkEndCreationData()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlLinkEndCreationData::clone() const
+QModelingElement *QUmlLinkEndCreationData::clone() const
 {
     QUmlLinkEndCreationData *c = new QUmlLinkEndCreationData;
     foreach (QUmlComment *element, ownedComments())
@@ -110,8 +108,8 @@ void QUmlLinkEndCreationData::setInsertAt(QUmlInputPin *insertAt)
 
     if (_insertAt != insertAt) {
         _insertAt = insertAt;
-        if (insertAt && insertAt->asQObject() && this->asQObject())
-            QObject::connect(insertAt->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setInsertAt()));
+        if (insertAt && insertAt->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(insertAt->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setInsertAt()));
     }
 }
 
@@ -131,43 +129,7 @@ void QUmlLinkEndCreationData::setReplaceAll(bool isReplaceAll)
 
     if (_isReplaceAll != isReplaceAll) {
         _isReplaceAll = isReplaceAll;
-        _modifiedResettableProperties << QStringLiteral("isReplaceAll");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isReplaceAll");
     }
 }
 
-void QUmlLinkEndCreationData::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlLinkEndData"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("end"))));
-    _groupProperties.insert(QStringLiteral("QUmlLinkEndData"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlLinkEndData"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("value"))));
-    _groupProperties.insert(QStringLiteral("QUmlLinkEndCreationData"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("insertAt"))));
-    _groupProperties.insert(QStringLiteral("QUmlLinkEndCreationData"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isReplaceAll"))));
-}
-
-void QUmlLinkEndCreationData::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndCreationData")][QStringLiteral("insertAt")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndCreationData")][QStringLiteral("insertAt")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLinkEndCreationData");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndCreationData")][QStringLiteral("insertAt")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndCreationData")][QStringLiteral("insertAt")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndCreationData")][QStringLiteral("insertAt")][QtModeling::DocumentationRole] = QStringLiteral("Specifies where the new link should be inserted for ordered association ends, or where an existing link should be moved to. The type of the input is UnlimitedNatural, but the input cannot be zero. This pin is omitted for association ends that are not ordered.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndCreationData")][QStringLiteral("insertAt")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndCreationData")][QStringLiteral("insertAt")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndCreationData")][QStringLiteral("insertAt")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndCreationData")][QStringLiteral("isReplaceAll")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndCreationData")][QStringLiteral("isReplaceAll")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLinkEndCreationData");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndCreationData")][QStringLiteral("isReplaceAll")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndCreationData")][QStringLiteral("isReplaceAll")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndCreationData")][QStringLiteral("isReplaceAll")][QtModeling::DocumentationRole] = QStringLiteral("Specifies whether the existing links emanating from the object on this end should be destroyed before creating a new link.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndCreationData")][QStringLiteral("isReplaceAll")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndCreationData")][QStringLiteral("isReplaceAll")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndCreationData")][QStringLiteral("isReplaceAll")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumllinkendcreationdata.h b/src/uml/qumllinkendcreationdata.h
index aa5fc22e..4179590e 100644
--- a/src/uml/qumllinkendcreationdata.h
+++ b/src/uml/qumllinkendcreationdata.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlLinkEndData>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlInputPin;
 class Q_UML_EXPORT QUmlLinkEndCreationData : public QUmlLinkEndData
 {
 public:
-    explicit QUmlLinkEndCreationData(bool createQObject = true);
+    explicit QUmlLinkEndCreationData(bool createQModelingObject = true);
     virtual ~QUmlLinkEndCreationData();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlInputPin *insertAt() const;
@@ -71,9 +70,6 @@ public:
 protected:
     QUmlInputPin *_insertAt;
     bool _isReplaceAll;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumllinkenddata.cpp b/src/uml/qumllinkenddata.cpp
index 4ea86fbe..2e98633d 100644
--- a/src/uml/qumllinkenddata.cpp
+++ b/src/uml/qumllinkenddata.cpp
@@ -55,26 +55,24 @@
 
     \brief A link end data is not an action. It is an element that identifies links. It identifies one end of a link to be read or written by the children of a link action. A link cannot be passed as a runtime value to or from an action. Instead, a link is identified by its end objects and qualifier values, if any. This requires more than one piece of data, namely, the statically-specified end in the user model, the object on the end, and the qualifier values for that end, if any. These pieces are brought together around a link end data. Each association end is identified separately with an instance of the LinkEndData class.
  */
-QUmlLinkEndData::QUmlLinkEndData(bool createQObject) :
+QUmlLinkEndData::QUmlLinkEndData(bool createQModelingObject) :
     _end(0),
     _value(0)
 {
-    if (createQObject)
-        _qObject = new QUmlLinkEndDataObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlLinkEndDataObject(this));
 }
 
 QUmlLinkEndData::~QUmlLinkEndData()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlLinkEndData::clone() const
+QModelingElement *QUmlLinkEndData::clone() const
 {
     QUmlLinkEndData *c = new QUmlLinkEndData;
     foreach (QUmlComment *element, ownedComments())
@@ -106,8 +104,8 @@ void QUmlLinkEndData::setEnd(QUmlProperty *end)
 
     if (_end != end) {
         _end = end;
-        if (end && end->asQObject() && this->asQObject())
-            QObject::connect(end->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setEnd()));
+        if (end && end->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(end->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setEnd()));
     }
 }
 
@@ -127,9 +125,9 @@ void QUmlLinkEndData::addQualifier(QUmlQualifierValue *qualifier)
 
     if (!_qualifiers.contains(qualifier)) {
         _qualifiers.insert(qualifier);
-        if (qualifier && qualifier->asQObject() && this->asQObject())
-            QObject::connect(qualifier->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeQualifier(QObject *)));
-        qualifier->asQObject()->setParent(this->asQObject());
+        if (qualifier && qualifier->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(qualifier->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeQualifier(QObject *)));
+        qualifier->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(qualifier);
@@ -142,8 +140,8 @@ void QUmlLinkEndData::removeQualifier(QUmlQualifierValue *qualifier)
 
     if (_qualifiers.contains(qualifier)) {
         _qualifiers.remove(qualifier);
-        if (qualifier->asQObject())
-            qualifier->asQObject()->setParent(0);
+        if (qualifier->asQModelingObject())
+            qualifier->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(qualifier);
@@ -166,51 +164,8 @@ void QUmlLinkEndData::setValue(QUmlInputPin *value)
 
     if (_value != value) {
         _value = value;
-        if (value && value->asQObject() && this->asQObject())
-            QObject::connect(value->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setValue()));
+        if (value && value->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(value->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setValue()));
     }
 }
 
-void QUmlLinkEndData::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlLinkEndData"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("end"))));
-    _groupProperties.insert(QStringLiteral("QUmlLinkEndData"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlLinkEndData"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("value"))));
-}
-
-void QUmlLinkEndData::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndData")][QStringLiteral("end")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndData")][QStringLiteral("end")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLinkEndData");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndData")][QStringLiteral("end")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndData")][QStringLiteral("end")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndData")][QStringLiteral("end")][QtModeling::DocumentationRole] = QStringLiteral("Association end for which this link-end data specifies values.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndData")][QStringLiteral("end")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndData")][QStringLiteral("end")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndData")][QStringLiteral("end")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndData")][QStringLiteral("qualifiers")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndData")][QStringLiteral("qualifiers")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLinkEndData");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndData")][QStringLiteral("qualifiers")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndData")][QStringLiteral("qualifiers")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndData")][QStringLiteral("qualifiers")][QtModeling::DocumentationRole] = QStringLiteral("List of qualifier values");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndData")][QStringLiteral("qualifiers")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndData")][QStringLiteral("qualifiers")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndData")][QStringLiteral("qualifiers")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndData")][QStringLiteral("value")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndData")][QStringLiteral("value")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLinkEndData");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndData")][QStringLiteral("value")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndData")][QStringLiteral("value")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndData")][QStringLiteral("value")][QtModeling::DocumentationRole] = QStringLiteral("Input pin that provides the specified object for the given end. This pin is omitted if the link-end data specifies an 'open' end for reading.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndData")][QStringLiteral("value")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndData")][QStringLiteral("value")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndData")][QStringLiteral("value")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumllinkenddata.h b/src/uml/qumllinkenddata.h
index 20d2bb6e..0e5d1c6e 100644
--- a/src/uml/qumllinkenddata.h
+++ b/src/uml/qumllinkenddata.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -59,10 +58,10 @@ class QUmlQualifierValue;
 class Q_UML_EXPORT QUmlLinkEndData : public QUmlElement
 {
 public:
-    explicit QUmlLinkEndData(bool createQObject = true);
+    explicit QUmlLinkEndData(bool createQModelingObject = true);
     virtual ~QUmlLinkEndData();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlProperty *end() const;
@@ -77,9 +76,6 @@ protected:
     QUmlProperty *_end;
     QSet<QUmlQualifierValue *> _qualifiers;
     QUmlInputPin *_value;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumllinkenddestructiondata.cpp b/src/uml/qumllinkenddestructiondata.cpp
index 7d0e4fdb..a70a42c7 100644
--- a/src/uml/qumllinkenddestructiondata.cpp
+++ b/src/uml/qumllinkenddestructiondata.cpp
@@ -55,27 +55,25 @@
 
     \brief A link end destruction data is not an action. It is an element that identifies links. It identifies one end of a link to be destroyed by destroy link action.
  */
-QUmlLinkEndDestructionData::QUmlLinkEndDestructionData(bool createQObject) :
+QUmlLinkEndDestructionData::QUmlLinkEndDestructionData(bool createQModelingObject) :
     QUmlLinkEndData(false),
     _destroyAt(0),
     _isDestroyDuplicates(false)
 {
-    if (createQObject)
-        _qObject = new QUmlLinkEndDestructionDataObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlLinkEndDestructionDataObject(this));
 }
 
 QUmlLinkEndDestructionData::~QUmlLinkEndDestructionData()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlLinkEndDestructionData::clone() const
+QModelingElement *QUmlLinkEndDestructionData::clone() const
 {
     QUmlLinkEndDestructionData *c = new QUmlLinkEndDestructionData;
     foreach (QUmlComment *element, ownedComments())
@@ -110,8 +108,8 @@ void QUmlLinkEndDestructionData::setDestroyAt(QUmlInputPin *destroyAt)
 
     if (_destroyAt != destroyAt) {
         _destroyAt = destroyAt;
-        if (destroyAt && destroyAt->asQObject() && this->asQObject())
-            QObject::connect(destroyAt->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setDestroyAt()));
+        if (destroyAt && destroyAt->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(destroyAt->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setDestroyAt()));
     }
 }
 
@@ -131,43 +129,7 @@ void QUmlLinkEndDestructionData::setDestroyDuplicates(bool isDestroyDuplicates)
 
     if (_isDestroyDuplicates != isDestroyDuplicates) {
         _isDestroyDuplicates = isDestroyDuplicates;
-        _modifiedResettableProperties << QStringLiteral("isDestroyDuplicates");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isDestroyDuplicates");
     }
 }
 
-void QUmlLinkEndDestructionData::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlLinkEndData"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("end"))));
-    _groupProperties.insert(QStringLiteral("QUmlLinkEndData"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlLinkEndData"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("value"))));
-    _groupProperties.insert(QStringLiteral("QUmlLinkEndDestructionData"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("destroyAt"))));
-    _groupProperties.insert(QStringLiteral("QUmlLinkEndDestructionData"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isDestroyDuplicates"))));
-}
-
-void QUmlLinkEndDestructionData::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndDestructionData")][QStringLiteral("destroyAt")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndDestructionData")][QStringLiteral("destroyAt")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLinkEndDestructionData");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndDestructionData")][QStringLiteral("destroyAt")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndDestructionData")][QStringLiteral("destroyAt")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndDestructionData")][QStringLiteral("destroyAt")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the position of an existing link to be destroyed in ordered nonunique association ends. The type of the pin is UnlimitedNatural, but the value cannot be zero or unlimited.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndDestructionData")][QStringLiteral("destroyAt")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndDestructionData")][QStringLiteral("destroyAt")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndDestructionData")][QStringLiteral("destroyAt")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndDestructionData")][QStringLiteral("isDestroyDuplicates")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndDestructionData")][QStringLiteral("isDestroyDuplicates")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLinkEndDestructionData");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndDestructionData")][QStringLiteral("isDestroyDuplicates")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndDestructionData")][QStringLiteral("isDestroyDuplicates")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndDestructionData")][QStringLiteral("isDestroyDuplicates")][QtModeling::DocumentationRole] = QStringLiteral("Specifies whether to destroy duplicates of the value in nonunique association ends.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndDestructionData")][QStringLiteral("isDestroyDuplicates")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndDestructionData")][QStringLiteral("isDestroyDuplicates")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndDestructionData")][QStringLiteral("isDestroyDuplicates")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumllinkenddestructiondata.h b/src/uml/qumllinkenddestructiondata.h
index 3adeb47d..81dba619 100644
--- a/src/uml/qumllinkenddestructiondata.h
+++ b/src/uml/qumllinkenddestructiondata.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlLinkEndData>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlInputPin;
 class Q_UML_EXPORT QUmlLinkEndDestructionData : public QUmlLinkEndData
 {
 public:
-    explicit QUmlLinkEndDestructionData(bool createQObject = true);
+    explicit QUmlLinkEndDestructionData(bool createQModelingObject = true);
     virtual ~QUmlLinkEndDestructionData();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlInputPin *destroyAt() const;
@@ -71,9 +70,6 @@ public:
 protected:
     QUmlInputPin *_destroyAt;
     bool _isDestroyDuplicates;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlliteralboolean.cpp b/src/uml/qumlliteralboolean.cpp
index 55e0b441..42084b5e 100644
--- a/src/uml/qumlliteralboolean.cpp
+++ b/src/uml/qumlliteralboolean.cpp
@@ -60,25 +60,23 @@
 
     \brief A literal Boolean is a specification of a Boolean value.
  */
-QUmlLiteralBoolean::QUmlLiteralBoolean(bool createQObject) :
+QUmlLiteralBoolean::QUmlLiteralBoolean(bool createQModelingObject) :
     _value(false)
 {
-    if (createQObject)
-        _qObject = new QUmlLiteralBooleanObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlLiteralBooleanObject(this));
 }
 
 QUmlLiteralBoolean::~QUmlLiteralBoolean()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlLiteralBoolean::clone() const
+QModelingElement *QUmlLiteralBoolean::clone() const
 {
     QUmlLiteralBoolean *c = new QUmlLiteralBoolean;
     foreach (QUmlComment *element, ownedComments())
@@ -117,7 +115,7 @@ void QUmlLiteralBoolean::setValue(bool value)
 
     if (_value != value) {
         _value = value;
-        _modifiedResettableProperties << QStringLiteral("value");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("value");
     }
 }
 
@@ -143,35 +141,3 @@ bool QUmlLiteralBoolean::isComputable() const
     return bool ();
 }
 
-void QUmlLiteralBoolean::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlLiteralBoolean"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("value"))));
-}
-
-void QUmlLiteralBoolean::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralBoolean")][QStringLiteral("value")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralBoolean")][QStringLiteral("value")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLiteralBoolean");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralBoolean")][QStringLiteral("value")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralBoolean")][QStringLiteral("value")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralBoolean")][QStringLiteral("value")][QtModeling::DocumentationRole] = QStringLiteral("The specified Boolean value.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralBoolean")][QStringLiteral("value")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralBoolean")][QStringLiteral("value")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralBoolean")][QStringLiteral("value")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlliteralboolean.h b/src/uml/qumlliteralboolean.h
index 261c5c04..3e9d3050 100644
--- a/src/uml/qumlliteralboolean.h
+++ b/src/uml/qumlliteralboolean.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlLiteralSpecification>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,10 +54,10 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlLiteralBoolean : public QUmlLiteralSpecification
 {
 public:
-    explicit QUmlLiteralBoolean(bool createQObject = true);
+    explicit QUmlLiteralBoolean(bool createQModelingObject = true);
     virtual ~QUmlLiteralBoolean();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     bool value() const;
@@ -70,9 +69,6 @@ public:
 
 protected:
     bool _value;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlliteralinteger.cpp b/src/uml/qumlliteralinteger.cpp
index 8c55a3d7..0c56f372 100644
--- a/src/uml/qumlliteralinteger.cpp
+++ b/src/uml/qumlliteralinteger.cpp
@@ -60,25 +60,23 @@
 
     \brief A literal integer is a specification of an integer value.
  */
-QUmlLiteralInteger::QUmlLiteralInteger(bool createQObject) :
+QUmlLiteralInteger::QUmlLiteralInteger(bool createQModelingObject) :
     _value(0)
 {
-    if (createQObject)
-        _qObject = new QUmlLiteralIntegerObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlLiteralIntegerObject(this));
 }
 
 QUmlLiteralInteger::~QUmlLiteralInteger()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlLiteralInteger::clone() const
+QModelingElement *QUmlLiteralInteger::clone() const
 {
     QUmlLiteralInteger *c = new QUmlLiteralInteger;
     foreach (QUmlComment *element, ownedComments())
@@ -117,7 +115,7 @@ void QUmlLiteralInteger::setValue(int value)
 
     if (_value != value) {
         _value = value;
-        _modifiedResettableProperties << QStringLiteral("value");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("value");
     }
 }
 
@@ -143,35 +141,3 @@ bool QUmlLiteralInteger::isComputable() const
     return bool ();
 }
 
-void QUmlLiteralInteger::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlLiteralInteger"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("value"))));
-}
-
-void QUmlLiteralInteger::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralInteger")][QStringLiteral("value")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralInteger")][QStringLiteral("value")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLiteralInteger");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralInteger")][QStringLiteral("value")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralInteger")][QStringLiteral("value")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralInteger")][QStringLiteral("value")][QtModeling::DocumentationRole] = QStringLiteral("The specified Integer value.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralInteger")][QStringLiteral("value")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralInteger")][QStringLiteral("value")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralInteger")][QStringLiteral("value")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlliteralinteger.h b/src/uml/qumlliteralinteger.h
index 911855ea..2f345c57 100644
--- a/src/uml/qumlliteralinteger.h
+++ b/src/uml/qumlliteralinteger.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlLiteralSpecification>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,10 +54,10 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlLiteralInteger : public QUmlLiteralSpecification
 {
 public:
-    explicit QUmlLiteralInteger(bool createQObject = true);
+    explicit QUmlLiteralInteger(bool createQModelingObject = true);
     virtual ~QUmlLiteralInteger();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     int value() const;
@@ -70,9 +69,6 @@ public:
 
 protected:
     int _value;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlliteralnull.cpp b/src/uml/qumlliteralnull.cpp
index edcd5e34..d6404b00 100644
--- a/src/uml/qumlliteralnull.cpp
+++ b/src/uml/qumlliteralnull.cpp
@@ -60,24 +60,22 @@
 
     \brief A literal null specifies the lack of a value.
  */
-QUmlLiteralNull::QUmlLiteralNull(bool createQObject)
+QUmlLiteralNull::QUmlLiteralNull(bool createQModelingObject)
 {
-    if (createQObject)
-        _qObject = new QUmlLiteralNullObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlLiteralNullObject(this));
 }
 
 QUmlLiteralNull::~QUmlLiteralNull()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlLiteralNull::clone() const
+QModelingElement *QUmlLiteralNull::clone() const
 {
     QUmlLiteralNull *c = new QUmlLiteralNull;
     foreach (QUmlComment *element, ownedComments())
@@ -119,25 +117,3 @@ bool QUmlLiteralNull::isNull() const
     return bool ();
 }
 
-void QUmlLiteralNull::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-}
-
-void QUmlLiteralNull::setPropertyData()
-{
-}
-
diff --git a/src/uml/qumlliteralnull.h b/src/uml/qumlliteralnull.h
index 0e05828f..815c1d6b 100644
--- a/src/uml/qumlliteralnull.h
+++ b/src/uml/qumlliteralnull.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlLiteralSpecification>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,10 +54,10 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlLiteralNull : public QUmlLiteralSpecification
 {
 public:
-    explicit QUmlLiteralNull(bool createQObject = true);
+    explicit QUmlLiteralNull(bool createQModelingObject = true);
     virtual ~QUmlLiteralNull();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
 
     // Operations
@@ -66,9 +65,6 @@ public:
     bool isNull() const;
 
 protected:
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlliteralreal.cpp b/src/uml/qumlliteralreal.cpp
index 31bb17ae..8764c0ee 100644
--- a/src/uml/qumlliteralreal.cpp
+++ b/src/uml/qumlliteralreal.cpp
@@ -60,24 +60,22 @@
 
     \brief A literal real is a specification of a real value.
  */
-QUmlLiteralReal::QUmlLiteralReal(bool createQObject)
+QUmlLiteralReal::QUmlLiteralReal(bool createQModelingObject)
 {
-    if (createQObject)
-        _qObject = new QUmlLiteralRealObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlLiteralRealObject(this));
 }
 
 QUmlLiteralReal::~QUmlLiteralReal()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlLiteralReal::clone() const
+QModelingElement *QUmlLiteralReal::clone() const
 {
     QUmlLiteralReal *c = new QUmlLiteralReal;
     foreach (QUmlComment *element, ownedComments())
@@ -138,35 +136,3 @@ double QUmlLiteralReal::realValue() const
     return double ();
 }
 
-void QUmlLiteralReal::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlLiteralReal"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("value"))));
-}
-
-void QUmlLiteralReal::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralReal")][QStringLiteral("value")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralReal")][QStringLiteral("value")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLiteralReal");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralReal")][QStringLiteral("value")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralReal")][QStringLiteral("value")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralReal")][QStringLiteral("value")][QtModeling::DocumentationRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralReal")][QStringLiteral("value")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralReal")][QStringLiteral("value")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralReal")][QStringLiteral("value")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlliteralreal.h b/src/uml/qumlliteralreal.h
index 5cc87b28..27478ed9 100644
--- a/src/uml/qumlliteralreal.h
+++ b/src/uml/qumlliteralreal.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlLiteralSpecification>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,10 +54,10 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlLiteralReal : public QUmlLiteralSpecification
 {
 public:
-    explicit QUmlLiteralReal(bool createQObject = true);
+    explicit QUmlLiteralReal(bool createQModelingObject = true);
     virtual ~QUmlLiteralReal();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     double value() const;
@@ -70,9 +69,6 @@ public:
 
 protected:
     double _value;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlliteralspecification.cpp b/src/uml/qumlliteralspecification.cpp
index f7a51278..f4f350f9 100644
--- a/src/uml/qumlliteralspecification.cpp
+++ b/src/uml/qumlliteralspecification.cpp
@@ -60,15 +60,13 @@
  */
 QUmlLiteralSpecification::QUmlLiteralSpecification()
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlLiteralSpecification::~QUmlLiteralSpecification()
 {
 }
 
-QModelingObject *QUmlLiteralSpecification::clone() const
+QModelingElement *QUmlLiteralSpecification::clone() const
 {
     QUmlLiteralSpecification *c = new QUmlLiteralSpecification;
     foreach (QUmlComment *element, ownedComments())
@@ -88,25 +86,3 @@ QModelingObject *QUmlLiteralSpecification::clone() const
     return c;
 }
 
-void QUmlLiteralSpecification::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-}
-
-void QUmlLiteralSpecification::setPropertyData()
-{
-}
-
diff --git a/src/uml/qumlliteralspecification.h b/src/uml/qumlliteralspecification.h
index fedf0e86..89871abe 100644
--- a/src/uml/qumlliteralspecification.h
+++ b/src/uml/qumlliteralspecification.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlValueSpecification>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,15 +56,12 @@ class Q_UML_EXPORT QUmlLiteralSpecification : public QUmlValueSpecification
 public:
     virtual ~QUmlLiteralSpecification();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
 
 protected:
     explicit QUmlLiteralSpecification();
 
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlliteralstring.cpp b/src/uml/qumlliteralstring.cpp
index a9f58868..97e3e1eb 100644
--- a/src/uml/qumlliteralstring.cpp
+++ b/src/uml/qumlliteralstring.cpp
@@ -60,24 +60,22 @@
 
     \brief A literal string is a specification of a string value.
  */
-QUmlLiteralString::QUmlLiteralString(bool createQObject)
+QUmlLiteralString::QUmlLiteralString(bool createQModelingObject)
 {
-    if (createQObject)
-        _qObject = new QUmlLiteralStringObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlLiteralStringObject(this));
 }
 
 QUmlLiteralString::~QUmlLiteralString()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlLiteralString::clone() const
+QModelingElement *QUmlLiteralString::clone() const
 {
     QUmlLiteralString *c = new QUmlLiteralString;
     foreach (QUmlComment *element, ownedComments())
@@ -141,35 +139,3 @@ QString QUmlLiteralString::stringValue() const
     return QString ();
 }
 
-void QUmlLiteralString::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlLiteralString"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("value"))));
-}
-
-void QUmlLiteralString::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralString")][QStringLiteral("value")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralString")][QStringLiteral("value")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLiteralString");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralString")][QStringLiteral("value")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralString")][QStringLiteral("value")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralString")][QStringLiteral("value")][QtModeling::DocumentationRole] = QStringLiteral("The specified String value.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralString")][QStringLiteral("value")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralString")][QStringLiteral("value")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralString")][QStringLiteral("value")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlliteralstring.h b/src/uml/qumlliteralstring.h
index 127a189f..64d6cc3b 100644
--- a/src/uml/qumlliteralstring.h
+++ b/src/uml/qumlliteralstring.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlLiteralSpecification>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,10 +54,10 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlLiteralString : public QUmlLiteralSpecification
 {
 public:
-    explicit QUmlLiteralString(bool createQObject = true);
+    explicit QUmlLiteralString(bool createQModelingObject = true);
     virtual ~QUmlLiteralString();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QString value() const;
@@ -70,9 +69,6 @@ public:
 
 protected:
     QString _value;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlliteralunlimitednatural.cpp b/src/uml/qumlliteralunlimitednatural.cpp
index ba347f05..5ecb4cb0 100644
--- a/src/uml/qumlliteralunlimitednatural.cpp
+++ b/src/uml/qumlliteralunlimitednatural.cpp
@@ -60,25 +60,23 @@
 
     \brief A literal unlimited natural is a specification of an unlimited natural number.
  */
-QUmlLiteralUnlimitedNatural::QUmlLiteralUnlimitedNatural(bool createQObject) :
+QUmlLiteralUnlimitedNatural::QUmlLiteralUnlimitedNatural(bool createQModelingObject) :
     _value(0)
 {
-    if (createQObject)
-        _qObject = new QUmlLiteralUnlimitedNaturalObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlLiteralUnlimitedNaturalObject(this));
 }
 
 QUmlLiteralUnlimitedNatural::~QUmlLiteralUnlimitedNatural()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlLiteralUnlimitedNatural::clone() const
+QModelingElement *QUmlLiteralUnlimitedNatural::clone() const
 {
     QUmlLiteralUnlimitedNatural *c = new QUmlLiteralUnlimitedNatural;
     foreach (QUmlComment *element, ownedComments())
@@ -117,7 +115,7 @@ void QUmlLiteralUnlimitedNatural::setValue(int value)
 
     if (_value != value) {
         _value = value;
-        _modifiedResettableProperties << QStringLiteral("value");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("value");
     }
 }
 
@@ -143,35 +141,3 @@ int QUmlLiteralUnlimitedNatural::unlimitedValue() const
     return int ();
 }
 
-void QUmlLiteralUnlimitedNatural::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlLiteralUnlimitedNatural"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("value"))));
-}
-
-void QUmlLiteralUnlimitedNatural::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralUnlimitedNatural")][QStringLiteral("value")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralUnlimitedNatural")][QStringLiteral("value")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLiteralUnlimitedNatural");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralUnlimitedNatural")][QStringLiteral("value")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralUnlimitedNatural")][QStringLiteral("value")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralUnlimitedNatural")][QStringLiteral("value")][QtModeling::DocumentationRole] = QStringLiteral("The specified UnlimitedNatural value.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralUnlimitedNatural")][QStringLiteral("value")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralUnlimitedNatural")][QStringLiteral("value")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLiteralUnlimitedNatural")][QStringLiteral("value")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlliteralunlimitednatural.h b/src/uml/qumlliteralunlimitednatural.h
index a680b27b..f2af7de7 100644
--- a/src/uml/qumlliteralunlimitednatural.h
+++ b/src/uml/qumlliteralunlimitednatural.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlLiteralSpecification>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,10 +54,10 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlLiteralUnlimitedNatural : public QUmlLiteralSpecification
 {
 public:
-    explicit QUmlLiteralUnlimitedNatural(bool createQObject = true);
+    explicit QUmlLiteralUnlimitedNatural(bool createQModelingObject = true);
     virtual ~QUmlLiteralUnlimitedNatural();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     int value() const;
@@ -70,9 +69,6 @@ public:
 
 protected:
     int _value;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlloopnode.cpp b/src/uml/qumlloopnode.cpp
index b936e4e7..bc2d679d 100644
--- a/src/uml/qumlloopnode.cpp
+++ b/src/uml/qumlloopnode.cpp
@@ -75,27 +75,25 @@
 
     \brief A loop node is a structured activity node that represents a loop with setup, test, and body sections.
  */
-QUmlLoopNode::QUmlLoopNode(bool createQObject) :
+QUmlLoopNode::QUmlLoopNode(bool createQModelingObject) :
     QUmlStructuredActivityNode(false),
     _decider(0),
     _isTestedFirst(false)
 {
-    if (createQObject)
-        _qObject = new QUmlLoopNodeObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlLoopNodeObject(this));
 }
 
 QUmlLoopNode::~QUmlLoopNode()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlLoopNode::clone() const
+QModelingElement *QUmlLoopNode::clone() const
 {
     QUmlLoopNode *c = new QUmlLoopNode;
     foreach (QUmlComment *element, ownedComments())
@@ -179,8 +177,8 @@ void QUmlLoopNode::addBodyOutput(QUmlOutputPin *bodyOutput)
 
     if (!_bodyOutputs.contains(bodyOutput)) {
         _bodyOutputs.append(bodyOutput);
-        if (bodyOutput && bodyOutput->asQObject() && this->asQObject())
-            QObject::connect(bodyOutput->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeBodyOutput(QObject *)));
+        if (bodyOutput && bodyOutput->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(bodyOutput->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeBodyOutput(QObject *)));
     }
 }
 
@@ -209,8 +207,8 @@ void QUmlLoopNode::addBodyPart(QUmlExecutableNode *bodyPart)
 
     if (!_bodyParts.contains(bodyPart)) {
         _bodyParts.insert(bodyPart);
-        if (bodyPart && bodyPart->asQObject() && this->asQObject())
-            QObject::connect(bodyPart->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeBodyPart(QObject *)));
+        if (bodyPart && bodyPart->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(bodyPart->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeBodyPart(QObject *)));
     }
 }
 
@@ -239,8 +237,8 @@ void QUmlLoopNode::setDecider(QUmlOutputPin *decider)
 
     if (_decider != decider) {
         _decider = decider;
-        if (decider && decider->asQObject() && this->asQObject())
-            QObject::connect(decider->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setDecider()));
+        if (decider && decider->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(decider->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setDecider()));
     }
 }
 
@@ -260,7 +258,7 @@ void QUmlLoopNode::setTestedFirst(bool isTestedFirst)
 
     if (_isTestedFirst != isTestedFirst) {
         _isTestedFirst = isTestedFirst;
-        _modifiedResettableProperties << QStringLiteral("isTestedFirst");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isTestedFirst");
     }
 }
 
@@ -280,8 +278,8 @@ void QUmlLoopNode::addLoopVariable(QUmlOutputPin *loopVariable)
 
     if (!_loopVariables.contains(loopVariable)) {
         _loopVariables.append(loopVariable);
-        if (loopVariable && loopVariable->asQObject() && this->asQObject())
-            QObject::connect(loopVariable->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeLoopVariable(QObject *)));
+        if (loopVariable && loopVariable->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(loopVariable->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeLoopVariable(QObject *)));
     }
 }
 
@@ -310,9 +308,9 @@ void QUmlLoopNode::addLoopVariableInput(QUmlInputPin *loopVariableInput)
 
     if (!_loopVariableInputs.contains(loopVariableInput)) {
         _loopVariableInputs.append(loopVariableInput);
-        if (loopVariableInput && loopVariableInput->asQObject() && this->asQObject())
-            QObject::connect(loopVariableInput->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeLoopVariableInput(QObject *)));
-        loopVariableInput->asQObject()->setParent(this->asQObject());
+        if (loopVariableInput && loopVariableInput->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(loopVariableInput->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeLoopVariableInput(QObject *)));
+        loopVariableInput->asQModelingObject()->setParent(this->asQModelingObject());
     }
 }
 
@@ -322,8 +320,8 @@ void QUmlLoopNode::removeLoopVariableInput(QUmlInputPin *loopVariableInput)
 
     if (_loopVariableInputs.contains(loopVariableInput)) {
         _loopVariableInputs.removeAll(loopVariableInput);
-        if (loopVariableInput->asQObject())
-            loopVariableInput->asQObject()->setParent(0);
+        if (loopVariableInput->asQModelingObject())
+            loopVariableInput->asQModelingObject()->setParent(0);
     }
 }
 
@@ -343,9 +341,9 @@ void QUmlLoopNode::addResult(QUmlOutputPin *result)
 
     if (!_results.contains(result)) {
         _results.append(result);
-        if (result && result->asQObject() && this->asQObject())
-            QObject::connect(result->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeResult(QObject *)));
-        result->asQObject()->setParent(this->asQObject());
+        if (result && result->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(result->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeResult(QObject *)));
+        result->asQModelingObject()->setParent(this->asQModelingObject());
     }
 }
 
@@ -355,8 +353,8 @@ void QUmlLoopNode::removeResult(QUmlOutputPin *result)
 
     if (_results.contains(result)) {
         _results.removeAll(result);
-        if (result->asQObject())
-            result->asQObject()->setParent(0);
+        if (result->asQModelingObject())
+            result->asQModelingObject()->setParent(0);
     }
 }
 
@@ -376,8 +374,8 @@ void QUmlLoopNode::addSetupPart(QUmlExecutableNode *setupPart)
 
     if (!_setupParts.contains(setupPart)) {
         _setupParts.insert(setupPart);
-        if (setupPart && setupPart->asQObject() && this->asQObject())
-            QObject::connect(setupPart->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeSetupPart(QObject *)));
+        if (setupPart && setupPart->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(setupPart->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeSetupPart(QObject *)));
     }
 }
 
@@ -406,8 +404,8 @@ void QUmlLoopNode::addTest(QUmlExecutableNode *test)
 
     if (!_tests.contains(test)) {
         _tests.insert(test);
-        if (test && test->asQObject() && this->asQObject())
-            QObject::connect(test->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeTest(QObject *)));
+        if (test && test->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(test->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeTest(QObject *)));
     }
 }
 
@@ -420,144 +418,3 @@ void QUmlLoopNode::removeTest(QUmlExecutableNode *test)
     }
 }
 
-void QUmlLoopNode::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("containedEdges"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("containedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("subgroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superGroup"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("edges"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("mustIsolate"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("variables"))));
-    _groupProperties.insert(QStringLiteral("QUmlLoopNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("bodyOutputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlLoopNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("bodyParts"))));
-    _groupProperties.insert(QStringLiteral("QUmlLoopNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("decider"))));
-    _groupProperties.insert(QStringLiteral("QUmlLoopNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isTestedFirst"))));
-    _groupProperties.insert(QStringLiteral("QUmlLoopNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("loopVariables"))));
-    _groupProperties.insert(QStringLiteral("QUmlLoopNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("loopVariableInputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlLoopNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("results"))));
-    _groupProperties.insert(QStringLiteral("QUmlLoopNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("setupParts"))));
-    _groupProperties.insert(QStringLiteral("QUmlLoopNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("tests"))));
-}
-
-void QUmlLoopNode::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("bodyOutputs")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("bodyOutputs")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLoopNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("bodyOutputs")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("bodyOutputs")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("bodyOutputs")][QtModeling::DocumentationRole] = QStringLiteral("A list of output pins within the body fragment the values of which are moved to the loop variable pins after completion of execution of the body, before the next iteration of the loop begins or before the loop exits.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("bodyOutputs")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("bodyOutputs")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("bodyOutputs")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("bodyParts")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("bodyParts")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLoopNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("bodyParts")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("bodyParts")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("bodyParts")][QtModeling::DocumentationRole] = QStringLiteral("The set of nodes and edges that perform the repetitive computations of the loop. The body section is executed as long as the test section produces a true value.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("bodyParts")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("bodyParts")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("bodyParts")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("decider")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("decider")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLoopNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("decider")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("decider")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("decider")][QtModeling::DocumentationRole] = QStringLiteral("An output pin within the test fragment the value of which is examined after execution of the test to determine whether to execute the loop body.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("decider")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("decider")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("decider")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("isTestedFirst")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("isTestedFirst")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLoopNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("isTestedFirst")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("isTestedFirst")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("isTestedFirst")][QtModeling::DocumentationRole] = QStringLiteral("If true, the test is performed before the first execution of the body. If false, the body is executed once before the test is performed.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("isTestedFirst")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("isTestedFirst")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("isTestedFirst")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("loopVariables")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("loopVariables")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLoopNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("loopVariables")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("loopVariables")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("loopVariables")][QtModeling::DocumentationRole] = QStringLiteral("A list of output pins that hold the values of the loop variables during an execution of the loop. When the test fails, the values are movied to the result pins of the loop.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("loopVariables")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("loopVariables")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("loopVariables")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("loopVariableInputs")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("loopVariableInputs")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLoopNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("loopVariableInputs")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("loopVariableInputs")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("loopVariableInputs")][QtModeling::DocumentationRole] = QStringLiteral("A list of values that are moved into the loop variable pins before the first iteration of the loop.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("loopVariableInputs")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("StructuredActivityNode-structuredNodeInput");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("loopVariableInputs")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("loopVariableInputs")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("results")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("results")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLoopNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("results")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("results")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("results")][QtModeling::DocumentationRole] = QStringLiteral("A list of output pins that constitute the data flow output of the entire loop.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("results")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("StructuredActivityNode-structuredNodeOutput");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("results")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("results")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("setupParts")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("setupParts")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLoopNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("setupParts")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("setupParts")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("setupParts")][QtModeling::DocumentationRole] = QStringLiteral("The set of nodes and edges that initialize values or perform other setup computations for the loop.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("setupParts")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("setupParts")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("setupParts")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("tests")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("tests")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLoopNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("tests")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("tests")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("tests")][QtModeling::DocumentationRole] = QStringLiteral("The set of nodes, edges, and designated value that compute a Boolean value to determine if another execution of the body will be performed.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("tests")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("tests")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("tests")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlloopnode.h b/src/uml/qumlloopnode.h
index 93190469..b52a6be5 100644
--- a/src/uml/qumlloopnode.h
+++ b/src/uml/qumlloopnode.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlStructuredActivityNode>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -59,10 +58,10 @@ class QUmlOutputPin;
 class Q_UML_EXPORT QUmlLoopNode : public QUmlStructuredActivityNode
 {
 public:
-    explicit QUmlLoopNode(bool createQObject = true);
+    explicit QUmlLoopNode(bool createQModelingObject = true);
     virtual ~QUmlLoopNode();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QList<QUmlOutputPin *> bodyOutputs() const;
@@ -101,9 +100,6 @@ protected:
     QList<QUmlOutputPin *> _results;
     QSet<QUmlExecutableNode *> _setupParts;
     QSet<QUmlExecutableNode *> _tests;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlmanifestation.cpp b/src/uml/qumlmanifestation.cpp
index ea6a3215..e631b9d4 100644
--- a/src/uml/qumlmanifestation.cpp
+++ b/src/uml/qumlmanifestation.cpp
@@ -61,26 +61,24 @@
 
     \brief A manifestation is the concrete physical rendering of one or more model elements by an artifact.
  */
-QUmlManifestation::QUmlManifestation(bool createQObject) :
+QUmlManifestation::QUmlManifestation(bool createQModelingObject) :
     QUmlAbstraction(false),
     _utilizedElement(0)
 {
-    if (createQObject)
-        _qObject = new QUmlManifestationObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlManifestationObject(this));
 }
 
 QUmlManifestation::~QUmlManifestation()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlManifestation::clone() const
+QModelingElement *QUmlManifestation::clone() const
 {
     QUmlManifestation *c = new QUmlManifestation;
     foreach (QUmlComment *element, ownedComments())
@@ -127,8 +125,8 @@ void QUmlManifestation::setUtilizedElement(QUmlPackageableElement *utilizedEleme
         removeSupplier(_utilizedElement);
 
         _utilizedElement = utilizedElement;
-        if (utilizedElement && utilizedElement->asQObject() && this->asQObject())
-            QObject::connect(utilizedElement->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setUtilizedElement()));
+        if (utilizedElement && utilizedElement->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(utilizedElement->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setUtilizedElement()));
 
         // Adjust subsetted properties
         if (utilizedElement) {
@@ -137,40 +135,3 @@ void QUmlManifestation::setUtilizedElement(QUmlPackageableElement *utilizedEleme
     }
 }
 
-void QUmlManifestation::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
-    _groupProperties.insert(QStringLiteral("QUmlDependency"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clients"))));
-    _groupProperties.insert(QStringLiteral("QUmlDependency"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("suppliers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAbstraction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("mapping"))));
-    _groupProperties.insert(QStringLiteral("QUmlManifestation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("utilizedElement"))));
-}
-
-void QUmlManifestation::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlManifestation")][QStringLiteral("utilizedElement")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlManifestation")][QStringLiteral("utilizedElement")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlManifestation");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlManifestation")][QStringLiteral("utilizedElement")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlManifestation")][QStringLiteral("utilizedElement")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlManifestation")][QStringLiteral("utilizedElement")][QtModeling::DocumentationRole] = QStringLiteral("The model element that is utilized in the manifestation in an Artifact.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlManifestation")][QStringLiteral("utilizedElement")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlManifestation")][QStringLiteral("utilizedElement")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Dependency-supplier");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlManifestation")][QStringLiteral("utilizedElement")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlmanifestation.h b/src/uml/qumlmanifestation.h
index aa878c01..a6cf293d 100644
--- a/src/uml/qumlmanifestation.h
+++ b/src/uml/qumlmanifestation.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlAbstraction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlPackageableElement;
 class Q_UML_EXPORT QUmlManifestation : public QUmlAbstraction
 {
 public:
-    explicit QUmlManifestation(bool createQObject = true);
+    explicit QUmlManifestation(bool createQModelingObject = true);
     virtual ~QUmlManifestation();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlPackageableElement *utilizedElement() const;
@@ -68,9 +67,6 @@ public:
 
 protected:
     QUmlPackageableElement *_utilizedElement;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlmergenode.cpp b/src/uml/qumlmergenode.cpp
index 48cb0a88..b7e2247c 100644
--- a/src/uml/qumlmergenode.cpp
+++ b/src/uml/qumlmergenode.cpp
@@ -66,24 +66,22 @@
 
     \brief A merge node is a control node that brings together multiple alternate flows. It is not used to synchronize concurrent flows but to accept one among several alternate flows.
  */
-QUmlMergeNode::QUmlMergeNode(bool createQObject)
+QUmlMergeNode::QUmlMergeNode(bool createQModelingObject)
 {
-    if (createQObject)
-        _qObject = new QUmlMergeNodeObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlMergeNodeObject(this));
 }
 
 QUmlMergeNode::~QUmlMergeNode()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlMergeNode::clone() const
+QModelingElement *QUmlMergeNode::clone() const
 {
     QUmlMergeNode *c = new QUmlMergeNode;
     foreach (QUmlComment *element, ownedComments())
@@ -112,33 +110,3 @@ QModelingObject *QUmlMergeNode::clone() const
     return c;
 }
 
-void QUmlMergeNode::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-}
-
-void QUmlMergeNode::setPropertyData()
-{
-}
-
diff --git a/src/uml/qumlmergenode.h b/src/uml/qumlmergenode.h
index 5fd1420d..abdc94ba 100644
--- a/src/uml/qumlmergenode.h
+++ b/src/uml/qumlmergenode.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlControlNode>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,16 +54,13 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlMergeNode : public QUmlControlNode
 {
 public:
-    explicit QUmlMergeNode(bool createQObject = true);
+    explicit QUmlMergeNode(bool createQModelingObject = true);
     virtual ~QUmlMergeNode();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
 
 protected:
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlmessage.cpp b/src/uml/qumlmessage.cpp
index 1800f9b6..2590ca51 100644
--- a/src/uml/qumlmessage.cpp
+++ b/src/uml/qumlmessage.cpp
@@ -61,7 +61,7 @@
 
     \brief A message defines a particular communication between lifelines of an interaction.
  */
-QUmlMessage::QUmlMessage(bool createQObject) :
+QUmlMessage::QUmlMessage(bool createQModelingObject) :
     _connector(0),
     _interaction(0),
     _messageSort(QtUml::MessageSortSynchCall),
@@ -69,22 +69,20 @@ QUmlMessage::QUmlMessage(bool createQObject) :
     _sendEvent(0),
     _signature(0)
 {
-    if (createQObject)
-        _qObject = new QUmlMessageObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlMessageObject(this));
 }
 
 QUmlMessage::~QUmlMessage()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlMessage::clone() const
+QModelingElement *QUmlMessage::clone() const
 {
     QUmlMessage *c = new QUmlMessage;
     foreach (QUmlComment *element, ownedComments())
@@ -129,9 +127,9 @@ void QUmlMessage::addArgument(QUmlValueSpecification *argument)
 
     if (!_arguments.contains(argument)) {
         _arguments.append(argument);
-        if (argument && argument->asQObject() && this->asQObject())
-            QObject::connect(argument->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeArgument(QObject *)));
-        argument->asQObject()->setParent(this->asQObject());
+        if (argument && argument->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(argument->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeArgument(QObject *)));
+        argument->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(argument);
@@ -144,8 +142,8 @@ void QUmlMessage::removeArgument(QUmlValueSpecification *argument)
 
     if (_arguments.contains(argument)) {
         _arguments.removeAll(argument);
-        if (argument->asQObject())
-            argument->asQObject()->setParent(0);
+        if (argument->asQModelingObject())
+            argument->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(argument);
@@ -168,8 +166,8 @@ void QUmlMessage::setConnector(QUmlConnector *connector)
 
     if (_connector != connector) {
         _connector = connector;
-        if (connector && connector->asQObject() && this->asQObject())
-            QObject::connect(connector->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setConnector()));
+        if (connector && connector->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(connector->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setConnector()));
     }
 }
 
@@ -191,8 +189,8 @@ void QUmlMessage::setInteraction(QUmlInteraction *interaction)
         // Adjust subsetted properties
 
         _interaction = interaction;
-        if (interaction && interaction->asQObject() && this->asQObject())
-            QObject::connect(interaction->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setInteraction()));
+        if (interaction && interaction->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(interaction->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setInteraction()));
 
         // Adjust subsetted properties
         setNamespace(interaction);
@@ -239,7 +237,7 @@ void QUmlMessage::setMessageSort(QtUml::MessageSort messageSort)
 
     if (_messageSort != messageSort) {
         _messageSort = messageSort;
-        _modifiedResettableProperties << QStringLiteral("messageSort");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("messageSort");
     }
 }
 
@@ -259,8 +257,8 @@ void QUmlMessage::setReceiveEvent(QUmlMessageEnd *receiveEvent)
 
     if (_receiveEvent != receiveEvent) {
         _receiveEvent = receiveEvent;
-        if (receiveEvent && receiveEvent->asQObject() && this->asQObject())
-            QObject::connect(receiveEvent->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setReceiveEvent()));
+        if (receiveEvent && receiveEvent->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(receiveEvent->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setReceiveEvent()));
     }
 }
 
@@ -280,8 +278,8 @@ void QUmlMessage::setSendEvent(QUmlMessageEnd *sendEvent)
 
     if (_sendEvent != sendEvent) {
         _sendEvent = sendEvent;
-        if (sendEvent && sendEvent->asQObject() && this->asQObject())
-            QObject::connect(sendEvent->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setSendEvent()));
+        if (sendEvent && sendEvent->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(sendEvent->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setSendEvent()));
     }
 }
 
@@ -301,107 +299,8 @@ void QUmlMessage::setSignature(QUmlNamedElement *signature)
 
     if (_signature != signature) {
         _signature = signature;
-        if (signature && signature->asQObject() && this->asQObject())
-            QObject::connect(signature->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setSignature()));
+        if (signature && signature->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(signature->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setSignature()));
     }
 }
 
-void QUmlMessage::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlMessage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("arguments"))));
-    _groupProperties.insert(QStringLiteral("QUmlMessage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("connector"))));
-    _groupProperties.insert(QStringLiteral("QUmlMessage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interaction"))));
-    _groupProperties.insert(QStringLiteral("QUmlMessage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("messageKind"))));
-    _groupProperties.insert(QStringLiteral("QUmlMessage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("messageSort"))));
-    _groupProperties.insert(QStringLiteral("QUmlMessage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("receiveEvent"))));
-    _groupProperties.insert(QStringLiteral("QUmlMessage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sendEvent"))));
-    _groupProperties.insert(QStringLiteral("QUmlMessage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("signature"))));
-}
-
-void QUmlMessage::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("arguments")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("arguments")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlMessage");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("arguments")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("arguments")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("arguments")][QtModeling::DocumentationRole] = QStringLiteral("The arguments of the Message");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("arguments")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("arguments")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("arguments")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("connector")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("connector")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlMessage");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("connector")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("connector")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("connector")][QtModeling::DocumentationRole] = QStringLiteral("The Connector on which this Message is sent.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("connector")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("connector")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("connector")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("interaction")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("interaction")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlMessage");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("interaction")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("interaction")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("interaction")][QtModeling::DocumentationRole] = QStringLiteral("The enclosing Interaction owning the Message");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("interaction")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("interaction")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("interaction")][QtModeling::OppositeEndRole] = QStringLiteral("Interaction-message");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("messageKind")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("messageKind")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlMessage");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("messageKind")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("messageKind")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("messageKind")][QtModeling::DocumentationRole] = QStringLiteral("The derived kind of the Message (complete, lost, found or unknown)");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("messageKind")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("messageKind")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("messageKind")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("messageSort")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("messageSort")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlMessage");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("messageSort")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("messageSort")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("messageSort")][QtModeling::DocumentationRole] = QStringLiteral("The sort of communication reflected by the Message");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("messageSort")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("messageSort")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("messageSort")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("receiveEvent")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("receiveEvent")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlMessage");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("receiveEvent")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("receiveEvent")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("receiveEvent")][QtModeling::DocumentationRole] = QStringLiteral("References the Receiving of the Message");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("receiveEvent")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("receiveEvent")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_message_messageEnd-messageEnd");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("receiveEvent")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("sendEvent")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("sendEvent")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlMessage");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("sendEvent")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("sendEvent")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("sendEvent")][QtModeling::DocumentationRole] = QStringLiteral("References the Sending of the Message.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("sendEvent")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("sendEvent")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_message_messageEnd-messageEnd");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("sendEvent")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("signature")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("signature")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlMessage");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("signature")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("signature")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("signature")][QtModeling::DocumentationRole] = QStringLiteral("The signature of the Message is the specification of its content. It refers either an Operation or a Signal.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("signature")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("signature")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("signature")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlmessage.h b/src/uml/qumlmessage.h
index 6f66cbd8..ddc33d71 100644
--- a/src/uml/qumlmessage.h
+++ b/src/uml/qumlmessage.h
@@ -47,7 +47,6 @@
 
 
 #include <QtUml/QtUmlNamespace>
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -62,10 +61,10 @@ class QUmlValueSpecification;
 class Q_UML_EXPORT QUmlMessage : public QUmlNamedElement
 {
 public:
-    explicit QUmlMessage(bool createQObject = true);
+    explicit QUmlMessage(bool createQModelingObject = true);
     virtual ~QUmlMessage();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QList<QUmlValueSpecification *> arguments() const;
@@ -94,9 +93,6 @@ protected:
     QUmlMessageEnd *_receiveEvent;
     QUmlMessageEnd *_sendEvent;
     QUmlNamedElement *_signature;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlmessageend.cpp b/src/uml/qumlmessageend.cpp
index 58146d04..7883f1c9 100644
--- a/src/uml/qumlmessageend.cpp
+++ b/src/uml/qumlmessageend.cpp
@@ -59,15 +59,13 @@
 QUmlMessageEnd::QUmlMessageEnd() :
     _message(0)
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlMessageEnd::~QUmlMessageEnd()
 {
 }
 
-QModelingObject *QUmlMessageEnd::clone() const
+QModelingElement *QUmlMessageEnd::clone() const
 {
     QUmlMessageEnd *c = new QUmlMessageEnd;
     foreach (QUmlComment *element, ownedComments())
@@ -101,37 +99,8 @@ void QUmlMessageEnd::setMessage(QUmlMessage *message)
 
     if (_message != message) {
         _message = message;
-        if (message && message->asQObject() && this->asQObject())
-            QObject::connect(message->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setMessage()));
+        if (message && message->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(message->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setMessage()));
     }
 }
 
-void QUmlMessageEnd::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlMessageEnd"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("message"))));
-}
-
-void QUmlMessageEnd::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessageEnd")][QStringLiteral("message")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessageEnd")][QStringLiteral("message")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlMessageEnd");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessageEnd")][QStringLiteral("message")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessageEnd")][QStringLiteral("message")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessageEnd")][QStringLiteral("message")][QtModeling::DocumentationRole] = QStringLiteral("References a Message.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessageEnd")][QStringLiteral("message")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessageEnd")][QStringLiteral("message")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessageEnd")][QStringLiteral("message")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlmessageend.h b/src/uml/qumlmessageend.h
index 1bd58f8f..21d8e65f 100644
--- a/src/uml/qumlmessageend.h
+++ b/src/uml/qumlmessageend.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlNamedElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -59,7 +58,7 @@ class Q_UML_EXPORT QUmlMessageEnd : public virtual QUmlNamedElement
 public:
     virtual ~QUmlMessageEnd();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlMessage *message() const;
@@ -69,9 +68,6 @@ protected:
     explicit QUmlMessageEnd();
 
     QUmlMessage *_message;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlmessageevent.cpp b/src/uml/qumlmessageevent.cpp
index 37a29ed7..60008f5b 100644
--- a/src/uml/qumlmessageevent.cpp
+++ b/src/uml/qumlmessageevent.cpp
@@ -59,15 +59,13 @@
  */
 QUmlMessageEvent::QUmlMessageEvent()
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlMessageEvent::~QUmlMessageEvent()
 {
 }
 
-QModelingObject *QUmlMessageEvent::clone() const
+QModelingElement *QUmlMessageEvent::clone() const
 {
     QUmlMessageEvent *c = new QUmlMessageEvent;
     foreach (QUmlComment *element, ownedComments())
@@ -85,24 +83,3 @@ QModelingObject *QUmlMessageEvent::clone() const
     return c;
 }
 
-void QUmlMessageEvent::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-}
-
-void QUmlMessageEvent::setPropertyData()
-{
-}
-
diff --git a/src/uml/qumlmessageevent.h b/src/uml/qumlmessageevent.h
index 0267ebe6..a022f0f5 100644
--- a/src/uml/qumlmessageevent.h
+++ b/src/uml/qumlmessageevent.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlEvent>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,15 +56,12 @@ class Q_UML_EXPORT QUmlMessageEvent : public QUmlEvent
 public:
     virtual ~QUmlMessageEvent();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
 
 protected:
     explicit QUmlMessageEvent();
 
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlmessageoccurrencespecification.cpp b/src/uml/qumlmessageoccurrencespecification.cpp
index 0a08b66a..42a714ef 100644
--- a/src/uml/qumlmessageoccurrencespecification.cpp
+++ b/src/uml/qumlmessageoccurrencespecification.cpp
@@ -62,25 +62,23 @@
 
     \brief A message occurrence specification pecifies the occurrence of message events, such as sending and receiving of signals or invoking or receiving of operation calls. A message occurrence specification is a kind of message end. Messages are generated either by synchronous operation calls or asynchronous signal sends. They are received by the execution of corresponding accept event actions.
  */
-QUmlMessageOccurrenceSpecification::QUmlMessageOccurrenceSpecification(bool createQObject) :
+QUmlMessageOccurrenceSpecification::QUmlMessageOccurrenceSpecification(bool createQModelingObject) :
     QUmlOccurrenceSpecification(false)
 {
-    if (createQObject)
-        _qObject = new QUmlMessageOccurrenceSpecificationObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlMessageOccurrenceSpecificationObject(this));
 }
 
 QUmlMessageOccurrenceSpecification::~QUmlMessageOccurrenceSpecification()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlMessageOccurrenceSpecification::clone() const
+QModelingElement *QUmlMessageOccurrenceSpecification::clone() const
 {
     QUmlMessageOccurrenceSpecification *c = new QUmlMessageOccurrenceSpecification;
     foreach (QUmlComment *element, ownedComments())
@@ -108,29 +106,3 @@ QModelingObject *QUmlMessageOccurrenceSpecification::clone() const
     return c;
 }
 
-void QUmlMessageOccurrenceSpecification::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingInteraction"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingOperand"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalOrderings"))));
-    _groupProperties.insert(QStringLiteral("QUmlOccurrenceSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("covered"))));
-    _groupProperties.insert(QStringLiteral("QUmlOccurrenceSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("toAfters"))));
-    _groupProperties.insert(QStringLiteral("QUmlOccurrenceSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("toBefores"))));
-    _groupProperties.insert(QStringLiteral("QUmlMessageEnd"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("message"))));
-}
-
-void QUmlMessageOccurrenceSpecification::setPropertyData()
-{
-}
-
diff --git a/src/uml/qumlmessageoccurrencespecification.h b/src/uml/qumlmessageoccurrencespecification.h
index 8152dc73..96675ee9 100644
--- a/src/uml/qumlmessageoccurrencespecification.h
+++ b/src/uml/qumlmessageoccurrencespecification.h
@@ -46,7 +46,6 @@
 #include <QtUml/QUmlOccurrenceSpecification>
 #include <QtUml/QUmlMessageEnd>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -56,16 +55,13 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlMessageOccurrenceSpecification : public QUmlOccurrenceSpecification, public QUmlMessageEnd
 {
 public:
-    explicit QUmlMessageOccurrenceSpecification(bool createQObject = true);
+    explicit QUmlMessageOccurrenceSpecification(bool createQModelingObject = true);
     virtual ~QUmlMessageOccurrenceSpecification();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
 
 protected:
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlmodel.cpp b/src/uml/qumlmodel.cpp
index bcadbeac..f364dd99 100644
--- a/src/uml/qumlmodel.cpp
+++ b/src/uml/qumlmodel.cpp
@@ -70,25 +70,23 @@
 
     \brief A model captures a view of a physical system. It is an abstraction of the physical system, with a certain purpose. This purpose determines what is to be included in the model and what is irrelevant. Thus the model completely describes those aspects of the physical system that are relevant to the purpose of the model, at the appropriate level of detail.
  */
-QUmlModel::QUmlModel(bool createQObject) :
+QUmlModel::QUmlModel(bool createQModelingObject) :
     QUmlPackage(false)
 {
-    if (createQObject)
-        _qObject = new QUmlModelObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlModelObject(this));
 }
 
 QUmlModel::~QUmlModel()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlModel::clone() const
+QModelingElement *QUmlModel::clone() const
 {
     QUmlModel *c = new QUmlModel;
     foreach (QUmlComment *element, ownedComments())
@@ -147,50 +145,3 @@ void QUmlModel::setViewpoint(QString viewpoint)
     }
 }
 
-void QUmlModel::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("URI"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedPackages"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestingPackage"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedStereotypes"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTypes"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageMerges"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packagedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("profileApplications"))));
-    _groupProperties.insert(QStringLiteral("QUmlModel"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("viewpoint"))));
-}
-
-void QUmlModel::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlModel")][QStringLiteral("viewpoint")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlModel")][QStringLiteral("viewpoint")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlModel");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlModel")][QStringLiteral("viewpoint")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlModel")][QStringLiteral("viewpoint")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlModel")][QStringLiteral("viewpoint")][QtModeling::DocumentationRole] = QStringLiteral("The name of the viewpoint that is expressed by a model (This name may refer to a profile definition).");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlModel")][QStringLiteral("viewpoint")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlModel")][QStringLiteral("viewpoint")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlModel")][QStringLiteral("viewpoint")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlmodel.h b/src/uml/qumlmodel.h
index 8d0240fc..d8575d38 100644
--- a/src/uml/qumlmodel.h
+++ b/src/uml/qumlmodel.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlPackage>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,10 +54,10 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlModel : public QUmlPackage
 {
 public:
-    explicit QUmlModel(bool createQObject = true);
+    explicit QUmlModel(bool createQModelingObject = true);
     virtual ~QUmlModel();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QString viewpoint() const;
@@ -66,9 +65,6 @@ public:
 
 protected:
     QString _viewpoint;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlmultiplicityelement.cpp b/src/uml/qumlmultiplicityelement.cpp
index 6e86b1f0..f7bcdc56 100644
--- a/src/uml/qumlmultiplicityelement.cpp
+++ b/src/uml/qumlmultiplicityelement.cpp
@@ -57,15 +57,13 @@ QUmlMultiplicityElement::QUmlMultiplicityElement() :
     _lowerValue(0),
     _upperValue(0)
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlMultiplicityElement::~QUmlMultiplicityElement()
 {
 }
 
-QModelingObject *QUmlMultiplicityElement::clone() const
+QModelingElement *QUmlMultiplicityElement::clone() const
 {
     QUmlMultiplicityElement *c = new QUmlMultiplicityElement;
     foreach (QUmlComment *element, ownedComments())
@@ -97,7 +95,7 @@ void QUmlMultiplicityElement::setOrdered(bool isOrdered)
 
     if (_isOrdered != isOrdered) {
         _isOrdered = isOrdered;
-        _modifiedResettableProperties << QStringLiteral("isOrdered");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isOrdered");
     }
 }
 
@@ -117,7 +115,7 @@ void QUmlMultiplicityElement::setUnique(bool isUnique)
 
     if (_isUnique != isUnique) {
         _isUnique = isUnique;
-        _modifiedResettableProperties << QStringLiteral("isUnique");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isUnique");
     }
 }
 
@@ -164,9 +162,9 @@ void QUmlMultiplicityElement::setLowerValue(QUmlValueSpecification *lowerValue)
         removeOwnedElement(_lowerValue);
 
         _lowerValue = lowerValue;
-        if (lowerValue && lowerValue->asQObject() && this->asQObject())
-            QObject::connect(lowerValue->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setLowerValue()));
-        lowerValue->asQObject()->setParent(this->asQObject());
+        if (lowerValue && lowerValue->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(lowerValue->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setLowerValue()));
+        lowerValue->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (lowerValue) {
@@ -218,9 +216,9 @@ void QUmlMultiplicityElement::setUpperValue(QUmlValueSpecification *upperValue)
         removeOwnedElement(_upperValue);
 
         _upperValue = upperValue;
-        if (upperValue && upperValue->asQObject() && this->asQObject())
-            QObject::connect(upperValue->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setUpperValue()));
-        upperValue->asQObject()->setParent(this->asQObject());
+        if (upperValue && upperValue->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(upperValue->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setUpperValue()));
+        upperValue->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (upperValue) {
@@ -306,76 +304,3 @@ int QUmlMultiplicityElement::lowerBound() const
 //    return int ();
 //}
 
-void QUmlMultiplicityElement::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isOrdered"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isUnique"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lower"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lowerValue"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upper"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperValue"))));
-}
-
-void QUmlMultiplicityElement::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("isOrdered")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("isOrdered")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlMultiplicityElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("isOrdered")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("isOrdered")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("isOrdered")][QtModeling::DocumentationRole] = QStringLiteral("For a multivalued multiplicity, this attribute specifies whether the values in an instantiation of this element are sequentially ordered.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("isOrdered")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("isOrdered")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("isOrdered")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("isUnique")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("isUnique")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlMultiplicityElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("isUnique")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("isUnique")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("isUnique")][QtModeling::DocumentationRole] = QStringLiteral("For a multivalued multiplicity, this attributes specifies whether the values in an instantiation of this element are unique.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("isUnique")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("isUnique")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("isUnique")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("lower")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("lower")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlMultiplicityElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("lower")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("lower")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("lower")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the lower bound of the multiplicity interval.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("lower")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("lower")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("lower")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("lowerValue")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("lowerValue")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlMultiplicityElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("lowerValue")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("lowerValue")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("lowerValue")][QtModeling::DocumentationRole] = QStringLiteral("The specification of the lower bound for this multiplicity.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("lowerValue")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("lowerValue")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("lowerValue")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("upper")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("upper")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlMultiplicityElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("upper")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("upper")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("upper")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the upper bound of the multiplicity interval.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("upper")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("upper")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("upper")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("upperValue")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("upperValue")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlMultiplicityElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("upperValue")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("upperValue")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("upperValue")][QtModeling::DocumentationRole] = QStringLiteral("The specification of the upper bound for this multiplicity.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("upperValue")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("upperValue")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlMultiplicityElement")][QStringLiteral("upperValue")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlmultiplicityelement.h b/src/uml/qumlmultiplicityelement.h
index eb5f50f6..5a737bbc 100644
--- a/src/uml/qumlmultiplicityelement.h
+++ b/src/uml/qumlmultiplicityelement.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -59,7 +58,7 @@ class Q_UML_EXPORT QUmlMultiplicityElement : public virtual QUmlElement
 public:
     virtual ~QUmlMultiplicityElement();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     bool isOrdered() const;
@@ -91,9 +90,6 @@ protected:
     bool _isUnique;
     QUmlValueSpecification *_lowerValue;
     QUmlValueSpecification *_upperValue;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlnamedelement.cpp b/src/uml/qumlnamedelement.cpp
index 26b9be27..ab86caef 100644
--- a/src/uml/qumlnamedelement.cpp
+++ b/src/uml/qumlnamedelement.cpp
@@ -58,15 +58,13 @@ QUmlNamedElement::QUmlNamedElement() :
     _nameExpression(0),
     _namespace_(0)
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlNamedElement::~QUmlNamedElement()
 {
 }
 
-QModelingObject *QUmlNamedElement::clone() const
+QModelingElement *QUmlNamedElement::clone() const
 {
     QUmlNamedElement *c = new QUmlNamedElement;
     foreach (QUmlComment *element, ownedComments())
@@ -98,8 +96,8 @@ void QUmlNamedElement::addClientDependency(QUmlDependency *clientDependency)
 
     if (!_clientDependencies.contains(clientDependency)) {
         _clientDependencies.insert(clientDependency);
-        if (clientDependency && clientDependency->asQObject() && this->asQObject())
-            QObject::connect(clientDependency->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeClientDependency(QObject *)));
+        if (clientDependency && clientDependency->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(clientDependency->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeClientDependency(QObject *)));
 
         // Adjust opposite properties
         if (clientDependency) {
@@ -138,7 +136,7 @@ void QUmlNamedElement::setName(QString name)
 
     if (_name != name) {
         _name = name;
-        asQObject()->setObjectName(name);
+        asQModelingObject()->setObjectName(name);
     }
 }
 
@@ -161,9 +159,9 @@ void QUmlNamedElement::setNameExpression(QUmlStringExpression *nameExpression)
         removeOwnedElement(_nameExpression);
 
         _nameExpression = nameExpression;
-        if (nameExpression && nameExpression->asQObject() && this->asQObject())
-            QObject::connect(nameExpression->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setNameExpression()));
-        nameExpression->asQObject()->setParent(this->asQObject());
+        if (nameExpression && nameExpression->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(nameExpression->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setNameExpression()));
+        nameExpression->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (nameExpression) {
@@ -190,8 +188,8 @@ void QUmlNamedElement::setNamespace(QUmlNamespace *namespace_)
         // Adjust subsetted properties
 
         _namespace_ = namespace_;
-        if (namespace_ && namespace_->asQObject() && this->asQObject())
-            QObject::connect(namespace_->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setNamespace()));
+        if (namespace_ && namespace_->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(namespace_->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setNamespace()));
 
         // Adjust subsetted properties
         setOwner(namespace_);
@@ -299,76 +297,3 @@ QString QUmlNamedElement::separator() const
     return QStringLiteral("::");
 }
 
-void QUmlNamedElement::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-}
-
-void QUmlNamedElement::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("clientDependencies")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("clientDependencies")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlNamedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("clientDependencies")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("clientDependencies")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("clientDependencies")][QtModeling::DocumentationRole] = QStringLiteral("Indicates the dependencies that reference the client.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("clientDependencies")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("clientDependencies")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_source_directedRelationship-directedRelationship");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("clientDependencies")][QtModeling::OppositeEndRole] = QStringLiteral("Dependency-client");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("name")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("name")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlNamedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("name")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("name")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("name")][QtModeling::DocumentationRole] = QStringLiteral("The name of the NamedElement.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("name")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("name")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("name")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("nameExpression")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("nameExpression")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlNamedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("nameExpression")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("nameExpression")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("nameExpression")][QtModeling::DocumentationRole] = QStringLiteral("The string expression used to define the name of this named element.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("nameExpression")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("nameExpression")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("nameExpression")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("namespace_")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("namespace_")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlNamedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("namespace_")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("namespace_")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("namespace_")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the namespace that owns the NamedElement.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("namespace_")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("namespace_")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_member_memberNamespace-memberNamespace Element-owner");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("namespace_")][QtModeling::OppositeEndRole] = QStringLiteral("Namespace-ownedMember");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("qualifiedName")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("qualifiedName")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlNamedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("qualifiedName")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("qualifiedName")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("qualifiedName")][QtModeling::DocumentationRole] = QStringLiteral("A name which allows the NamedElement to be identified within a hierarchy of nested Namespaces. It is constructed from the names of the containing namespaces starting at the root of the hierarchy and ending with the name of the NamedElement itself.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("qualifiedName")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("qualifiedName")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("qualifiedName")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("visibility")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("visibility")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlNamedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("visibility")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("visibility")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("visibility")][QtModeling::DocumentationRole] = QStringLiteral("Determines where the NamedElement appears within different Namespaces within the overall model, and its accessibility.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("visibility")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("visibility")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("visibility")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlnamedelement.h b/src/uml/qumlnamedelement.h
index 0625c764..815d27f7 100644
--- a/src/uml/qumlnamedelement.h
+++ b/src/uml/qumlnamedelement.h
@@ -47,7 +47,6 @@
 
 
 #include <QtUml/QtUmlNamespace>
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -64,7 +63,7 @@ class Q_UML_EXPORT QUmlNamedElement : public virtual QUmlElement
 public:
     virtual ~QUmlNamedElement();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlDependency *> clientDependencies() const;
@@ -95,9 +94,6 @@ protected:
     QUmlStringExpression *_nameExpression;
     QUmlNamespace *_namespace_;
     QtUml::VisibilityKind _visibility;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlnamespace.cpp b/src/uml/qumlnamespace.cpp
index 3ccea0be..86ae48d3 100644
--- a/src/uml/qumlnamespace.cpp
+++ b/src/uml/qumlnamespace.cpp
@@ -60,15 +60,13 @@
  */
 QUmlNamespace::QUmlNamespace()
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlNamespace::~QUmlNamespace()
 {
 }
 
-QModelingObject *QUmlNamespace::clone() const
+QModelingElement *QUmlNamespace::clone() const
 {
     QUmlNamespace *c = new QUmlNamespace;
     foreach (QUmlComment *element, ownedComments())
@@ -106,9 +104,9 @@ void QUmlNamespace::addElementImport(QUmlElementImport *elementImport)
 
     if (!_elementImports.contains(elementImport)) {
         _elementImports.insert(elementImport);
-        if (elementImport && elementImport->asQObject() && this->asQObject())
-            QObject::connect(elementImport->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeElementImport(QObject *)));
-        elementImport->asQObject()->setParent(this->asQObject());
+        if (elementImport && elementImport->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(elementImport->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeElementImport(QObject *)));
+        elementImport->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(elementImport);
@@ -126,8 +124,8 @@ void QUmlNamespace::removeElementImport(QUmlElementImport *elementImport)
 
     if (_elementImports.contains(elementImport)) {
         _elementImports.remove(elementImport);
-        if (elementImport->asQObject())
-            elementImport->asQObject()->setParent(0);
+        if (elementImport->asQModelingObject())
+            elementImport->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(elementImport);
@@ -201,8 +199,8 @@ void QUmlNamespace::addMember(QUmlNamedElement *member)
 
     if (!_members.contains(member)) {
         _members.insert(member);
-        if (member && member->asQObject() && this->asQObject())
-            QObject::connect(member->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeMember(QObject *)));
+        if (member && member->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(member->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeMember(QObject *)));
     }
 }
 
@@ -231,9 +229,9 @@ void QUmlNamespace::addOwnedMember(QUmlNamedElement *ownedMember)
 
     if (!_ownedMembers.contains(ownedMember)) {
         _ownedMembers.insert(ownedMember);
-        if (ownedMember && ownedMember->asQObject() && this->asQObject())
-            QObject::connect(ownedMember->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeOwnedMember(QObject *)));
-        ownedMember->asQObject()->setParent(this->asQObject());
+        if (ownedMember && ownedMember->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(ownedMember->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeOwnedMember(QObject *)));
+        ownedMember->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addMember(ownedMember);
@@ -252,8 +250,8 @@ void QUmlNamespace::removeOwnedMember(QUmlNamedElement *ownedMember)
 
     if (_ownedMembers.contains(ownedMember)) {
         _ownedMembers.remove(ownedMember);
-        if (ownedMember->asQObject())
-            ownedMember->asQObject()->setParent(0);
+        if (ownedMember->asQModelingObject())
+            ownedMember->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeMember(ownedMember);
@@ -282,9 +280,9 @@ void QUmlNamespace::addOwnedRule(QUmlConstraint *ownedRule)
 
     if (!_ownedRules.contains(ownedRule)) {
         _ownedRules.insert(ownedRule);
-        if (ownedRule && ownedRule->asQObject() && this->asQObject())
-            QObject::connect(ownedRule->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeOwnedRule(QObject *)));
-        ownedRule->asQObject()->setParent(this->asQObject());
+        if (ownedRule && ownedRule->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(ownedRule->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeOwnedRule(QObject *)));
+        ownedRule->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedMember(ownedRule);
@@ -302,8 +300,8 @@ void QUmlNamespace::removeOwnedRule(QUmlConstraint *ownedRule)
 
     if (_ownedRules.contains(ownedRule)) {
         _ownedRules.remove(ownedRule);
-        if (ownedRule->asQObject())
-            ownedRule->asQObject()->setParent(0);
+        if (ownedRule->asQModelingObject())
+            ownedRule->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedMember(ownedRule);
@@ -331,9 +329,9 @@ void QUmlNamespace::addPackageImport(QUmlPackageImport *packageImport)
 
     if (!_packageImports.contains(packageImport)) {
         _packageImports.insert(packageImport);
-        if (packageImport && packageImport->asQObject() && this->asQObject())
-            QObject::connect(packageImport->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removePackageImport(QObject *)));
-        packageImport->asQObject()->setParent(this->asQObject());
+        if (packageImport && packageImport->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(packageImport->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removePackageImport(QObject *)));
+        packageImport->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(packageImport);
@@ -351,8 +349,8 @@ void QUmlNamespace::removePackageImport(QUmlPackageImport *packageImport)
 
     if (_packageImports.contains(packageImport)) {
         _packageImports.remove(packageImport);
-        if (packageImport->asQObject())
-            packageImport->asQObject()->setParent(0);
+        if (packageImport->asQModelingObject())
+            packageImport->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(packageImport);
@@ -409,82 +407,3 @@ bool QUmlNamespace::membersAreDistinguishable() const
     return bool ();
 }
 
-void QUmlNamespace::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-}
-
-void QUmlNamespace::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("elementImports")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("elementImports")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlNamespace");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("elementImports")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("elementImports")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("elementImports")][QtModeling::DocumentationRole] = QStringLiteral("References the ElementImports owned by the Namespace.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("elementImports")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("elementImports")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_source_directedRelationship-directedRelationship Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("elementImports")][QtModeling::OppositeEndRole] = QStringLiteral("ElementImport-importingNamespace");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("importedMembers")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("importedMembers")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlNamespace");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("importedMembers")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("importedMembers")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("importedMembers")][QtModeling::DocumentationRole] = QStringLiteral("References the PackageableElements that are members of this Namespace as a result of either PackageImports or ElementImports.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("importedMembers")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("importedMembers")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-member");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("importedMembers")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("members")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("members")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlNamespace");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("members")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("members")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("members")][QtModeling::DocumentationRole] = QStringLiteral("A collection of NamedElements identifiable within the Namespace, either by being owned or by being introduced by importing or inheritance.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("members")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("members")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("members")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("ownedMembers")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("ownedMembers")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlNamespace");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("ownedMembers")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("ownedMembers")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("ownedMembers")][QtModeling::DocumentationRole] = QStringLiteral("A collection of NamedElements owned by the Namespace.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("ownedMembers")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("ownedMembers")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-member Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("ownedMembers")][QtModeling::OppositeEndRole] = QStringLiteral("NamedElement-namespace");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("ownedRules")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("ownedRules")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlNamespace");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("ownedRules")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("ownedRules")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("ownedRules")][QtModeling::DocumentationRole] = QStringLiteral("Specifies a set of Constraints owned by this Namespace.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("ownedRules")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("ownedRules")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("ownedRules")][QtModeling::OppositeEndRole] = QStringLiteral("Constraint-context");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("packageImports")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("packageImports")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlNamespace");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("packageImports")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("packageImports")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("packageImports")][QtModeling::DocumentationRole] = QStringLiteral("References the PackageImports owned by the Namespace.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("packageImports")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("packageImports")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_source_directedRelationship-directedRelationship Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("packageImports")][QtModeling::OppositeEndRole] = QStringLiteral("PackageImport-importingNamespace");
-
-}
-
diff --git a/src/uml/qumlnamespace.h b/src/uml/qumlnamespace.h
index 808a2854..7b0224e0 100644
--- a/src/uml/qumlnamespace.h
+++ b/src/uml/qumlnamespace.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlNamedElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -62,7 +61,7 @@ class Q_UML_EXPORT QUmlNamespace : public virtual QUmlNamedElement
 public:
     virtual ~QUmlNamespace();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlElementImport *> elementImports() const;
@@ -98,9 +97,6 @@ protected:
     QSet<QUmlNamedElement *> _ownedMembers;
     QSet<QUmlConstraint *> _ownedRules;
     QSet<QUmlPackageImport *> _packageImports;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlnode.cpp b/src/uml/qumlnode.cpp
index c4d751bb..7dc1b98c 100644
--- a/src/uml/qumlnode.cpp
+++ b/src/uml/qumlnode.cpp
@@ -87,25 +87,23 @@
 
     \brief A node is computational resource upon which artifacts may be deployed for execution. Nodes can be interconnected through communication paths to define network structures.
  */
-QUmlNode::QUmlNode(bool createQObject) :
+QUmlNode::QUmlNode(bool createQModelingObject) :
     QUmlClass(false)
 {
-    if (createQObject)
-        _qObject = new QUmlNodeObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlNodeObject(this));
 }
 
 QUmlNode::~QUmlNode()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlNode::clone() const
+QModelingElement *QUmlNode::clone() const
 {
     QUmlNode *c = new QUmlNode;
     foreach (QUmlComment *element, ownedComments())
@@ -193,9 +191,9 @@ void QUmlNode::addNestedNode(QUmlNode *nestedNode)
 
     if (!_nestedNodes.contains(nestedNode)) {
         _nestedNodes.insert(nestedNode);
-        if (nestedNode && nestedNode->asQObject() && this->asQObject())
-            QObject::connect(nestedNode->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeNestedNode(QObject *)));
-        nestedNode->asQObject()->setParent(this->asQObject());
+        if (nestedNode && nestedNode->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(nestedNode->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeNestedNode(QObject *)));
+        nestedNode->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedMember(nestedNode);
@@ -208,83 +206,11 @@ void QUmlNode::removeNestedNode(QUmlNode *nestedNode)
 
     if (_nestedNodes.contains(nestedNode)) {
         _nestedNodes.remove(nestedNode);
-        if (nestedNode->asQObject())
-            nestedNode->asQObject()->setParent(0);
+        if (nestedNode->asQModelingObject())
+            nestedNode->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedMember(nestedNode);
     }
 }
 
-void QUmlNode::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedConnectors"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parts"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("roles"))));
-    _groupProperties.insert(QStringLiteral("QUmlEncapsulatedClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedPorts"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifierBehavior"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interfaceRealizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedBehaviors"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extensions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isActive"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedReceptions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superClasses"))));
-    _groupProperties.insert(QStringLiteral("QUmlDeploymentTarget"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deployedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlDeploymentTarget"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deployments"))));
-    _groupProperties.insert(QStringLiteral("QUmlNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedNodes"))));
-}
-
-void QUmlNode::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNode")][QStringLiteral("nestedNodes")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNode")][QStringLiteral("nestedNodes")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNode")][QStringLiteral("nestedNodes")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNode")][QStringLiteral("nestedNodes")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNode")][QStringLiteral("nestedNodes")][QtModeling::DocumentationRole] = QStringLiteral("The Nodes that are defined (nested) within the Node.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNode")][QStringLiteral("nestedNodes")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNode")][QStringLiteral("nestedNodes")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlNode")][QStringLiteral("nestedNodes")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlnode.h b/src/uml/qumlnode.h
index 9ba0d3a0..f91e0c5c 100644
--- a/src/uml/qumlnode.h
+++ b/src/uml/qumlnode.h
@@ -46,7 +46,6 @@
 #include <QtUml/QUmlClass>
 #include <QtUml/QUmlDeploymentTarget>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -56,10 +55,10 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlNode : public QUmlClass, public QUmlDeploymentTarget
 {
 public:
-    explicit QUmlNode(bool createQObject = true);
+    explicit QUmlNode(bool createQModelingObject = true);
     virtual ~QUmlNode();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlNode *> nestedNodes() const;
@@ -68,9 +67,6 @@ public:
 
 protected:
     QSet<QUmlNode *> _nestedNodes;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlobjectflow.cpp b/src/uml/qumlobjectflow.cpp
index aafb8ed5..fe8d3311 100644
--- a/src/uml/qumlobjectflow.cpp
+++ b/src/uml/qumlobjectflow.cpp
@@ -68,28 +68,26 @@
 
     \brief An object flow is an activity edge that can have objects or data passing along it.Object flows have support for multicast/receive, token selection from object nodes, and transformation of tokens.
  */
-QUmlObjectFlow::QUmlObjectFlow(bool createQObject) :
+QUmlObjectFlow::QUmlObjectFlow(bool createQModelingObject) :
     _isMulticast(false),
     _isMultireceive(false),
     _selection(0),
     _transformation(0)
 {
-    if (createQObject)
-        _qObject = new QUmlObjectFlowObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlObjectFlowObject(this));
 }
 
 QUmlObjectFlow::~QUmlObjectFlow()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlObjectFlow::clone() const
+QModelingElement *QUmlObjectFlow::clone() const
 {
     QUmlObjectFlow *c = new QUmlObjectFlow;
     foreach (QUmlComment *element, ownedComments())
@@ -146,7 +144,7 @@ void QUmlObjectFlow::setMulticast(bool isMulticast)
 
     if (_isMulticast != isMulticast) {
         _isMulticast = isMulticast;
-        _modifiedResettableProperties << QStringLiteral("isMulticast");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isMulticast");
     }
 }
 
@@ -166,7 +164,7 @@ void QUmlObjectFlow::setMultireceive(bool isMultireceive)
 
     if (_isMultireceive != isMultireceive) {
         _isMultireceive = isMultireceive;
-        _modifiedResettableProperties << QStringLiteral("isMultireceive");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isMultireceive");
     }
 }
 
@@ -186,8 +184,8 @@ void QUmlObjectFlow::setSelection(QUmlBehavior *selection)
 
     if (_selection != selection) {
         _selection = selection;
-        if (selection && selection->asQObject() && this->asQObject())
-            QObject::connect(selection->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setSelection()));
+        if (selection && selection->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(selection->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setSelection()));
     }
 }
 
@@ -207,80 +205,8 @@ void QUmlObjectFlow::setTransformation(QUmlBehavior *transformation)
 
     if (_transformation != transformation) {
         _transformation = transformation;
-        if (transformation && transformation->asQObject() && this->asQObject())
-            QObject::connect(transformation->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setTransformation()));
+        if (transformation && transformation->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(transformation->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setTransformation()));
     }
 }
 
-void QUmlObjectFlow::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("guard"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interrupts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedEdges"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("source"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("target"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityEdge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("weight"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectFlow"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isMulticast"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectFlow"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isMultireceive"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectFlow"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("selection"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectFlow"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("transformation"))));
-}
-
-void QUmlObjectFlow::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectFlow")][QStringLiteral("isMulticast")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectFlow")][QStringLiteral("isMulticast")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlObjectFlow");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectFlow")][QStringLiteral("isMulticast")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectFlow")][QStringLiteral("isMulticast")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectFlow")][QStringLiteral("isMulticast")][QtModeling::DocumentationRole] = QStringLiteral("Tells whether the objects in the flow are passed by multicasting.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectFlow")][QStringLiteral("isMulticast")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectFlow")][QStringLiteral("isMulticast")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectFlow")][QStringLiteral("isMulticast")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectFlow")][QStringLiteral("isMultireceive")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectFlow")][QStringLiteral("isMultireceive")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlObjectFlow");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectFlow")][QStringLiteral("isMultireceive")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectFlow")][QStringLiteral("isMultireceive")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectFlow")][QStringLiteral("isMultireceive")][QtModeling::DocumentationRole] = QStringLiteral("Tells whether the objects in the flow are gathered from respondents to multicasting.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectFlow")][QStringLiteral("isMultireceive")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectFlow")][QStringLiteral("isMultireceive")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectFlow")][QStringLiteral("isMultireceive")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectFlow")][QStringLiteral("selection")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectFlow")][QStringLiteral("selection")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlObjectFlow");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectFlow")][QStringLiteral("selection")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectFlow")][QStringLiteral("selection")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectFlow")][QStringLiteral("selection")][QtModeling::DocumentationRole] = QStringLiteral("Selects tokens from a source object node.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectFlow")][QStringLiteral("selection")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectFlow")][QStringLiteral("selection")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectFlow")][QStringLiteral("selection")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectFlow")][QStringLiteral("transformation")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectFlow")][QStringLiteral("transformation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlObjectFlow");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectFlow")][QStringLiteral("transformation")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectFlow")][QStringLiteral("transformation")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectFlow")][QStringLiteral("transformation")][QtModeling::DocumentationRole] = QStringLiteral("Changes or replaces data tokens flowing along edge.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectFlow")][QStringLiteral("transformation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectFlow")][QStringLiteral("transformation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectFlow")][QStringLiteral("transformation")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlobjectflow.h b/src/uml/qumlobjectflow.h
index 1d1bba83..3d8c9a45 100644
--- a/src/uml/qumlobjectflow.h
+++ b/src/uml/qumlobjectflow.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlActivityEdge>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlBehavior;
 class Q_UML_EXPORT QUmlObjectFlow : public QUmlActivityEdge
 {
 public:
-    explicit QUmlObjectFlow(bool createQObject = true);
+    explicit QUmlObjectFlow(bool createQModelingObject = true);
     virtual ~QUmlObjectFlow();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     bool isMulticast() const;
@@ -77,9 +76,6 @@ protected:
     bool _isMultireceive;
     QUmlBehavior *_selection;
     QUmlBehavior *_transformation;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlobjectnode.cpp b/src/uml/qumlobjectnode.cpp
index e1f6d108..d0fff4eb 100644
--- a/src/uml/qumlobjectnode.cpp
+++ b/src/uml/qumlobjectnode.cpp
@@ -74,15 +74,13 @@ QUmlObjectNode::QUmlObjectNode() :
     _selection(0),
     _upperBound(0)
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlObjectNode::~QUmlObjectNode()
 {
 }
 
-QModelingObject *QUmlObjectNode::clone() const
+QModelingElement *QUmlObjectNode::clone() const
 {
     QUmlObjectNode *c = new QUmlObjectNode;
     foreach (QUmlComment *element, ownedComments())
@@ -139,8 +137,8 @@ void QUmlObjectNode::addInState(QUmlState *inState)
 
     if (!_inStates.contains(inState)) {
         _inStates.insert(inState);
-        if (inState && inState->asQObject() && this->asQObject())
-            QObject::connect(inState->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeInState(QObject *)));
+        if (inState && inState->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(inState->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeInState(QObject *)));
     }
 }
 
@@ -169,7 +167,7 @@ void QUmlObjectNode::setControlType(bool isControlType)
 
     if (_isControlType != isControlType) {
         _isControlType = isControlType;
-        _modifiedResettableProperties << QStringLiteral("isControlType");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isControlType");
     }
 }
 
@@ -189,7 +187,7 @@ void QUmlObjectNode::setOrdering(QtUml::ObjectNodeOrderingKind ordering)
 
     if (_ordering != ordering) {
         _ordering = ordering;
-        _modifiedResettableProperties << QStringLiteral("ordering");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("ordering");
     }
 }
 
@@ -209,8 +207,8 @@ void QUmlObjectNode::setSelection(QUmlBehavior *selection)
 
     if (_selection != selection) {
         _selection = selection;
-        if (selection && selection->asQObject() && this->asQObject())
-            QObject::connect(selection->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setSelection()));
+        if (selection && selection->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(selection->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setSelection()));
     }
 }
 
@@ -233,9 +231,9 @@ void QUmlObjectNode::setUpperBound(QUmlValueSpecification *upperBound)
         removeOwnedElement(_upperBound);
 
         _upperBound = upperBound;
-        if (upperBound && upperBound->asQObject() && this->asQObject())
-            QObject::connect(upperBound->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setUpperBound()));
-        upperBound->asQObject()->setParent(this->asQObject());
+        if (upperBound && upperBound->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(upperBound->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setUpperBound()));
+        upperBound->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (upperBound) {
@@ -244,84 +242,3 @@ void QUmlObjectNode::setUpperBound(QUmlValueSpecification *upperBound)
     }
 }
 
-void QUmlObjectNode::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStates"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isControlType"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ordering"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("selection"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperBound"))));
-}
-
-void QUmlObjectNode::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("inStates")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("inStates")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlObjectNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("inStates")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("inStates")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("inStates")][QtModeling::DocumentationRole] = QStringLiteral("The required states of the object available at this point in the activity.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("inStates")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("inStates")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("inStates")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("isControlType")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("isControlType")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlObjectNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("isControlType")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("isControlType")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("isControlType")][QtModeling::DocumentationRole] = QStringLiteral("Tells whether the type of the object node is to be treated as control.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("isControlType")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("isControlType")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("isControlType")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("ordering")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("ordering")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlObjectNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("ordering")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("ordering")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("ordering")][QtModeling::DocumentationRole] = QStringLiteral("Tells whether and how the tokens in the object node are ordered for selection to traverse edges outgoing from the object node.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("ordering")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("ordering")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("ordering")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("selection")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("selection")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlObjectNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("selection")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("selection")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("selection")][QtModeling::DocumentationRole] = QStringLiteral("Selects tokens for outgoing edges.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("selection")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("selection")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("selection")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("upperBound")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("upperBound")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlObjectNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("upperBound")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("upperBound")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("upperBound")][QtModeling::DocumentationRole] = QStringLiteral("The maximum number of tokens allowed in the node. Objects cannot flow into the node if the upper bound is reached.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("upperBound")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("upperBound")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("upperBound")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlobjectnode.h b/src/uml/qumlobjectnode.h
index 00f1df34..6d20c629 100644
--- a/src/uml/qumlobjectnode.h
+++ b/src/uml/qumlobjectnode.h
@@ -48,7 +48,6 @@
 
 
 #include <QtUml/QtUmlNamespace>
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -64,7 +63,7 @@ class Q_UML_EXPORT QUmlObjectNode : public QUmlActivityNode, public QUmlTypedEle
 public:
     virtual ~QUmlObjectNode();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlState *> inStates() const;
@@ -87,9 +86,6 @@ protected:
     QtUml::ObjectNodeOrderingKind _ordering;
     QUmlBehavior *_selection;
     QUmlValueSpecification *_upperBound;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlobservation.cpp b/src/uml/qumlobservation.cpp
index 2dcf53e5..0bf4066c 100644
--- a/src/uml/qumlobservation.cpp
+++ b/src/uml/qumlobservation.cpp
@@ -59,15 +59,13 @@
  */
 QUmlObservation::QUmlObservation()
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlObservation::~QUmlObservation()
 {
 }
 
-QModelingObject *QUmlObservation::clone() const
+QModelingElement *QUmlObservation::clone() const
 {
     QUmlObservation *c = new QUmlObservation;
     foreach (QUmlComment *element, ownedComments())
@@ -85,24 +83,3 @@ QModelingObject *QUmlObservation::clone() const
     return c;
 }
 
-void QUmlObservation::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-}
-
-void QUmlObservation::setPropertyData()
-{
-}
-
diff --git a/src/uml/qumlobservation.h b/src/uml/qumlobservation.h
index 57b85346..4074f792 100644
--- a/src/uml/qumlobservation.h
+++ b/src/uml/qumlobservation.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlPackageableElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,15 +56,12 @@ class Q_UML_EXPORT QUmlObservation : public QUmlPackageableElement
 public:
     virtual ~QUmlObservation();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
 
 protected:
     explicit QUmlObservation();
 
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumloccurrencespecification.cpp b/src/uml/qumloccurrencespecification.cpp
index 17033c27..f63c7df2 100644
--- a/src/uml/qumloccurrencespecification.cpp
+++ b/src/uml/qumloccurrencespecification.cpp
@@ -61,25 +61,23 @@
 
     \brief An occurrence specification is the basic semantic unit of interactions. The sequences of occurrences specified by them are the meanings of interactions.
  */
-QUmlOccurrenceSpecification::QUmlOccurrenceSpecification(bool createQObject) :
+QUmlOccurrenceSpecification::QUmlOccurrenceSpecification(bool createQModelingObject) :
     _covered(0)
 {
-    if (createQObject)
-        _qObject = new QUmlOccurrenceSpecificationObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlOccurrenceSpecificationObject(this));
 }
 
 QUmlOccurrenceSpecification::~QUmlOccurrenceSpecification()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlOccurrenceSpecification::clone() const
+QModelingElement *QUmlOccurrenceSpecification::clone() const
 {
     QUmlOccurrenceSpecification *c = new QUmlOccurrenceSpecification;
     foreach (QUmlComment *element, ownedComments())
@@ -123,8 +121,8 @@ void QUmlOccurrenceSpecification::setCovered(QUmlLifeline *covered)
 
     if (_covered != covered) {
         _covered = covered;
-        if (covered && covered->asQObject() && this->asQObject())
-            QObject::connect(covered->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setCovered()));
+        if (covered && covered->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(covered->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setCovered()));
     }
 }
 
@@ -144,8 +142,8 @@ void QUmlOccurrenceSpecification::addToAfter(QUmlGeneralOrdering *toAfter)
 
     if (!_toAfters.contains(toAfter)) {
         _toAfters.insert(toAfter);
-        if (toAfter && toAfter->asQObject() && this->asQObject())
-            QObject::connect(toAfter->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeToAfter(QObject *)));
+        if (toAfter && toAfter->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(toAfter->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeToAfter(QObject *)));
 
         // Adjust opposite properties
         if (toAfter) {
@@ -184,8 +182,8 @@ void QUmlOccurrenceSpecification::addToBefore(QUmlGeneralOrdering *toBefore)
 
     if (!_toBefores.contains(toBefore)) {
         _toBefores.insert(toBefore);
-        if (toBefore && toBefore->asQObject() && this->asQObject())
-            QObject::connect(toBefore->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeToBefore(QObject *)));
+        if (toBefore && toBefore->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(toBefore->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeToBefore(QObject *)));
 
         // Adjust opposite properties
         if (toBefore) {
@@ -208,55 +206,3 @@ void QUmlOccurrenceSpecification::removeToBefore(QUmlGeneralOrdering *toBefore)
     }
 }
 
-void QUmlOccurrenceSpecification::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingInteraction"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingOperand"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalOrderings"))));
-    _groupProperties.insert(QStringLiteral("QUmlOccurrenceSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("covered"))));
-    _groupProperties.insert(QStringLiteral("QUmlOccurrenceSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("toAfters"))));
-    _groupProperties.insert(QStringLiteral("QUmlOccurrenceSpecification"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("toBefores"))));
-}
-
-void QUmlOccurrenceSpecification::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("covered")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("covered")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOccurrenceSpecification");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("covered")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("covered")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("covered")][QtModeling::DocumentationRole] = QStringLiteral("References the Lifeline on which the OccurrenceSpecification appears.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("covered")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("InteractionFragment-covered");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("covered")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("covered")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("toAfters")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("toAfters")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOccurrenceSpecification");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("toAfters")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("toAfters")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("toAfters")][QtModeling::DocumentationRole] = QStringLiteral("References the GeneralOrderings that specify EventOcurrences that must occur after this OccurrenceSpecification");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("toAfters")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("toAfters")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("toAfters")][QtModeling::OppositeEndRole] = QStringLiteral("GeneralOrdering-before");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("toBefores")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("toBefores")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOccurrenceSpecification");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("toBefores")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("toBefores")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("toBefores")][QtModeling::DocumentationRole] = QStringLiteral("References the GeneralOrderings that specify EventOcurrences that must occur before this OccurrenceSpecification");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("toBefores")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("toBefores")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("toBefores")][QtModeling::OppositeEndRole] = QStringLiteral("GeneralOrdering-after");
-
-}
-
diff --git a/src/uml/qumloccurrencespecification.h b/src/uml/qumloccurrencespecification.h
index 42b64a82..74313c8f 100644
--- a/src/uml/qumloccurrencespecification.h
+++ b/src/uml/qumloccurrencespecification.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlInteractionFragment>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlLifeline;
 class Q_UML_EXPORT QUmlOccurrenceSpecification : public QUmlInteractionFragment
 {
 public:
-    explicit QUmlOccurrenceSpecification(bool createQObject = true);
+    explicit QUmlOccurrenceSpecification(bool createQModelingObject = true);
     virtual ~QUmlOccurrenceSpecification();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlLifeline *covered() const;
@@ -77,9 +76,6 @@ protected:
     QUmlLifeline *_covered;
     QSet<QUmlGeneralOrdering *> _toAfters;
     QSet<QUmlGeneralOrdering *> _toBefores;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlopaqueaction.cpp b/src/uml/qumlopaqueaction.cpp
index 8e932b9d..34824190 100644
--- a/src/uml/qumlopaqueaction.cpp
+++ b/src/uml/qumlopaqueaction.cpp
@@ -70,24 +70,22 @@
 
     \brief An action with implementation-specific semantics.
  */
-QUmlOpaqueAction::QUmlOpaqueAction(bool createQObject)
+QUmlOpaqueAction::QUmlOpaqueAction(bool createQModelingObject)
 {
-    if (createQObject)
-        _qObject = new QUmlOpaqueActionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlOpaqueActionObject(this));
 }
 
 QUmlOpaqueAction::~QUmlOpaqueAction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlOpaqueAction::clone() const
+QModelingElement *QUmlOpaqueAction::clone() const
 {
     QUmlOpaqueAction *c = new QUmlOpaqueAction;
     foreach (QUmlComment *element, ownedComments())
@@ -177,9 +175,9 @@ void QUmlOpaqueAction::addInputValue(QUmlInputPin *inputValue)
 
     if (!_inputValues.contains(inputValue)) {
         _inputValues.insert(inputValue);
-        if (inputValue && inputValue->asQObject() && this->asQObject())
-            QObject::connect(inputValue->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeInputValue(QObject *)));
-        inputValue->asQObject()->setParent(this->asQObject());
+        if (inputValue && inputValue->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(inputValue->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeInputValue(QObject *)));
+        inputValue->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addInput(inputValue);
@@ -192,8 +190,8 @@ void QUmlOpaqueAction::removeInputValue(QUmlInputPin *inputValue)
 
     if (_inputValues.contains(inputValue)) {
         _inputValues.remove(inputValue);
-        if (inputValue->asQObject())
-            inputValue->asQObject()->setParent(0);
+        if (inputValue->asQModelingObject())
+            inputValue->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeInput(inputValue);
@@ -244,9 +242,9 @@ void QUmlOpaqueAction::addOutputValue(QUmlOutputPin *outputValue)
 
     if (!_outputValues.contains(outputValue)) {
         _outputValues.insert(outputValue);
-        if (outputValue && outputValue->asQObject() && this->asQObject())
-            QObject::connect(outputValue->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeOutputValue(QObject *)));
-        outputValue->asQObject()->setParent(this->asQObject());
+        if (outputValue && outputValue->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(outputValue->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeOutputValue(QObject *)));
+        outputValue->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOutput(outputValue);
@@ -259,88 +257,11 @@ void QUmlOpaqueAction::removeOutputValue(QUmlOutputPin *outputValue)
 
     if (_outputValues.contains(outputValue)) {
         _outputValues.remove(outputValue);
-        if (outputValue->asQObject())
-            outputValue->asQObject()->setParent(0);
+        if (outputValue->asQModelingObject())
+            outputValue->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOutput(outputValue);
     }
 }
 
-void QUmlOpaqueAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlOpaqueAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("bodies"))));
-    _groupProperties.insert(QStringLiteral("QUmlOpaqueAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputValues"))));
-    _groupProperties.insert(QStringLiteral("QUmlOpaqueAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("languages"))));
-    _groupProperties.insert(QStringLiteral("QUmlOpaqueAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputValues"))));
-}
-
-void QUmlOpaqueAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("bodies")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("bodies")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOpaqueAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("bodies")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("bodies")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("bodies")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the action in one or more languages.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("bodies")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("bodies")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("bodies")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("inputValues")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("inputValues")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOpaqueAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("inputValues")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("inputValues")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("inputValues")][QtModeling::DocumentationRole] = QStringLiteral("Provides input to the action.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("inputValues")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("inputValues")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("inputValues")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("languages")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("languages")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOpaqueAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("languages")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("languages")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("languages")][QtModeling::DocumentationRole] = QStringLiteral("Languages the body strings use, in the same order as the body strings");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("languages")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("languages")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("languages")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("outputValues")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("outputValues")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOpaqueAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("outputValues")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("outputValues")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("outputValues")][QtModeling::DocumentationRole] = QStringLiteral("Takes output from the action.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("outputValues")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("outputValues")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("outputValues")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlopaqueaction.h b/src/uml/qumlopaqueaction.h
index 0cd44214..7f8d7619 100644
--- a/src/uml/qumlopaqueaction.h
+++ b/src/uml/qumlopaqueaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlOutputPin;
 class Q_UML_EXPORT QUmlOpaqueAction : public QUmlAction
 {
 public:
-    explicit QUmlOpaqueAction(bool createQObject = true);
+    explicit QUmlOpaqueAction(bool createQModelingObject = true);
     virtual ~QUmlOpaqueAction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QList<QString> bodies() const;
@@ -82,9 +81,6 @@ protected:
     QSet<QUmlInputPin *> _inputValues;
     QList<QString> _languages;
     QSet<QUmlOutputPin *> _outputValues;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlopaquebehavior.cpp b/src/uml/qumlopaquebehavior.cpp
index a5676e2d..d146d5e3 100644
--- a/src/uml/qumlopaquebehavior.cpp
+++ b/src/uml/qumlopaquebehavior.cpp
@@ -90,24 +90,22 @@
 
     \brief An behavior with implementation-specific semantics.
  */
-QUmlOpaqueBehavior::QUmlOpaqueBehavior(bool createQObject)
+QUmlOpaqueBehavior::QUmlOpaqueBehavior(bool createQModelingObject)
 {
-    if (createQObject)
-        _qObject = new QUmlOpaqueBehaviorObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlOpaqueBehaviorObject(this));
 }
 
 QUmlOpaqueBehavior::~QUmlOpaqueBehavior()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlOpaqueBehavior::clone() const
+QModelingElement *QUmlOpaqueBehavior::clone() const
 {
     QUmlOpaqueBehavior *c = new QUmlOpaqueBehavior;
     foreach (QUmlComment *element, ownedComments())
@@ -248,91 +246,3 @@ void QUmlOpaqueBehavior::removeLanguage(QString language)
     }
 }
 
-void QUmlOpaqueBehavior::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedConnectors"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parts"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("roles"))));
-    _groupProperties.insert(QStringLiteral("QUmlEncapsulatedClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedPorts"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifierBehavior"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interfaceRealizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedBehaviors"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extensions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isActive"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedReceptions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superClasses"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameters"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameterSets"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("postconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("preconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedBehaviors"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("specification"))));
-    _groupProperties.insert(QStringLiteral("QUmlOpaqueBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("bodies"))));
-    _groupProperties.insert(QStringLiteral("QUmlOpaqueBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("languages"))));
-}
-
-void QUmlOpaqueBehavior::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueBehavior")][QStringLiteral("bodies")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueBehavior")][QStringLiteral("bodies")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOpaqueBehavior");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueBehavior")][QStringLiteral("bodies")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueBehavior")][QStringLiteral("bodies")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueBehavior")][QStringLiteral("bodies")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the behavior in one or more languages.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueBehavior")][QStringLiteral("bodies")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueBehavior")][QStringLiteral("bodies")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueBehavior")][QStringLiteral("bodies")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueBehavior")][QStringLiteral("languages")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueBehavior")][QStringLiteral("languages")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOpaqueBehavior");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueBehavior")][QStringLiteral("languages")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueBehavior")][QStringLiteral("languages")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueBehavior")][QStringLiteral("languages")][QtModeling::DocumentationRole] = QStringLiteral("Languages the body strings use in the same order as the body strings.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueBehavior")][QStringLiteral("languages")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueBehavior")][QStringLiteral("languages")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueBehavior")][QStringLiteral("languages")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlopaquebehavior.h b/src/uml/qumlopaquebehavior.h
index e2c76499..3e4de6f4 100644
--- a/src/uml/qumlopaquebehavior.h
+++ b/src/uml/qumlopaquebehavior.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlBehavior>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,10 +54,10 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlOpaqueBehavior : public QUmlBehavior
 {
 public:
-    explicit QUmlOpaqueBehavior(bool createQObject = true);
+    explicit QUmlOpaqueBehavior(bool createQModelingObject = true);
     virtual ~QUmlOpaqueBehavior();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QList<QString> bodies() const;
@@ -71,9 +70,6 @@ public:
 protected:
     QList<QString> _bodies;
     QList<QString> _languages;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlopaqueexpression.cpp b/src/uml/qumlopaqueexpression.cpp
index 7a56e5b2..1b901bcb 100644
--- a/src/uml/qumlopaqueexpression.cpp
+++ b/src/uml/qumlopaqueexpression.cpp
@@ -62,25 +62,23 @@
 
     \brief An opaque expression is an uninterpreted textual statement that denotes a (possibly empty) set of values when evaluated in a context.Provides a mechanism for precisely defining the behavior of an opaque expression. An opaque expression is defined by a behavior restricted to return one result.
  */
-QUmlOpaqueExpression::QUmlOpaqueExpression(bool createQObject) :
+QUmlOpaqueExpression::QUmlOpaqueExpression(bool createQModelingObject) :
     _behavior(0)
 {
-    if (createQObject)
-        _qObject = new QUmlOpaqueExpressionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlOpaqueExpressionObject(this));
 }
 
 QUmlOpaqueExpression::~QUmlOpaqueExpression()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlOpaqueExpression::clone() const
+QModelingElement *QUmlOpaqueExpression::clone() const
 {
     QUmlOpaqueExpression *c = new QUmlOpaqueExpression;
     foreach (QUmlComment *element, ownedComments())
@@ -124,8 +122,8 @@ void QUmlOpaqueExpression::setBehavior(QUmlBehavior *behavior)
 
     if (_behavior != behavior) {
         _behavior = behavior;
-        if (behavior && behavior->asQObject() && this->asQObject())
-            QObject::connect(behavior->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setBehavior()));
+        if (behavior && behavior->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(behavior->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setBehavior()));
     }
 }
 
@@ -251,65 +249,3 @@ int QUmlOpaqueExpression::value() const
     return int ();
 }
 
-void QUmlOpaqueExpression::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlOpaqueExpression"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("behavior"))));
-    _groupProperties.insert(QStringLiteral("QUmlOpaqueExpression"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("bodies"))));
-    _groupProperties.insert(QStringLiteral("QUmlOpaqueExpression"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("languages"))));
-    _groupProperties.insert(QStringLiteral("QUmlOpaqueExpression"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("result"))));
-}
-
-void QUmlOpaqueExpression::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("behavior")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("behavior")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOpaqueExpression");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("behavior")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("behavior")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("behavior")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the behavior of the opaque expression.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("behavior")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("behavior")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("behavior")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("bodies")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("bodies")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOpaqueExpression");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("bodies")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("bodies")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("bodies")][QtModeling::DocumentationRole] = QStringLiteral("The text of the expression, possibly in multiple languages.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("bodies")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("bodies")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("bodies")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("languages")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("languages")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOpaqueExpression");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("languages")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("languages")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("languages")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the languages in which the expression is stated. The interpretation of the expression body depends on the languages. If the languages are unspecified, they might be implicit from the expression body or the context. Languages are matched to body strings by order.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("languages")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("languages")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("languages")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("result")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOpaqueExpression");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("result")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("result")][QtModeling::DocumentationRole] = QStringLiteral("Restricts an opaque expression to return exactly one return result. When the invocation of the opaque expression completes, a single set of values is returned to its owner. This association is derived from the single return result parameter of the associated behavior.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlopaqueexpression.h b/src/uml/qumlopaqueexpression.h
index 87cfb01f..588952b6 100644
--- a/src/uml/qumlopaqueexpression.h
+++ b/src/uml/qumlopaqueexpression.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlValueSpecification>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlParameter;
 class Q_UML_EXPORT QUmlOpaqueExpression : public QUmlValueSpecification
 {
 public:
-    explicit QUmlOpaqueExpression(bool createQObject = true);
+    explicit QUmlOpaqueExpression(bool createQModelingObject = true);
     virtual ~QUmlOpaqueExpression();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlBehavior *behavior() const;
@@ -85,9 +84,6 @@ protected:
     QUmlBehavior *_behavior;
     QList<QString> _bodies;
     QList<QString> _languages;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumloperation.cpp b/src/uml/qumloperation.cpp
index e716c0d3..2fdc8d4c 100644
--- a/src/uml/qumloperation.cpp
+++ b/src/uml/qumloperation.cpp
@@ -75,7 +75,7 @@
 
     \brief An operation is a behavioral feature of a classifier that specifies the name, type, parameters, and constraints for invoking an associated behavior.An operation may invoke both the execution of method behaviors as well as other behavioral responses.Operation specializes TemplateableElement in order to support specification of template operations and bound operations. Operation specializes ParameterableElement to specify that an operation can be exposed as a formal template parameter, and provided as an actual parameter in a binding of a template.
  */
-QUmlOperation::QUmlOperation(bool createQObject) :
+QUmlOperation::QUmlOperation(bool createQModelingObject) :
     _bodyCondition(0),
     _class_(0),
     _datatype(0),
@@ -83,22 +83,20 @@ QUmlOperation::QUmlOperation(bool createQObject) :
     _isQuery(false),
     _templateParameter(0)
 {
-    if (createQObject)
-        _qObject = new QUmlOperationObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlOperationObject(this));
 }
 
 QUmlOperation::~QUmlOperation()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlOperation::clone() const
+QModelingElement *QUmlOperation::clone() const
 {
     QUmlOperation *c = new QUmlOperation;
     foreach (QUmlComment *element, ownedComments())
@@ -174,9 +172,9 @@ void QUmlOperation::setBodyCondition(QUmlConstraint *bodyCondition)
         removeOwnedRule(_bodyCondition);
 
         _bodyCondition = bodyCondition;
-        if (bodyCondition && bodyCondition->asQObject() && this->asQObject())
-            QObject::connect(bodyCondition->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setBodyCondition()));
-        bodyCondition->asQObject()->setParent(this->asQObject());
+        if (bodyCondition && bodyCondition->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(bodyCondition->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setBodyCondition()));
+        bodyCondition->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (bodyCondition) {
@@ -205,8 +203,8 @@ void QUmlOperation::setClass(QUmlClass *class_)
         removeRedefinitionContext(_class_);
 
         _class_ = class_;
-        if (class_ && class_->asQObject() && this->asQObject())
-            QObject::connect(class_->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setClass()));
+        if (class_ && class_->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(class_->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setClass()));
 
         // Adjust subsetted properties
         if (class_) {
@@ -239,8 +237,8 @@ void QUmlOperation::setDatatype(QUmlDataType *datatype)
         removeRedefinitionContext(_datatype);
 
         _datatype = datatype;
-        if (datatype && datatype->asQObject() && this->asQObject())
-            QObject::connect(datatype->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setDatatype()));
+        if (datatype && datatype->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(datatype->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setDatatype()));
 
         // Adjust subsetted properties
         if (datatype) {
@@ -273,8 +271,8 @@ void QUmlOperation::setInterface(QUmlInterface *interface_)
         removeRedefinitionContext(_interface_);
 
         _interface_ = interface_;
-        if (interface_ && interface_->asQObject() && this->asQObject())
-            QObject::connect(interface_->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setInterface()));
+        if (interface_ && interface_->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(interface_->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setInterface()));
 
         // Adjust subsetted properties
         if (interface_) {
@@ -327,7 +325,7 @@ void QUmlOperation::setQuery(bool isQuery)
 
     if (_isQuery != isQuery) {
         _isQuery = isQuery;
-        _modifiedResettableProperties << QStringLiteral("isQuery");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isQuery");
     }
 }
 
@@ -395,9 +393,9 @@ void QUmlOperation::addOwnedParameter(QUmlParameter *ownedParameter)
 
     if (!_ownedParameters.contains(ownedParameter)) {
         _ownedParameters.append(ownedParameter);
-        if (ownedParameter && ownedParameter->asQObject() && this->asQObject())
-            QObject::connect(ownedParameter->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeOwnedParameter(QObject *)));
-        ownedParameter->asQObject()->setParent(this->asQObject());
+        if (ownedParameter && ownedParameter->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(ownedParameter->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeOwnedParameter(QObject *)));
+        ownedParameter->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust opposite properties
         if (ownedParameter) {
@@ -412,8 +410,8 @@ void QUmlOperation::removeOwnedParameter(QUmlParameter *ownedParameter)
 
     if (_ownedParameters.contains(ownedParameter)) {
         _ownedParameters.removeAll(ownedParameter);
-        if (ownedParameter->asQObject())
-            ownedParameter->asQObject()->setParent(0);
+        if (ownedParameter->asQModelingObject())
+            ownedParameter->asQModelingObject()->setParent(0);
 
         // Adjust opposite properties
         if (ownedParameter) {
@@ -438,9 +436,9 @@ void QUmlOperation::addPostcondition(QUmlConstraint *postcondition)
 
     if (!_postconditions.contains(postcondition)) {
         _postconditions.insert(postcondition);
-        if (postcondition && postcondition->asQObject() && this->asQObject())
-            QObject::connect(postcondition->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removePostcondition(QObject *)));
-        postcondition->asQObject()->setParent(this->asQObject());
+        if (postcondition && postcondition->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(postcondition->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removePostcondition(QObject *)));
+        postcondition->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedRule(postcondition);
@@ -453,8 +451,8 @@ void QUmlOperation::removePostcondition(QUmlConstraint *postcondition)
 
     if (_postconditions.contains(postcondition)) {
         _postconditions.remove(postcondition);
-        if (postcondition->asQObject())
-            postcondition->asQObject()->setParent(0);
+        if (postcondition->asQModelingObject())
+            postcondition->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedRule(postcondition);
@@ -477,9 +475,9 @@ void QUmlOperation::addPrecondition(QUmlConstraint *precondition)
 
     if (!_preconditions.contains(precondition)) {
         _preconditions.insert(precondition);
-        if (precondition && precondition->asQObject() && this->asQObject())
-            QObject::connect(precondition->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removePrecondition(QObject *)));
-        precondition->asQObject()->setParent(this->asQObject());
+        if (precondition && precondition->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(precondition->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removePrecondition(QObject *)));
+        precondition->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedRule(precondition);
@@ -492,8 +490,8 @@ void QUmlOperation::removePrecondition(QUmlConstraint *precondition)
 
     if (_preconditions.contains(precondition)) {
         _preconditions.remove(precondition);
-        if (precondition->asQObject())
-            precondition->asQObject()->setParent(0);
+        if (precondition->asQModelingObject())
+            precondition->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedRule(precondition);
@@ -516,8 +514,8 @@ void QUmlOperation::addRaisedException(QUmlType *raisedException)
 
     if (!_raisedExceptions.contains(raisedException)) {
         _raisedExceptions.insert(raisedException);
-        if (raisedException && raisedException->asQObject() && this->asQObject())
-            QObject::connect(raisedException->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeRaisedException(QObject *)));
+        if (raisedException && raisedException->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(raisedException->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeRaisedException(QObject *)));
     }
 }
 
@@ -546,8 +544,8 @@ void QUmlOperation::addRedefinedOperation(QUmlOperation *redefinedOperation)
 
     if (!_redefinedOperations.contains(redefinedOperation)) {
         _redefinedOperations.insert(redefinedOperation);
-        if (redefinedOperation && redefinedOperation->asQObject() && this->asQObject())
-            QObject::connect(redefinedOperation->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeRedefinedOperation(QObject *)));
+        if (redefinedOperation && redefinedOperation->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(redefinedOperation->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeRedefinedOperation(QObject *)));
 
         // Adjust subsetted properties
         addRedefinedElement(redefinedOperation);
@@ -582,8 +580,8 @@ void QUmlOperation::setTemplateParameter(QUmlOperationTemplateParameter *templat
 
     if (_templateParameter != templateParameter) {
         _templateParameter = templateParameter;
-        if (templateParameter && templateParameter->asQObject() && this->asQObject())
-            QObject::connect(templateParameter->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setTemplateParameter()));
+        if (templateParameter && templateParameter->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(templateParameter->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setTemplateParameter()));
     }
 }
 
@@ -658,200 +656,3 @@ QSet<QUmlParameter *> QUmlOperation::returnResult() const
     return QSet<QUmlParameter *> ();
 }
 
-void QUmlOperation::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("featuringClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isStatic"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioralFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("concurrency"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioralFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioralFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("methods"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioralFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameterSets"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlOperation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("bodyCondition"))));
-    _groupProperties.insert(QStringLiteral("QUmlOperation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("class_"))));
-    _groupProperties.insert(QStringLiteral("QUmlOperation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("datatype"))));
-    _groupProperties.insert(QStringLiteral("QUmlOperation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interface_"))));
-    _groupProperties.insert(QStringLiteral("QUmlOperation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isOrdered"))));
-    _groupProperties.insert(QStringLiteral("QUmlOperation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isQuery"))));
-    _groupProperties.insert(QStringLiteral("QUmlOperation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isUnique"))));
-    _groupProperties.insert(QStringLiteral("QUmlOperation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lower"))));
-    _groupProperties.insert(QStringLiteral("QUmlOperation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameters"))));
-    _groupProperties.insert(QStringLiteral("QUmlOperation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("postconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlOperation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("preconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlOperation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("raisedExceptions"))));
-    _groupProperties.insert(QStringLiteral("QUmlOperation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedOperations"))));
-    _groupProperties.insert(QStringLiteral("QUmlOperation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlOperation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
-    _groupProperties.insert(QStringLiteral("QUmlOperation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upper"))));
-}
-
-void QUmlOperation::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("bodyCondition")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("bodyCondition")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperation");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("bodyCondition")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("bodyCondition")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("bodyCondition")][QtModeling::DocumentationRole] = QStringLiteral("An optional Constraint on the result values of an invocation of this Operation.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("bodyCondition")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("bodyCondition")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedRule");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("bodyCondition")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("class_")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("class_")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperation");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("class_")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("class_")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("class_")][QtModeling::DocumentationRole] = QStringLiteral("The class that owns the operation.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("class_")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("class_")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Feature-featuringClassifier RedefinableElement-redefinitionContext NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("class_")][QtModeling::OppositeEndRole] = QStringLiteral("Class-ownedOperation");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("datatype")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("datatype")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperation");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("datatype")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("datatype")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("datatype")][QtModeling::DocumentationRole] = QStringLiteral("The DataType that owns this Operation.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("datatype")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("datatype")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Feature-featuringClassifier RedefinableElement-redefinitionContext NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("datatype")][QtModeling::OppositeEndRole] = QStringLiteral("DataType-ownedOperation");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("interface_")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("interface_")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperation");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("interface_")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("interface_")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("interface_")][QtModeling::DocumentationRole] = QStringLiteral("The Interface that owns this Operation.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("interface_")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("interface_")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Feature-featuringClassifier RedefinableElement-redefinitionContext NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("interface_")][QtModeling::OppositeEndRole] = QStringLiteral("Interface-ownedOperation");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("isOrdered")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("isOrdered")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperation");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("isOrdered")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("isOrdered")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("isOrdered")][QtModeling::DocumentationRole] = QStringLiteral("This information is derived from the return result for this Operation.Specifies whether the return parameter is ordered or not, if present.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("isOrdered")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("isOrdered")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("isOrdered")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("isQuery")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("isQuery")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperation");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("isQuery")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("isQuery")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("isQuery")][QtModeling::DocumentationRole] = QStringLiteral("Specifies whether an execution of the BehavioralFeature leaves the state of the system unchanged (isQuery=true) or whether side effects may occur (isQuery=false).");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("isQuery")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("isQuery")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("isQuery")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("isUnique")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("isUnique")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperation");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("isUnique")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("isUnique")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("isUnique")][QtModeling::DocumentationRole] = QStringLiteral("Specifies whether the return parameter is unique or not, if present.This information is derived from the return result for this Operation.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("isUnique")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("isUnique")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("isUnique")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("lower")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("lower")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperation");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("lower")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("lower")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("lower")][QtModeling::DocumentationRole] = QStringLiteral("This information is derived from the return result for this Operation.Specifies the lower multiplicity of the return parameter, if present.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("lower")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("lower")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("lower")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("ownedParameters")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("ownedParameters")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperation");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("ownedParameters")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("ownedParameters")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("ownedParameters")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the ordered set of formal parameters of this BehavioralFeature.Specifies the parameters owned by this Operation.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("ownedParameters")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("BehavioralFeature-ownedParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("ownedParameters")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("ownedParameters")][QtModeling::OppositeEndRole] = QStringLiteral("Parameter-operation");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("postconditions")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("postconditions")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperation");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("postconditions")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("postconditions")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("postconditions")][QtModeling::DocumentationRole] = QStringLiteral("An optional set of Constraints specifying the state of the system when the Operation is completed.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("postconditions")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("postconditions")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedRule");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("postconditions")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("preconditions")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("preconditions")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperation");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("preconditions")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("preconditions")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("preconditions")][QtModeling::DocumentationRole] = QStringLiteral("An optional set of Constraints on the state of the system when the Operation is invoked.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("preconditions")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("preconditions")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedRule");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("preconditions")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("raisedExceptions")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("raisedExceptions")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperation");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("raisedExceptions")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("raisedExceptions")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("raisedExceptions")][QtModeling::DocumentationRole] = QStringLiteral("References the Types representing exceptions that may be raised during an invocation of this operation.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("raisedExceptions")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("BehavioralFeature-raisedException");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("raisedExceptions")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("raisedExceptions")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("redefinedOperations")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("redefinedOperations")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperation");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("redefinedOperations")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("redefinedOperations")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("redefinedOperations")][QtModeling::DocumentationRole] = QStringLiteral("References the Operations that are redefined by this Operation.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("redefinedOperations")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("redefinedOperations")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("RedefinableElement-redefinedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("redefinedOperations")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("templateParameter")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("templateParameter")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperation");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("templateParameter")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("templateParameter")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("templateParameter")][QtModeling::DocumentationRole] = QStringLiteral("The template parameter that exposes this element as a formal parameter.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("templateParameter")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("ParameterableElement-templateParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("templateParameter")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("templateParameter")][QtModeling::OppositeEndRole] = QStringLiteral("OperationTemplateParameter-parameteredElement");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("type")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("type")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperation");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("type")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("type")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("type")][QtModeling::DocumentationRole] = QStringLiteral("This information is derived from the return result for this Operation.Specifies the return result of the operation, if present.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("type")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("type")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("type")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("upper")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("upper")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperation");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("upper")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("upper")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("upper")][QtModeling::DocumentationRole] = QStringLiteral("This information is derived from the return result for this Operation.Specifies the upper multiplicity of the return parameter, if present.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("upper")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("upper")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("upper")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumloperation.h b/src/uml/qumloperation.h
index 64f4d5d0..ad1c6a42 100644
--- a/src/uml/qumloperation.h
+++ b/src/uml/qumloperation.h
@@ -47,7 +47,6 @@
 #include <QtUml/QUmlBehavioralFeature>
 #include <QtUml/QUmlParameterableElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -66,10 +65,10 @@ class QUmlType;
 class Q_UML_EXPORT QUmlOperation : public QUmlTemplateableElement, public QUmlBehavioralFeature, public QUmlParameterableElement
 {
 public:
-    explicit QUmlOperation(bool createQObject = true);
+    explicit QUmlOperation(bool createQModelingObject = true);
     virtual ~QUmlOperation();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlConstraint *bodyCondition() const;
@@ -126,9 +125,6 @@ protected:
     QSet<QUmlType *> _raisedExceptions;
     QSet<QUmlOperation *> _redefinedOperations;
     QUmlOperationTemplateParameter *_templateParameter;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumloperationtemplateparameter.cpp b/src/uml/qumloperationtemplateparameter.cpp
index 45411a50..6a9b8a46 100644
--- a/src/uml/qumloperationtemplateparameter.cpp
+++ b/src/uml/qumloperationtemplateparameter.cpp
@@ -55,26 +55,24 @@
 
     \brief An operation template parameter exposes an operation as a formal parameter for a template.
  */
-QUmlOperationTemplateParameter::QUmlOperationTemplateParameter(bool createQObject) :
+QUmlOperationTemplateParameter::QUmlOperationTemplateParameter(bool createQModelingObject) :
     QUmlTemplateParameter(false),
     _parameteredElement(0)
 {
-    if (createQObject)
-        _qObject = new QUmlOperationTemplateParameterObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlOperationTemplateParameterObject(this));
 }
 
 QUmlOperationTemplateParameter::~QUmlOperationTemplateParameter()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlOperationTemplateParameter::clone() const
+QModelingElement *QUmlOperationTemplateParameter::clone() const
 {
     QUmlOperationTemplateParameter *c = new QUmlOperationTemplateParameter;
     foreach (QUmlComment *element, ownedComments())
@@ -110,35 +108,8 @@ void QUmlOperationTemplateParameter::setParameteredElement(QUmlOperation *parame
 
     if (_parameteredElement != parameteredElement) {
         _parameteredElement = parameteredElement;
-        if (parameteredElement && parameteredElement->asQObject() && this->asQObject())
-            QObject::connect(parameteredElement->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setParameteredElement()));
+        if (parameteredElement && parameteredElement->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(parameteredElement->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setParameteredElement()));
     }
 }
 
-void QUmlOperationTemplateParameter::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("default_"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedDefault"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameteredElement"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("signature"))));
-    _groupProperties.insert(QStringLiteral("QUmlOperationTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parameteredElement"))));
-}
-
-void QUmlOperationTemplateParameter::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperationTemplateParameter")][QStringLiteral("parameteredElement")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperationTemplateParameter")][QStringLiteral("parameteredElement")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperationTemplateParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperationTemplateParameter")][QStringLiteral("parameteredElement")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperationTemplateParameter")][QStringLiteral("parameteredElement")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperationTemplateParameter")][QStringLiteral("parameteredElement")][QtModeling::DocumentationRole] = QStringLiteral("The operation for this template parameter.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperationTemplateParameter")][QStringLiteral("parameteredElement")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("TemplateParameter-parameteredElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperationTemplateParameter")][QStringLiteral("parameteredElement")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperationTemplateParameter")][QStringLiteral("parameteredElement")][QtModeling::OppositeEndRole] = QStringLiteral("Operation-templateParameter");
-
-}
-
diff --git a/src/uml/qumloperationtemplateparameter.h b/src/uml/qumloperationtemplateparameter.h
index 5995c4de..ce2f3de2 100644
--- a/src/uml/qumloperationtemplateparameter.h
+++ b/src/uml/qumloperationtemplateparameter.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlTemplateParameter>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlOperation;
 class Q_UML_EXPORT QUmlOperationTemplateParameter : public QUmlTemplateParameter
 {
 public:
-    explicit QUmlOperationTemplateParameter(bool createQObject = true);
+    explicit QUmlOperationTemplateParameter(bool createQModelingObject = true);
     virtual ~QUmlOperationTemplateParameter();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlOperation *parameteredElement() const;
@@ -68,9 +67,6 @@ public:
 
 protected:
     QUmlOperation *_parameteredElement;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumloutputpin.cpp b/src/uml/qumloutputpin.cpp
index 8d741216..1ccdfa60 100644
--- a/src/uml/qumloutputpin.cpp
+++ b/src/uml/qumloutputpin.cpp
@@ -71,24 +71,22 @@
 
     \brief An output pin is a pin that holds output values produced by an action.
  */
-QUmlOutputPin::QUmlOutputPin(bool createQObject)
+QUmlOutputPin::QUmlOutputPin(bool createQModelingObject)
 {
-    if (createQObject)
-        _qObject = new QUmlOutputPinObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlOutputPinObject(this));
 }
 
 QUmlOutputPin::~QUmlOutputPin()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlOutputPin::clone() const
+QModelingElement *QUmlOutputPin::clone() const
 {
     QUmlOutputPin *c = new QUmlOutputPin;
     foreach (QUmlComment *element, ownedComments())
@@ -134,46 +132,3 @@ QModelingObject *QUmlOutputPin::clone() const
     return c;
 }
 
-void QUmlOutputPin::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isOrdered"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isUnique"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lower"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lowerValue"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upper"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperValue"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStates"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isControlType"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ordering"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("selection"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperBound"))));
-    _groupProperties.insert(QStringLiteral("QUmlPin"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isControl"))));
-}
-
-void QUmlOutputPin::setPropertyData()
-{
-}
-
diff --git a/src/uml/qumloutputpin.h b/src/uml/qumloutputpin.h
index 591bf299..4b3c8f14 100644
--- a/src/uml/qumloutputpin.h
+++ b/src/uml/qumloutputpin.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlPin>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,16 +54,13 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlOutputPin : public QUmlPin
 {
 public:
-    explicit QUmlOutputPin(bool createQObject = true);
+    explicit QUmlOutputPin(bool createQModelingObject = true);
     virtual ~QUmlOutputPin();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
 
 protected:
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlpackage.cpp b/src/uml/qumlpackage.cpp
index 46ab86c3..8274f6eb 100644
--- a/src/uml/qumlpackage.cpp
+++ b/src/uml/qumlpackage.cpp
@@ -69,25 +69,23 @@
 
     \brief A package can have one or more profile applications to indicate which profiles have been applied. Because a profile is a package, it is possible to apply a profile not only to packages, but also to profiles.Package specializes TemplateableElement and PackageableElement specializes ParameterableElement to specify that a package can be used as a template and a PackageableElement as a template parameter.A package is used to group elements, and provides a namespace for the grouped elements.
  */
-QUmlPackage::QUmlPackage(bool createQObject) :
+QUmlPackage::QUmlPackage(bool createQModelingObject) :
     _nestingPackage(0)
 {
-    if (createQObject)
-        _qObject = new QUmlPackageObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlPackageObject(this));
 }
 
 QUmlPackage::~QUmlPackage()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlPackage::clone() const
+QModelingElement *QUmlPackage::clone() const
 {
     QUmlPackage *c = new QUmlPackage;
     foreach (QUmlComment *element, ownedComments())
@@ -201,8 +199,8 @@ void QUmlPackage::setNestingPackage(QUmlPackage *nestingPackage)
 
     if (_nestingPackage != nestingPackage) {
         _nestingPackage = nestingPackage;
-        if (nestingPackage && nestingPackage->asQObject() && this->asQObject())
-            QObject::connect(nestingPackage->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setNestingPackage()));
+        if (nestingPackage && nestingPackage->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(nestingPackage->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setNestingPackage()));
     }
 }
 
@@ -306,9 +304,9 @@ void QUmlPackage::addPackageMerge(QUmlPackageMerge *packageMerge)
 
     if (!_packageMerges.contains(packageMerge)) {
         _packageMerges.insert(packageMerge);
-        if (packageMerge && packageMerge->asQObject() && this->asQObject())
-            QObject::connect(packageMerge->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removePackageMerge(QObject *)));
-        packageMerge->asQObject()->setParent(this->asQObject());
+        if (packageMerge && packageMerge->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(packageMerge->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removePackageMerge(QObject *)));
+        packageMerge->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(packageMerge);
@@ -326,8 +324,8 @@ void QUmlPackage::removePackageMerge(QUmlPackageMerge *packageMerge)
 
     if (_packageMerges.contains(packageMerge)) {
         _packageMerges.remove(packageMerge);
-        if (packageMerge->asQObject())
-            packageMerge->asQObject()->setParent(0);
+        if (packageMerge->asQModelingObject())
+            packageMerge->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(packageMerge);
@@ -355,9 +353,9 @@ void QUmlPackage::addPackagedElement(QUmlPackageableElement *packagedElement)
 
     if (!_packagedElements.contains(packagedElement)) {
         _packagedElements.insert(packagedElement);
-        if (packagedElement && packagedElement->asQObject() && this->asQObject())
-            QObject::connect(packagedElement->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removePackagedElement(QObject *)));
-        packagedElement->asQObject()->setParent(this->asQObject());
+        if (packagedElement && packagedElement->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(packagedElement->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removePackagedElement(QObject *)));
+        packagedElement->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedMember(packagedElement);
@@ -370,8 +368,8 @@ void QUmlPackage::removePackagedElement(QUmlPackageableElement *packagedElement)
 
     if (_packagedElements.contains(packagedElement)) {
         _packagedElements.remove(packagedElement);
-        if (packagedElement->asQObject())
-            packagedElement->asQObject()->setParent(0);
+        if (packagedElement->asQModelingObject())
+            packagedElement->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedMember(packagedElement);
@@ -394,9 +392,9 @@ void QUmlPackage::addProfileApplication(QUmlProfileApplication *profileApplicati
 
     if (!_profileApplications.contains(profileApplication)) {
         _profileApplications.insert(profileApplication);
-        if (profileApplication && profileApplication->asQObject() && this->asQObject())
-            QObject::connect(profileApplication->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeProfileApplication(QObject *)));
-        profileApplication->asQObject()->setParent(this->asQObject());
+        if (profileApplication && profileApplication->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(profileApplication->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeProfileApplication(QObject *)));
+        profileApplication->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(profileApplication);
@@ -414,8 +412,8 @@ void QUmlPackage::removeProfileApplication(QUmlProfileApplication *profileApplic
 
     if (_profileApplications.contains(profileApplication)) {
         _profileApplications.remove(profileApplication);
-        if (profileApplication->asQObject())
-            profileApplication->asQObject()->setParent(0);
+        if (profileApplication->asQModelingObject())
+            profileApplication->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(profileApplication);
@@ -480,113 +478,3 @@ QSet<QUmlPackageableElement *> QUmlPackage::visibleMembers() const
     return QSet<QUmlPackageableElement *> ();
 }
 
-void QUmlPackage::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QObject"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("objectName"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("URI"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedPackages"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestingPackage"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedStereotypes"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTypes"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageMerges"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packagedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("profileApplications"))));
-}
-
-void QUmlPackage::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("URI")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("URI")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPackage");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("URI")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("URI")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("URI")][QtModeling::DocumentationRole] = QStringLiteral("Provides an identifier for the package that can be used for many purposes. A URI is the universally unique identification of the package following the IETF URI specification, RFC 2396 http://www.ietf.org/rfc/rfc2396.txt and it must comply with those syntax rules.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("URI")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("URI")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("URI")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("nestedPackages")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("nestedPackages")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPackage");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("nestedPackages")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("nestedPackages")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("nestedPackages")][QtModeling::DocumentationRole] = QStringLiteral("References the packaged elements that are Packages.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("nestedPackages")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("nestedPackages")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Package-packagedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("nestedPackages")][QtModeling::OppositeEndRole] = QStringLiteral("Package-nestingPackage");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("nestingPackage")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("nestingPackage")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPackage");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("nestingPackage")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("nestingPackage")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("nestingPackage")][QtModeling::DocumentationRole] = QStringLiteral("References the Package that owns this Package.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("nestingPackage")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("nestingPackage")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_packagedElement_owningPackage-owningPackage");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("nestingPackage")][QtModeling::OppositeEndRole] = QStringLiteral("Package-nestedPackage");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("ownedStereotypes")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("ownedStereotypes")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPackage");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("ownedStereotypes")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("ownedStereotypes")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("ownedStereotypes")][QtModeling::DocumentationRole] = QStringLiteral("References the Stereotypes that are owned by the Package");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("ownedStereotypes")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("ownedStereotypes")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Package-packagedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("ownedStereotypes")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("ownedTypes")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("ownedTypes")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPackage");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("ownedTypes")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("ownedTypes")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("ownedTypes")][QtModeling::DocumentationRole] = QStringLiteral("References the packaged elements that are Types.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("ownedTypes")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("ownedTypes")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Package-packagedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("ownedTypes")][QtModeling::OppositeEndRole] = QStringLiteral("Type-package");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("packageMerges")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("packageMerges")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPackage");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("packageMerges")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("packageMerges")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("packageMerges")][QtModeling::DocumentationRole] = QStringLiteral("References the PackageMerges that are owned by this Package.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("packageMerges")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("packageMerges")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_source_directedRelationship-directedRelationship Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("packageMerges")][QtModeling::OppositeEndRole] = QStringLiteral("PackageMerge-receivingPackage");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("packagedElements")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("packagedElements")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPackage");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("packagedElements")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("packagedElements")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("packagedElements")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the packageable elements that are owned by this Package.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("packagedElements")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("packagedElements")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("packagedElements")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("profileApplications")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("profileApplications")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPackage");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("profileApplications")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("profileApplications")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("profileApplications")][QtModeling::DocumentationRole] = QStringLiteral("References the ProfileApplications that indicate which profiles have been applied to the Package.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("profileApplications")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("profileApplications")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_source_directedRelationship-directedRelationship Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("profileApplications")][QtModeling::OppositeEndRole] = QStringLiteral("ProfileApplication-applyingPackage");
-
-}
-
diff --git a/src/uml/qumlpackage.h b/src/uml/qumlpackage.h
index 92ff2cfa..7333a654 100644
--- a/src/uml/qumlpackage.h
+++ b/src/uml/qumlpackage.h
@@ -47,7 +47,6 @@
 #include <QtUml/QUmlPackageableElement>
 #include <QtUml/QUmlTemplateableElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -64,10 +63,10 @@ class QUmlType;
 class Q_UML_EXPORT QUmlPackage : public QUmlNamespace, public QUmlPackageableElement, public QUmlTemplateableElement
 {
 public:
-    explicit QUmlPackage(bool createQObject = true);
+    explicit QUmlPackage(bool createQModelingObject = true);
     virtual ~QUmlPackage();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QString URI() const;
@@ -106,9 +105,6 @@ protected:
     QSet<QUmlPackageMerge *> _packageMerges;
     QSet<QUmlPackageableElement *> _packagedElements;
     QSet<QUmlProfileApplication *> _profileApplications;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlpackageableelement.cpp b/src/uml/qumlpackageableelement.cpp
index 3b89bd6f..020717e4 100644
--- a/src/uml/qumlpackageableelement.cpp
+++ b/src/uml/qumlpackageableelement.cpp
@@ -60,15 +60,13 @@
 QUmlPackageableElement::QUmlPackageableElement() :
     _visibility(QtUml::VisibilityKindPublic)
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlPackageableElement::~QUmlPackageableElement()
 {
 }
 
-QModelingObject *QUmlPackageableElement::clone() const
+QModelingElement *QUmlPackageableElement::clone() const
 {
     QUmlPackageableElement *c = new QUmlPackageableElement;
     foreach (QUmlComment *element, ownedComments())
@@ -104,37 +102,7 @@ void QUmlPackageableElement::setVisibility(QtUml::VisibilityKind visibility)
 
     if (_visibility != visibility) {
         _visibility = visibility;
-        _modifiedResettableProperties << QStringLiteral("visibility");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("visibility");
     }
 }
 
-void QUmlPackageableElement::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-}
-
-void QUmlPackageableElement::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageableElement")][QStringLiteral("visibility")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageableElement")][QStringLiteral("visibility")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPackageableElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageableElement")][QStringLiteral("visibility")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageableElement")][QStringLiteral("visibility")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageableElement")][QStringLiteral("visibility")][QtModeling::DocumentationRole] = QStringLiteral("Indicates that packageable elements must always have a visibility, i.e., visibility is not optional.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageableElement")][QStringLiteral("visibility")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("NamedElement-visibility");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageableElement")][QStringLiteral("visibility")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageableElement")][QStringLiteral("visibility")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlpackageableelement.h b/src/uml/qumlpackageableelement.h
index 540a7131..b308413f 100644
--- a/src/uml/qumlpackageableelement.h
+++ b/src/uml/qumlpackageableelement.h
@@ -48,7 +48,6 @@
 
 
 #include <QtUml/QtUmlNamespace>
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -60,7 +59,7 @@ class Q_UML_EXPORT QUmlPackageableElement : public QUmlParameterableElement, pub
 public:
     virtual ~QUmlPackageableElement();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     QtUml::VisibilityKind visibility() const;
@@ -70,9 +69,6 @@ protected:
     explicit QUmlPackageableElement();
 
     QtUml::VisibilityKind _visibility;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlpackageimport.cpp b/src/uml/qumlpackageimport.cpp
index 5efdadab..8b2777e6 100644
--- a/src/uml/qumlpackageimport.cpp
+++ b/src/uml/qumlpackageimport.cpp
@@ -54,27 +54,25 @@
 
     \brief A package import is a relationship that allows the use of unqualified names to refer to package members from other namespaces.
  */
-QUmlPackageImport::QUmlPackageImport(bool createQObject) :
+QUmlPackageImport::QUmlPackageImport(bool createQModelingObject) :
     _importedPackage(0),
     _importingNamespace(0),
     _visibility(QtUml::VisibilityKindPublic)
 {
-    if (createQObject)
-        _qObject = new QUmlPackageImportObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlPackageImportObject(this));
 }
 
 QUmlPackageImport::~QUmlPackageImport()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlPackageImport::clone() const
+QModelingElement *QUmlPackageImport::clone() const
 {
     QUmlPackageImport *c = new QUmlPackageImport;
     foreach (QUmlComment *element, ownedComments())
@@ -108,8 +106,8 @@ void QUmlPackageImport::setImportedPackage(QUmlPackage *importedPackage)
         removeTarget(_importedPackage);
 
         _importedPackage = importedPackage;
-        if (importedPackage && importedPackage->asQObject() && this->asQObject())
-            QObject::connect(importedPackage->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setImportedPackage()));
+        if (importedPackage && importedPackage->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(importedPackage->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setImportedPackage()));
 
         // Adjust subsetted properties
         if (importedPackage) {
@@ -137,8 +135,8 @@ void QUmlPackageImport::setImportingNamespace(QUmlNamespace *importingNamespace)
         removeSource(_importingNamespace);
 
         _importingNamespace = importingNamespace;
-        if (importingNamespace && importingNamespace->asQObject() && this->asQObject())
-            QObject::connect(importingNamespace->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setImportingNamespace()));
+        if (importingNamespace && importingNamespace->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(importingNamespace->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setImportingNamespace()));
 
         // Adjust subsetted properties
         setOwner(importingNamespace);
@@ -164,53 +162,7 @@ void QUmlPackageImport::setVisibility(QtUml::VisibilityKind visibility)
 
     if (_visibility != visibility) {
         _visibility = visibility;
-        _modifiedResettableProperties << QStringLiteral("visibility");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("visibility");
     }
 }
 
-void QUmlPackageImport::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageImport"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedPackage"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageImport"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importingNamespace"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageImport"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-}
-
-void QUmlPackageImport::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageImport")][QStringLiteral("importedPackage")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageImport")][QStringLiteral("importedPackage")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPackageImport");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageImport")][QStringLiteral("importedPackage")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageImport")][QStringLiteral("importedPackage")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageImport")][QStringLiteral("importedPackage")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the Package whose members are imported into a Namespace.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageImport")][QStringLiteral("importedPackage")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageImport")][QStringLiteral("importedPackage")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("DirectedRelationship-target");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageImport")][QStringLiteral("importedPackage")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageImport")][QStringLiteral("importingNamespace")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageImport")][QStringLiteral("importingNamespace")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPackageImport");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageImport")][QStringLiteral("importingNamespace")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageImport")][QStringLiteral("importingNamespace")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageImport")][QStringLiteral("importingNamespace")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the Namespace that imports the members from a Package.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageImport")][QStringLiteral("importingNamespace")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageImport")][QStringLiteral("importingNamespace")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner DirectedRelationship-source");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageImport")][QStringLiteral("importingNamespace")][QtModeling::OppositeEndRole] = QStringLiteral("Namespace-packageImport");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageImport")][QStringLiteral("visibility")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageImport")][QStringLiteral("visibility")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPackageImport");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageImport")][QStringLiteral("visibility")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageImport")][QStringLiteral("visibility")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageImport")][QStringLiteral("visibility")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the visibility of the imported PackageableElements within the importing Namespace, i.e., whether imported elements will in turn be visible to other packages that use that importingPackage as an importedPackage. If the PackageImport is public, the imported elements will be visible outside the package, while if it is private they will not.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageImport")][QStringLiteral("visibility")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageImport")][QStringLiteral("visibility")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageImport")][QStringLiteral("visibility")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlpackageimport.h b/src/uml/qumlpackageimport.h
index 6ebe0a72..848f0511 100644
--- a/src/uml/qumlpackageimport.h
+++ b/src/uml/qumlpackageimport.h
@@ -47,7 +47,6 @@
 
 
 #include <QtUml/QtUmlNamespace>
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -60,10 +59,10 @@ class QUmlPackage;
 class Q_UML_EXPORT QUmlPackageImport : public QUmlDirectedRelationship
 {
 public:
-    explicit QUmlPackageImport(bool createQObject = true);
+    explicit QUmlPackageImport(bool createQModelingObject = true);
     virtual ~QUmlPackageImport();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlPackage *importedPackage() const;
@@ -77,9 +76,6 @@ protected:
     QUmlPackage *_importedPackage;
     QUmlNamespace *_importingNamespace;
     QtUml::VisibilityKind _visibility;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlpackagemerge.cpp b/src/uml/qumlpackagemerge.cpp
index c5840f04..d948b9d8 100644
--- a/src/uml/qumlpackagemerge.cpp
+++ b/src/uml/qumlpackagemerge.cpp
@@ -53,26 +53,24 @@
 
     \brief A package merge defines how the contents of one package are extended by the contents of another package.
  */
-QUmlPackageMerge::QUmlPackageMerge(bool createQObject) :
+QUmlPackageMerge::QUmlPackageMerge(bool createQModelingObject) :
     _mergedPackage(0),
     _receivingPackage(0)
 {
-    if (createQObject)
-        _qObject = new QUmlPackageMergeObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlPackageMergeObject(this));
 }
 
 QUmlPackageMerge::~QUmlPackageMerge()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlPackageMerge::clone() const
+QModelingElement *QUmlPackageMerge::clone() const
 {
     QUmlPackageMerge *c = new QUmlPackageMerge;
     foreach (QUmlComment *element, ownedComments())
@@ -105,8 +103,8 @@ void QUmlPackageMerge::setMergedPackage(QUmlPackage *mergedPackage)
         removeTarget(_mergedPackage);
 
         _mergedPackage = mergedPackage;
-        if (mergedPackage && mergedPackage->asQObject() && this->asQObject())
-            QObject::connect(mergedPackage->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setMergedPackage()));
+        if (mergedPackage && mergedPackage->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(mergedPackage->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setMergedPackage()));
 
         // Adjust subsetted properties
         if (mergedPackage) {
@@ -134,8 +132,8 @@ void QUmlPackageMerge::setReceivingPackage(QUmlPackage *receivingPackage)
         removeSource(_receivingPackage);
 
         _receivingPackage = receivingPackage;
-        if (receivingPackage && receivingPackage->asQObject() && this->asQObject())
-            QObject::connect(receivingPackage->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setReceivingPackage()));
+        if (receivingPackage && receivingPackage->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(receivingPackage->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setReceivingPackage()));
 
         // Adjust subsetted properties
         setOwner(receivingPackage);
@@ -145,39 +143,3 @@ void QUmlPackageMerge::setReceivingPackage(QUmlPackage *receivingPackage)
     }
 }
 
-void QUmlPackageMerge::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageMerge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("mergedPackage"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageMerge"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("receivingPackage"))));
-}
-
-void QUmlPackageMerge::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageMerge")][QStringLiteral("mergedPackage")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageMerge")][QStringLiteral("mergedPackage")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPackageMerge");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageMerge")][QStringLiteral("mergedPackage")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageMerge")][QStringLiteral("mergedPackage")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageMerge")][QStringLiteral("mergedPackage")][QtModeling::DocumentationRole] = QStringLiteral("References the Package that is to be merged with the receiving package of the PackageMerge.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageMerge")][QStringLiteral("mergedPackage")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageMerge")][QStringLiteral("mergedPackage")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("DirectedRelationship-target");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageMerge")][QStringLiteral("mergedPackage")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageMerge")][QStringLiteral("receivingPackage")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageMerge")][QStringLiteral("receivingPackage")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPackageMerge");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageMerge")][QStringLiteral("receivingPackage")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageMerge")][QStringLiteral("receivingPackage")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageMerge")][QStringLiteral("receivingPackage")][QtModeling::DocumentationRole] = QStringLiteral("References the Package that is being extended with the contents of the merged package of the PackageMerge.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageMerge")][QStringLiteral("receivingPackage")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageMerge")][QStringLiteral("receivingPackage")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner DirectedRelationship-source");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackageMerge")][QStringLiteral("receivingPackage")][QtModeling::OppositeEndRole] = QStringLiteral("Package-packageMerge");
-
-}
-
diff --git a/src/uml/qumlpackagemerge.h b/src/uml/qumlpackagemerge.h
index 26c5fa82..51007821 100644
--- a/src/uml/qumlpackagemerge.h
+++ b/src/uml/qumlpackagemerge.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlDirectedRelationship>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlPackage;
 class Q_UML_EXPORT QUmlPackageMerge : public QUmlDirectedRelationship
 {
 public:
-    explicit QUmlPackageMerge(bool createQObject = true);
+    explicit QUmlPackageMerge(bool createQModelingObject = true);
     virtual ~QUmlPackageMerge();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlPackage *mergedPackage() const;
@@ -71,9 +70,6 @@ public:
 protected:
     QUmlPackage *_mergedPackage;
     QUmlPackage *_receivingPackage;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlparameter.cpp b/src/uml/qumlparameter.cpp
index 3ae2bcd7..757193ef 100644
--- a/src/uml/qumlparameter.cpp
+++ b/src/uml/qumlparameter.cpp
@@ -66,29 +66,27 @@
 
     \brief Parameters are allowed to be treated as connectable elements.A parameter is a specification of an argument used to pass information into or out of an invocation of a behavioral feature.Parameters have support for streaming, exceptions, and parameter sets.
  */
-QUmlParameter::QUmlParameter(bool createQObject) :
+QUmlParameter::QUmlParameter(bool createQModelingObject) :
     _defaultValue(0),
     _direction(QtUml::ParameterDirectionKindIn),
     _isException(false),
     _isStream(false),
     _operation(0)
 {
-    if (createQObject)
-        _qObject = new QUmlParameterObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlParameterObject(this));
 }
 
 QUmlParameter::~QUmlParameter()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlParameter::clone() const
+QModelingElement *QUmlParameter::clone() const
 {
     QUmlParameter *c = new QUmlParameter;
     foreach (QUmlComment *element, ownedComments())
@@ -169,9 +167,9 @@ void QUmlParameter::setDefaultValue(QUmlValueSpecification *defaultValue)
         removeOwnedElement(_defaultValue);
 
         _defaultValue = defaultValue;
-        if (defaultValue && defaultValue->asQObject() && this->asQObject())
-            QObject::connect(defaultValue->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setDefaultValue()));
-        defaultValue->asQObject()->setParent(this->asQObject());
+        if (defaultValue && defaultValue->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(defaultValue->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setDefaultValue()));
+        defaultValue->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (defaultValue) {
@@ -196,7 +194,7 @@ void QUmlParameter::setDirection(QtUml::ParameterDirectionKind direction)
 
     if (_direction != direction) {
         _direction = direction;
-        _modifiedResettableProperties << QStringLiteral("direction");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("direction");
     }
 }
 
@@ -235,7 +233,7 @@ void QUmlParameter::setException(bool isException)
 
     if (_isException != isException) {
         _isException = isException;
-        _modifiedResettableProperties << QStringLiteral("isException");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isException");
     }
 }
 
@@ -255,7 +253,7 @@ void QUmlParameter::setStream(bool isStream)
 
     if (_isStream != isStream) {
         _isStream = isStream;
-        _modifiedResettableProperties << QStringLiteral("isStream");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isStream");
     }
 }
 
@@ -275,8 +273,8 @@ void QUmlParameter::setOperation(QUmlOperation *operation)
 
     if (_operation != operation) {
         _operation = operation;
-        if (operation && operation->asQObject() && this->asQObject())
-            QObject::connect(operation->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setOperation()));
+        if (operation && operation->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(operation->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setOperation()));
     }
 }
 
@@ -296,8 +294,8 @@ void QUmlParameter::addParameterSet(QUmlParameterSet *parameterSet)
 
     if (!_parameterSets.contains(parameterSet)) {
         _parameterSets.insert(parameterSet);
-        if (parameterSet && parameterSet->asQObject() && this->asQObject())
-            QObject::connect(parameterSet->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeParameterSet(QObject *)));
+        if (parameterSet && parameterSet->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(parameterSet->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeParameterSet(QObject *)));
 
         // Adjust opposite properties
         if (parameterSet) {
@@ -320,112 +318,3 @@ void QUmlParameter::removeParameterSet(QUmlParameterSet *parameterSet)
     }
 }
 
-void QUmlParameter::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isOrdered"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isUnique"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lower"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lowerValue"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upper"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperValue"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlConnectableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ends"))));
-    _groupProperties.insert(QStringLiteral("QUmlConnectableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("default_"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("defaultValue"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("direction"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("effect"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isException"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isStream"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("operation"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parameterSets"))));
-}
-
-void QUmlParameter::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("default_")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("default_")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("default_")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("default_")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("default_")][QtModeling::DocumentationRole] = QStringLiteral("Specifies a String that represents a value to be used when no argument is supplied for the Parameter.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("default_")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("default_")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("default_")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("defaultValue")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("defaultValue")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("defaultValue")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("defaultValue")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("defaultValue")][QtModeling::DocumentationRole] = QStringLiteral("Specifies a ValueSpecification that represents a value to be used when no argument is supplied for the Parameter.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("defaultValue")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("defaultValue")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("defaultValue")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("direction")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("direction")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("direction")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("direction")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("direction")][QtModeling::DocumentationRole] = QStringLiteral("Indicates whether a parameter is being sent into or out of a behavioral element.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("direction")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("direction")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("direction")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("effect")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("effect")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("effect")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("effect")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("effect")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the effect that the owner of the parameter has on values passed in or out of the parameter.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("effect")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("effect")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("effect")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("isException")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("isException")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("isException")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("isException")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("isException")][QtModeling::DocumentationRole] = QStringLiteral("Tells whether an output parameter may emit a value to the exclusion of the other outputs.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("isException")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("isException")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("isException")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("isStream")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("isStream")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("isStream")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("isStream")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("isStream")][QtModeling::DocumentationRole] = QStringLiteral("Tells whether an input parameter may accept values while its behavior is executing, or whether an output parameter post values while the behavior is executing.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("isStream")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("isStream")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("isStream")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("operation")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("operation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("operation")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("operation")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("operation")][QtModeling::DocumentationRole] = QStringLiteral("References the Operation owning this parameter.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("operation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("operation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_ownedParameter_ownerFormalParam-ownerFormalParam");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("operation")][QtModeling::OppositeEndRole] = QStringLiteral("Operation-ownedParameter");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("parameterSets")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("parameterSets")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("parameterSets")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("parameterSets")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("parameterSets")][QtModeling::DocumentationRole] = QStringLiteral("The parameter sets containing the parameter. See ParameterSet.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("parameterSets")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("parameterSets")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("parameterSets")][QtModeling::OppositeEndRole] = QStringLiteral("ParameterSet-parameter");
-
-}
-
diff --git a/src/uml/qumlparameter.h b/src/uml/qumlparameter.h
index b85d90ce..832e0849 100644
--- a/src/uml/qumlparameter.h
+++ b/src/uml/qumlparameter.h
@@ -48,7 +48,6 @@
 
 
 #include <QtUml/QtUmlNamespace>
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -62,10 +61,10 @@ class QUmlValueSpecification;
 class Q_UML_EXPORT QUmlParameter : public QUmlMultiplicityElement, public QUmlConnectableElement
 {
 public:
-    explicit QUmlParameter(bool createQObject = true);
+    explicit QUmlParameter(bool createQModelingObject = true);
     virtual ~QUmlParameter();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QString default_() const;
@@ -94,9 +93,6 @@ protected:
     bool _isStream;
     QUmlOperation *_operation;
     QSet<QUmlParameterSet *> _parameterSets;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlparameterableelement.cpp b/src/uml/qumlparameterableelement.cpp
index 53d85522..4ffcf5eb 100644
--- a/src/uml/qumlparameterableelement.cpp
+++ b/src/uml/qumlparameterableelement.cpp
@@ -55,15 +55,13 @@ QUmlParameterableElement::QUmlParameterableElement() :
     _owningTemplateParameter(0),
     _templateParameter(0)
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlParameterableElement::~QUmlParameterableElement()
 {
 }
 
-QModelingObject *QUmlParameterableElement::clone() const
+QModelingElement *QUmlParameterableElement::clone() const
 {
     QUmlParameterableElement *c = new QUmlParameterableElement;
     foreach (QUmlComment *element, ownedComments())
@@ -95,8 +93,8 @@ void QUmlParameterableElement::setOwningTemplateParameter(QUmlTemplateParameter
         // Adjust subsetted properties
 
         _owningTemplateParameter = owningTemplateParameter;
-        if (owningTemplateParameter && owningTemplateParameter->asQObject() && this->asQObject())
-            QObject::connect(owningTemplateParameter->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setOwningTemplateParameter()));
+        if (owningTemplateParameter && owningTemplateParameter->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(owningTemplateParameter->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setOwningTemplateParameter()));
 
         // Adjust subsetted properties
         setTemplateParameter(owningTemplateParameter);
@@ -120,8 +118,8 @@ void QUmlParameterableElement::setTemplateParameter(QUmlTemplateParameter *templ
 
     if (_templateParameter != templateParameter) {
         _templateParameter = templateParameter;
-        if (templateParameter && templateParameter->asQObject() && this->asQObject())
-            QObject::connect(templateParameter->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setTemplateParameter()));
+        if (templateParameter && templateParameter->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(templateParameter->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setTemplateParameter()));
     }
 }
 
@@ -148,36 +146,3 @@ bool QUmlParameterableElement::isTemplateParameter() const
     return bool ();
 }
 
-void QUmlParameterableElement::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-}
-
-void QUmlParameterableElement::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterableElement")][QStringLiteral("owningTemplateParameter")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterableElement")][QStringLiteral("owningTemplateParameter")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlParameterableElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterableElement")][QStringLiteral("owningTemplateParameter")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterableElement")][QStringLiteral("owningTemplateParameter")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterableElement")][QStringLiteral("owningTemplateParameter")][QtModeling::DocumentationRole] = QStringLiteral("The formal template parameter that owns this element.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterableElement")][QStringLiteral("owningTemplateParameter")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterableElement")][QStringLiteral("owningTemplateParameter")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("ParameterableElement-templateParameter Element-owner");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterableElement")][QStringLiteral("owningTemplateParameter")][QtModeling::OppositeEndRole] = QStringLiteral("TemplateParameter-ownedParameteredElement");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterableElement")][QStringLiteral("templateParameter")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterableElement")][QStringLiteral("templateParameter")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlParameterableElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterableElement")][QStringLiteral("templateParameter")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterableElement")][QStringLiteral("templateParameter")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterableElement")][QStringLiteral("templateParameter")][QtModeling::DocumentationRole] = QStringLiteral("The template parameter that exposes this element as a formal parameter.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterableElement")][QStringLiteral("templateParameter")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterableElement")][QStringLiteral("templateParameter")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterableElement")][QStringLiteral("templateParameter")][QtModeling::OppositeEndRole] = QStringLiteral("TemplateParameter-parameteredElement");
-
-}
-
diff --git a/src/uml/qumlparameterableelement.h b/src/uml/qumlparameterableelement.h
index 8f32f604..c9b5acba 100644
--- a/src/uml/qumlparameterableelement.h
+++ b/src/uml/qumlparameterableelement.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -59,7 +58,7 @@ class Q_UML_EXPORT QUmlParameterableElement : public virtual QUmlElement
 public:
     virtual ~QUmlParameterableElement();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlTemplateParameter *owningTemplateParameter() const;
@@ -76,9 +75,6 @@ protected:
 
     QUmlTemplateParameter *_owningTemplateParameter;
     QUmlTemplateParameter *_templateParameter;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlparameterset.cpp b/src/uml/qumlparameterset.cpp
index 99230f7f..d19f9efa 100644
--- a/src/uml/qumlparameterset.cpp
+++ b/src/uml/qumlparameterset.cpp
@@ -59,24 +59,22 @@
 
     \brief A parameter set is an element that provides alternative sets of inputs or outputs that a behavior may use.
  */
-QUmlParameterSet::QUmlParameterSet(bool createQObject)
+QUmlParameterSet::QUmlParameterSet(bool createQModelingObject)
 {
-    if (createQObject)
-        _qObject = new QUmlParameterSetObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlParameterSetObject(this));
 }
 
 QUmlParameterSet::~QUmlParameterSet()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlParameterSet::clone() const
+QModelingElement *QUmlParameterSet::clone() const
 {
     QUmlParameterSet *c = new QUmlParameterSet;
     foreach (QUmlComment *element, ownedComments())
@@ -112,9 +110,9 @@ void QUmlParameterSet::addCondition(QUmlConstraint *condition)
 
     if (!_conditions.contains(condition)) {
         _conditions.insert(condition);
-        if (condition && condition->asQObject() && this->asQObject())
-            QObject::connect(condition->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeCondition(QObject *)));
-        condition->asQObject()->setParent(this->asQObject());
+        if (condition && condition->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(condition->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeCondition(QObject *)));
+        condition->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(condition);
@@ -127,8 +125,8 @@ void QUmlParameterSet::removeCondition(QUmlConstraint *condition)
 
     if (_conditions.contains(condition)) {
         _conditions.remove(condition);
-        if (condition->asQObject())
-            condition->asQObject()->setParent(0);
+        if (condition->asQModelingObject())
+            condition->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(condition);
@@ -151,8 +149,8 @@ void QUmlParameterSet::addParameter(QUmlParameter *parameter)
 
     if (!_parameters.contains(parameter)) {
         _parameters.insert(parameter);
-        if (parameter && parameter->asQObject() && this->asQObject())
-            QObject::connect(parameter->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeParameter(QObject *)));
+        if (parameter && parameter->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(parameter->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeParameter(QObject *)));
 
         // Adjust opposite properties
         if (parameter) {
@@ -175,42 +173,3 @@ void QUmlParameterSet::removeParameter(QUmlParameter *parameter)
     }
 }
 
-void QUmlParameterSet::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterSet"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("conditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterSet"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parameters"))));
-}
-
-void QUmlParameterSet::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterSet")][QStringLiteral("conditions")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterSet")][QStringLiteral("conditions")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlParameterSet");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterSet")][QStringLiteral("conditions")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterSet")][QStringLiteral("conditions")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterSet")][QStringLiteral("conditions")][QtModeling::DocumentationRole] = QStringLiteral("Constraint that should be satisfied for the owner of the parameters in an input parameter set to start execution using the values provided for those parameters, or the owner of the parameters in an output parameter set to end execution providing the values for those parameters, if all preconditions and conditions on input parameter sets were satisfied.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterSet")][QStringLiteral("conditions")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterSet")][QStringLiteral("conditions")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterSet")][QStringLiteral("conditions")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterSet")][QStringLiteral("parameters")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterSet")][QStringLiteral("parameters")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlParameterSet");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterSet")][QStringLiteral("parameters")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterSet")][QStringLiteral("parameters")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterSet")][QStringLiteral("parameters")][QtModeling::DocumentationRole] = QStringLiteral("Parameters in the parameter set.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterSet")][QStringLiteral("parameters")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterSet")][QStringLiteral("parameters")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterSet")][QStringLiteral("parameters")][QtModeling::OppositeEndRole] = QStringLiteral("Parameter-parameterSet");
-
-}
-
diff --git a/src/uml/qumlparameterset.h b/src/uml/qumlparameterset.h
index f233225c..2fad16ad 100644
--- a/src/uml/qumlparameterset.h
+++ b/src/uml/qumlparameterset.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlNamedElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlParameter;
 class Q_UML_EXPORT QUmlParameterSet : public QUmlNamedElement
 {
 public:
-    explicit QUmlParameterSet(bool createQObject = true);
+    explicit QUmlParameterSet(bool createQModelingObject = true);
     virtual ~QUmlParameterSet();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlConstraint *> conditions() const;
@@ -74,9 +73,6 @@ public:
 protected:
     QSet<QUmlConstraint *> _conditions;
     QSet<QUmlParameter *> _parameters;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlpartdecomposition.cpp b/src/uml/qumlpartdecomposition.cpp
index e0123197..97d0d8bb 100644
--- a/src/uml/qumlpartdecomposition.cpp
+++ b/src/uml/qumlpartdecomposition.cpp
@@ -64,25 +64,23 @@
 
     \brief A part decomposition is a description of the internal interactions of one lifeline relative to an interaction.
  */
-QUmlPartDecomposition::QUmlPartDecomposition(bool createQObject) :
+QUmlPartDecomposition::QUmlPartDecomposition(bool createQModelingObject) :
     QUmlInteractionUse(false)
 {
-    if (createQObject)
-        _qObject = new QUmlPartDecompositionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlPartDecompositionObject(this));
 }
 
 QUmlPartDecomposition::~QUmlPartDecomposition()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlPartDecomposition::clone() const
+QModelingElement *QUmlPartDecomposition::clone() const
 {
     QUmlPartDecomposition *c = new QUmlPartDecomposition;
     foreach (QUmlComment *element, ownedComments())
@@ -114,31 +112,3 @@ QModelingObject *QUmlPartDecomposition::clone() const
     return c;
 }
 
-void QUmlPartDecomposition::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("covered"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingInteraction"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingOperand"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalOrderings"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionUse"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("actualGates"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionUse"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("arguments"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionUse"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("refersTo"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionUse"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("returnValue"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionUse"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("returnValueRecipient"))));
-}
-
-void QUmlPartDecomposition::setPropertyData()
-{
-}
-
diff --git a/src/uml/qumlpartdecomposition.h b/src/uml/qumlpartdecomposition.h
index 9364d6a0..a07e29c8 100644
--- a/src/uml/qumlpartdecomposition.h
+++ b/src/uml/qumlpartdecomposition.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlInteractionUse>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,16 +54,13 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlPartDecomposition : public QUmlInteractionUse
 {
 public:
-    explicit QUmlPartDecomposition(bool createQObject = true);
+    explicit QUmlPartDecomposition(bool createQModelingObject = true);
     virtual ~QUmlPartDecomposition();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
 
 protected:
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlpin.cpp b/src/uml/qumlpin.cpp
index b88de746..1a2abab6 100644
--- a/src/uml/qumlpin.cpp
+++ b/src/uml/qumlpin.cpp
@@ -72,15 +72,13 @@
 QUmlPin::QUmlPin() :
     _isControl(false)
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlPin::~QUmlPin()
 {
 }
 
-QModelingObject *QUmlPin::clone() const
+QModelingElement *QUmlPin::clone() const
 {
     QUmlPin *c = new QUmlPin;
     foreach (QUmlComment *element, ownedComments())
@@ -144,59 +142,7 @@ void QUmlPin::setControl(bool isControl)
 
     if (_isControl != isControl) {
         _isControl = isControl;
-        _modifiedResettableProperties << QStringLiteral("isControl");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isControl");
     }
 }
 
-void QUmlPin::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isOrdered"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isUnique"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lower"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lowerValue"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upper"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperValue"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStates"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isControlType"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ordering"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("selection"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperBound"))));
-    _groupProperties.insert(QStringLiteral("QUmlPin"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isControl"))));
-}
-
-void QUmlPin::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPin")][QStringLiteral("isControl")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPin")][QStringLiteral("isControl")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPin");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPin")][QStringLiteral("isControl")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPin")][QStringLiteral("isControl")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPin")][QStringLiteral("isControl")][QtModeling::DocumentationRole] = QStringLiteral("Tells whether the pins provide data to the actions, or just controls when it executes it.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPin")][QStringLiteral("isControl")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPin")][QStringLiteral("isControl")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPin")][QStringLiteral("isControl")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlpin.h b/src/uml/qumlpin.h
index 4e816d8e..a6634176 100644
--- a/src/uml/qumlpin.h
+++ b/src/uml/qumlpin.h
@@ -46,7 +46,6 @@
 #include <QtUml/QUmlMultiplicityElement>
 #include <QtUml/QUmlObjectNode>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,7 +57,7 @@ class Q_UML_EXPORT QUmlPin : public QUmlMultiplicityElement, public QUmlObjectNo
 public:
     virtual ~QUmlPin();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     bool isControl() const;
@@ -68,9 +67,6 @@ protected:
     explicit QUmlPin();
 
     bool _isControl;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlport.cpp b/src/uml/qumlport.cpp
index 71f1eacf..f071e0d7 100644
--- a/src/uml/qumlport.cpp
+++ b/src/uml/qumlport.cpp
@@ -74,29 +74,27 @@
 
     \brief A port has an associated protocol state machine.A port is a property of a classifier that specifies a distinct interaction point between that classifier and its environment or between the (behavior of the) classifier and its internal parts. Ports are connected to properties of the classifier by connectors through which requests can be made to invoke the behavioral features of a classifier. A Port may specify the services a classifier provides (offers) to its environment as well as the services that a classifier expects (requires) of its environment.
  */
-QUmlPort::QUmlPort(bool createQObject) :
+QUmlPort::QUmlPort(bool createQModelingObject) :
     QUmlProperty(false),
     _isBehavior(false),
     _isConjugated(false),
     _isService(true),
     _protocol(0)
 {
-    if (createQObject)
-        _qObject = new QUmlPortObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlPortObject(this));
 }
 
 QUmlPort::~QUmlPort()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlPort::clone() const
+QModelingElement *QUmlPort::clone() const
 {
     QUmlPort *c = new QUmlPort;
     foreach (QUmlComment *element, ownedComments())
@@ -176,7 +174,7 @@ void QUmlPort::setBehavior(bool isBehavior)
 
     if (_isBehavior != isBehavior) {
         _isBehavior = isBehavior;
-        _modifiedResettableProperties << QStringLiteral("isBehavior");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isBehavior");
     }
 }
 
@@ -196,7 +194,7 @@ void QUmlPort::setConjugated(bool isConjugated)
 
     if (_isConjugated != isConjugated) {
         _isConjugated = isConjugated;
-        _modifiedResettableProperties << QStringLiteral("isConjugated");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isConjugated");
     }
 }
 
@@ -216,7 +214,7 @@ void QUmlPort::setService(bool isService)
 
     if (_isService != isService) {
         _isService = isService;
-        _modifiedResettableProperties << QStringLiteral("isService");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isService");
     }
 }
 
@@ -236,8 +234,8 @@ void QUmlPort::setProtocol(QUmlProtocolStateMachine *protocol)
 
     if (_protocol != protocol) {
         _protocol = protocol;
-        if (protocol && protocol->asQObject() && this->asQObject())
-            QObject::connect(protocol->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setProtocol()));
+        if (protocol && protocol->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(protocol->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setProtocol()));
     }
 }
 
@@ -293,8 +291,8 @@ void QUmlPort::addRedefinedPort(QUmlPort *redefinedPort)
 
     if (!_redefinedPorts.contains(redefinedPort)) {
         _redefinedPorts.insert(redefinedPort);
-        if (redefinedPort && redefinedPort->asQObject() && this->asQObject())
-            QObject::connect(redefinedPort->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeRedefinedPort(QObject *)));
+        if (redefinedPort && redefinedPort->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(redefinedPort->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeRedefinedPort(QObject *)));
 
         // Adjust subsetted properties
         addRedefinedProperty(redefinedPort);
@@ -349,127 +347,3 @@ void QUmlPort::removeRequired(QUmlInterface *required)
     }
 }
 
-void QUmlPort::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isOrdered"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isUnique"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lower"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lowerValue"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upper"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperValue"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("featuringClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isStatic"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlConnectableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ends"))));
-    _groupProperties.insert(QStringLiteral("QUmlConnectableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlDeploymentTarget"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deployedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlDeploymentTarget"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deployments"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("aggregation"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("association"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("associationEnd"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("class_"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("datatype"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("default_"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("defaultValue"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interface_"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isComposite"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isDerived"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isDerivedUnion"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isID"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isReadOnly"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("opposite"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningAssociation"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedProperties"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("subsettedProperties"))));
-    _groupProperties.insert(QStringLiteral("QUmlPort"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isBehavior"))));
-    _groupProperties.insert(QStringLiteral("QUmlPort"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isConjugated"))));
-    _groupProperties.insert(QStringLiteral("QUmlPort"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isService"))));
-    _groupProperties.insert(QStringLiteral("QUmlPort"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("protocol"))));
-    _groupProperties.insert(QStringLiteral("QUmlPort"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("provided"))));
-    _groupProperties.insert(QStringLiteral("QUmlPort"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedPorts"))));
-    _groupProperties.insert(QStringLiteral("QUmlPort"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("required"))));
-}
-
-void QUmlPort::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("isBehavior")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("isBehavior")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPort");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("isBehavior")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("isBehavior")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("isBehavior")][QtModeling::DocumentationRole] = QStringLiteral("Specifies whether requests arriving at this port are sent to the classifier behavior of this classifier. Such ports are referred to as behavior port. Any invocation of a behavioral feature targeted at a behavior port will be handled by the instance of the owning classifier itself, rather than by any instances that this classifier may contain.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("isBehavior")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("isBehavior")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("isBehavior")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("isConjugated")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("isConjugated")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPort");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("isConjugated")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("isConjugated")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("isConjugated")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the way that the provided and required interfaces are derived from the Port’s Type. The default value is false.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("isConjugated")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("isConjugated")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("isConjugated")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("isService")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("isService")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPort");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("isService")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("isService")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("isService")][QtModeling::DocumentationRole] = QStringLiteral("If true indicates that this port is used to provide the published functionality of a classifier; if false, this port is used to implement the classifier but is not part of the essential externally-visible functionality of the classifier and can, therefore, be altered or deleted along with the internal implementation of the classifier and other properties that are considered part of its implementation.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("isService")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("isService")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("isService")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("protocol")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("protocol")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPort");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("protocol")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("protocol")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("protocol")][QtModeling::DocumentationRole] = QStringLiteral("References an optional protocol state machine which describes valid interactions at this interaction point.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("protocol")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("protocol")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("protocol")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("provided")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("provided")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPort");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("provided")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("provided")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("provided")][QtModeling::DocumentationRole] = QStringLiteral("References the interfaces specifying the set of operations and receptions that the classifier offers to its environment via this port, and which it will handle either directly or by forwarding it to a part of its internal structure. This association is derived according to the value of isConjugated. If isConjugated is false, provided is derived as the union of the sets of interfaces realized by the type of the port and its supertypes, or directly from the type of the port if the port is typed by an interface. If isConjugated is true, it is derived as the union of the sets of interfaces used by the type of the port and its supertypes.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("provided")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("provided")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("provided")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("redefinedPorts")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("redefinedPorts")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPort");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("redefinedPorts")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("redefinedPorts")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("redefinedPorts")][QtModeling::DocumentationRole] = QStringLiteral("A port may be redefined when its containing classifier is specialized. The redefining port may have additional interfaces to those that are associated with the redefined port or it may replace an interface by one of its subtypes.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("redefinedPorts")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("redefinedPorts")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Property-redefinedProperty");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("redefinedPorts")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("required")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("required")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPort");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("required")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("required")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("required")][QtModeling::DocumentationRole] = QStringLiteral("References the interfaces specifying the set of operations and receptions that the classifier expects its environment to handle via this port. This association is derived according to the value of isConjugated. If isConjugated is false, required is derived as the union of the sets of interfaces used by the type of the port and its supertypes. If isConjugated is true, it is derived as the union of the sets of interfaces realized by the type of the port and its supertypes, or directly from the type of the port if the port is typed by an interface.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("required")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("required")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("required")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlport.h b/src/uml/qumlport.h
index 8ca68bd0..107d1054 100644
--- a/src/uml/qumlport.h
+++ b/src/uml/qumlport.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlProperty>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlProtocolStateMachine;
 class Q_UML_EXPORT QUmlPort : public QUmlProperty
 {
 public:
-    explicit QUmlPort(bool createQObject = true);
+    explicit QUmlPort(bool createQModelingObject = true);
     virtual ~QUmlPort();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     bool isBehavior() const;
@@ -88,9 +87,6 @@ protected:
     bool _isService;
     QUmlProtocolStateMachine *_protocol;
     QSet<QUmlPort *> _redefinedPorts;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlprimitivetype.cpp b/src/uml/qumlprimitivetype.cpp
index e29e1909..a264c12e 100644
--- a/src/uml/qumlprimitivetype.cpp
+++ b/src/uml/qumlprimitivetype.cpp
@@ -78,25 +78,23 @@
 
     \brief A primitive type defines a predefined data type, without any relevant substructure (i.e., it has no parts in the context of UML). A primitive datatype may have an algebra and operations defined outside of UML, for example, mathematically.
  */
-QUmlPrimitiveType::QUmlPrimitiveType(bool createQObject) :
+QUmlPrimitiveType::QUmlPrimitiveType(bool createQModelingObject) :
     QUmlDataType(false)
 {
-    if (createQObject)
-        _qObject = new QUmlPrimitiveTypeObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlPrimitiveTypeObject(this));
 }
 
 QUmlPrimitiveType::~QUmlPrimitiveType()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlPrimitiveType::clone() const
+QModelingElement *QUmlPrimitiveType::clone() const
 {
     QUmlPrimitiveType *c = new QUmlPrimitiveType;
     foreach (QUmlComment *element, ownedComments())
@@ -149,52 +147,3 @@ QModelingObject *QUmlPrimitiveType::clone() const
     return c;
 }
 
-void QUmlPrimitiveType::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generals"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlDataType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlDataType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
-}
-
-void QUmlPrimitiveType::setPropertyData()
-{
-}
-
diff --git a/src/uml/qumlprimitivetype.h b/src/uml/qumlprimitivetype.h
index 01b093e5..46b25f00 100644
--- a/src/uml/qumlprimitivetype.h
+++ b/src/uml/qumlprimitivetype.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlDataType>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,16 +54,13 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlPrimitiveType : public QUmlDataType
 {
 public:
-    explicit QUmlPrimitiveType(bool createQObject = true);
+    explicit QUmlPrimitiveType(bool createQModelingObject = true);
     virtual ~QUmlPrimitiveType();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
 
 protected:
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlprofile.cpp b/src/uml/qumlprofile.cpp
index 65d15347..895973a6 100644
--- a/src/uml/qumlprofile.cpp
+++ b/src/uml/qumlprofile.cpp
@@ -69,25 +69,23 @@
 
     \brief A profile defines limited extensions to a reference metamodel with the purpose of adapting the metamodel to a specific platform or domain.
  */
-QUmlProfile::QUmlProfile(bool createQObject) :
+QUmlProfile::QUmlProfile(bool createQModelingObject) :
     QUmlPackage(false)
 {
-    if (createQObject)
-        _qObject = new QUmlProfileObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlProfileObject(this));
 }
 
 QUmlProfile::~QUmlProfile()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlProfile::clone() const
+QModelingElement *QUmlProfile::clone() const
 {
     QUmlProfile *c = new QUmlProfile;
     foreach (QUmlComment *element, ownedComments())
@@ -146,9 +144,9 @@ void QUmlProfile::addMetaclassReference(QUmlElementImport *metaclassReference)
 
     if (!_metaclassReferences.contains(metaclassReference)) {
         _metaclassReferences.insert(metaclassReference);
-        if (metaclassReference && metaclassReference->asQObject() && this->asQObject())
-            QObject::connect(metaclassReference->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeMetaclassReference(QObject *)));
-        metaclassReference->asQObject()->setParent(this->asQObject());
+        if (metaclassReference && metaclassReference->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(metaclassReference->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeMetaclassReference(QObject *)));
+        metaclassReference->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addElementImport(metaclassReference);
@@ -161,8 +159,8 @@ void QUmlProfile::removeMetaclassReference(QUmlElementImport *metaclassReference
 
     if (_metaclassReferences.contains(metaclassReference)) {
         _metaclassReferences.remove(metaclassReference);
-        if (metaclassReference->asQObject())
-            metaclassReference->asQObject()->setParent(0);
+        if (metaclassReference->asQModelingObject())
+            metaclassReference->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeElementImport(metaclassReference);
@@ -185,9 +183,9 @@ void QUmlProfile::addMetamodelReference(QUmlPackageImport *metamodelReference)
 
     if (!_metamodelReferences.contains(metamodelReference)) {
         _metamodelReferences.insert(metamodelReference);
-        if (metamodelReference && metamodelReference->asQObject() && this->asQObject())
-            QObject::connect(metamodelReference->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeMetamodelReference(QObject *)));
-        metamodelReference->asQObject()->setParent(this->asQObject());
+        if (metamodelReference && metamodelReference->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(metamodelReference->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeMetamodelReference(QObject *)));
+        metamodelReference->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addPackageImport(metamodelReference);
@@ -200,68 +198,11 @@ void QUmlProfile::removeMetamodelReference(QUmlPackageImport *metamodelReference
 
     if (_metamodelReferences.contains(metamodelReference)) {
         _metamodelReferences.remove(metamodelReference);
-        if (metamodelReference->asQObject())
-            metamodelReference->asQObject()->setParent(0);
+        if (metamodelReference->asQModelingObject())
+            metamodelReference->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removePackageImport(metamodelReference);
     }
 }
 
-void QUmlProfile::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("URI"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedPackages"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestingPackage"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedStereotypes"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTypes"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageMerges"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packagedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackage"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("profileApplications"))));
-    _groupProperties.insert(QStringLiteral("QUmlProfile"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("metaclassReferences"))));
-    _groupProperties.insert(QStringLiteral("QUmlProfile"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("metamodelReferences"))));
-}
-
-void QUmlProfile::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfile")][QStringLiteral("metaclassReferences")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfile")][QStringLiteral("metaclassReferences")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProfile");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfile")][QStringLiteral("metaclassReferences")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfile")][QStringLiteral("metaclassReferences")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfile")][QStringLiteral("metaclassReferences")][QtModeling::DocumentationRole] = QStringLiteral("References a metaclass that may be extended.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfile")][QStringLiteral("metaclassReferences")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfile")][QStringLiteral("metaclassReferences")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-elementImport");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfile")][QStringLiteral("metaclassReferences")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfile")][QStringLiteral("metamodelReferences")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfile")][QStringLiteral("metamodelReferences")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProfile");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfile")][QStringLiteral("metamodelReferences")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfile")][QStringLiteral("metamodelReferences")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfile")][QStringLiteral("metamodelReferences")][QtModeling::DocumentationRole] = QStringLiteral("References a package containing (directly or indirectly) metaclasses that may be extended.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfile")][QStringLiteral("metamodelReferences")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfile")][QStringLiteral("metamodelReferences")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-packageImport");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfile")][QStringLiteral("metamodelReferences")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlprofile.h b/src/uml/qumlprofile.h
index 1952a5c3..c9e4305c 100644
--- a/src/uml/qumlprofile.h
+++ b/src/uml/qumlprofile.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlPackage>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlPackageImport;
 class Q_UML_EXPORT QUmlProfile : public QUmlPackage
 {
 public:
-    explicit QUmlProfile(bool createQObject = true);
+    explicit QUmlProfile(bool createQModelingObject = true);
     virtual ~QUmlProfile();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlElementImport *> metaclassReferences() const;
@@ -74,9 +73,6 @@ public:
 protected:
     QSet<QUmlElementImport *> _metaclassReferences;
     QSet<QUmlPackageImport *> _metamodelReferences;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlprofileapplication.cpp b/src/uml/qumlprofileapplication.cpp
index c0d61f4b..74e64e1f 100644
--- a/src/uml/qumlprofileapplication.cpp
+++ b/src/uml/qumlprofileapplication.cpp
@@ -54,27 +54,25 @@
 
     \brief A profile application is used to show which profiles have been applied to a package.
  */
-QUmlProfileApplication::QUmlProfileApplication(bool createQObject) :
+QUmlProfileApplication::QUmlProfileApplication(bool createQModelingObject) :
     _appliedProfile(0),
     _applyingPackage(0),
     _isStrict(false)
 {
-    if (createQObject)
-        _qObject = new QUmlProfileApplicationObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlProfileApplicationObject(this));
 }
 
 QUmlProfileApplication::~QUmlProfileApplication()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlProfileApplication::clone() const
+QModelingElement *QUmlProfileApplication::clone() const
 {
     QUmlProfileApplication *c = new QUmlProfileApplication;
     foreach (QUmlComment *element, ownedComments())
@@ -108,8 +106,8 @@ void QUmlProfileApplication::setAppliedProfile(QUmlProfile *appliedProfile)
         removeTarget(_appliedProfile);
 
         _appliedProfile = appliedProfile;
-        if (appliedProfile && appliedProfile->asQObject() && this->asQObject())
-            QObject::connect(appliedProfile->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setAppliedProfile()));
+        if (appliedProfile && appliedProfile->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(appliedProfile->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setAppliedProfile()));
 
         // Adjust subsetted properties
         if (appliedProfile) {
@@ -137,8 +135,8 @@ void QUmlProfileApplication::setApplyingPackage(QUmlPackage *applyingPackage)
         removeSource(_applyingPackage);
 
         _applyingPackage = applyingPackage;
-        if (applyingPackage && applyingPackage->asQObject() && this->asQObject())
-            QObject::connect(applyingPackage->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setApplyingPackage()));
+        if (applyingPackage && applyingPackage->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(applyingPackage->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setApplyingPackage()));
 
         // Adjust subsetted properties
         setOwner(applyingPackage);
@@ -164,53 +162,7 @@ void QUmlProfileApplication::setStrict(bool isStrict)
 
     if (_isStrict != isStrict) {
         _isStrict = isStrict;
-        _modifiedResettableProperties << QStringLiteral("isStrict");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isStrict");
     }
 }
 
-void QUmlProfileApplication::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
-    _groupProperties.insert(QStringLiteral("QUmlProfileApplication"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("appliedProfile"))));
-    _groupProperties.insert(QStringLiteral("QUmlProfileApplication"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("applyingPackage"))));
-    _groupProperties.insert(QStringLiteral("QUmlProfileApplication"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isStrict"))));
-}
-
-void QUmlProfileApplication::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfileApplication")][QStringLiteral("appliedProfile")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfileApplication")][QStringLiteral("appliedProfile")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProfileApplication");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfileApplication")][QStringLiteral("appliedProfile")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfileApplication")][QStringLiteral("appliedProfile")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfileApplication")][QStringLiteral("appliedProfile")][QtModeling::DocumentationRole] = QStringLiteral("References the Profiles that are applied to a Package through this ProfileApplication.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfileApplication")][QStringLiteral("appliedProfile")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfileApplication")][QStringLiteral("appliedProfile")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("DirectedRelationship-target");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfileApplication")][QStringLiteral("appliedProfile")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfileApplication")][QStringLiteral("applyingPackage")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfileApplication")][QStringLiteral("applyingPackage")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProfileApplication");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfileApplication")][QStringLiteral("applyingPackage")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfileApplication")][QStringLiteral("applyingPackage")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfileApplication")][QStringLiteral("applyingPackage")][QtModeling::DocumentationRole] = QStringLiteral("The package that owns the profile application.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfileApplication")][QStringLiteral("applyingPackage")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfileApplication")][QStringLiteral("applyingPackage")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner DirectedRelationship-source");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfileApplication")][QStringLiteral("applyingPackage")][QtModeling::OppositeEndRole] = QStringLiteral("Package-profileApplication");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfileApplication")][QStringLiteral("isStrict")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfileApplication")][QStringLiteral("isStrict")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProfileApplication");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfileApplication")][QStringLiteral("isStrict")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfileApplication")][QStringLiteral("isStrict")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfileApplication")][QStringLiteral("isStrict")][QtModeling::DocumentationRole] = QStringLiteral("Specifies that the Profile filtering rules for the metaclasses of the referenced metamodel shall be strictly applied.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfileApplication")][QStringLiteral("isStrict")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfileApplication")][QStringLiteral("isStrict")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfileApplication")][QStringLiteral("isStrict")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlprofileapplication.h b/src/uml/qumlprofileapplication.h
index ee936bdc..37948b53 100644
--- a/src/uml/qumlprofileapplication.h
+++ b/src/uml/qumlprofileapplication.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlDirectedRelationship>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlProfile;
 class Q_UML_EXPORT QUmlProfileApplication : public QUmlDirectedRelationship
 {
 public:
-    explicit QUmlProfileApplication(bool createQObject = true);
+    explicit QUmlProfileApplication(bool createQModelingObject = true);
     virtual ~QUmlProfileApplication();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlProfile *appliedProfile() const;
@@ -75,9 +74,6 @@ protected:
     QUmlProfile *_appliedProfile;
     QUmlPackage *_applyingPackage;
     bool _isStrict;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlproperty.cpp b/src/uml/qumlproperty.cpp
index 5c7addcc..e50d2ee9 100644
--- a/src/uml/qumlproperty.cpp
+++ b/src/uml/qumlproperty.cpp
@@ -72,7 +72,7 @@
 
     \brief Property represents a declared state of one or more instances in terms of a named relationship to a value or values. When a property is an attribute of a classifier, the value or values are related to the instance of the classifier by being held in slots of the instance. When a property is an association end, the value or values are related to the instance or instances at the other end(s) of the association. The range of valid values represented by the property can be controlled by setting the property's type.A property is a structural feature of a classifier that characterizes instances of the classifier. A property related by ownedAttribute to a classifier (other than an association) represents an attribute and might also represent an association end. It relates an instance of the class to a value or set of values of the type of the attribute. A property related by memberEnd or its specializations to an association represents an end of the association. The type of the property is the type of the end of the association.A property has the capability of being a deployment target in a deployment relationship. This enables modeling the deployment to hierarchical nodes that have properties functioning as internal parts.Property specializes ParameterableElement to specify that a property can be exposed as a formal template parameter, and provided as an actual parameter in a binding of a template.A property represents a set of instances that are owned by a containing classifier instance.
  */
-QUmlProperty::QUmlProperty(bool createQObject) :
+QUmlProperty::QUmlProperty(bool createQModelingObject) :
     _aggregation(QtUml::AggregationKindNone),
     _association(0),
     _associationEnd(0),
@@ -86,22 +86,20 @@ QUmlProperty::QUmlProperty(bool createQObject) :
     _isReadOnly(false),
     _owningAssociation(0)
 {
-    if (createQObject)
-        _qObject = new QUmlPropertyObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlPropertyObject(this));
 }
 
 QUmlProperty::~QUmlProperty()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlProperty::clone() const
+QModelingElement *QUmlProperty::clone() const
 {
     QUmlProperty *c = new QUmlProperty;
     foreach (QUmlComment *element, ownedComments())
@@ -174,7 +172,7 @@ void QUmlProperty::setAggregation(QtUml::AggregationKind aggregation)
 
     if (_aggregation != aggregation) {
         _aggregation = aggregation;
-        _modifiedResettableProperties << QStringLiteral("aggregation");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("aggregation");
     }
 }
 
@@ -194,8 +192,8 @@ void QUmlProperty::setAssociation(QUmlAssociation *association)
 
     if (_association != association) {
         _association = association;
-        if (association && association->asQObject() && this->asQObject())
-            QObject::connect(association->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setAssociation()));
+        if (association && association->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(association->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setAssociation()));
     }
 }
 
@@ -217,8 +215,8 @@ void QUmlProperty::setAssociationEnd(QUmlProperty *associationEnd)
         // Adjust subsetted properties
 
         _associationEnd = associationEnd;
-        if (associationEnd && associationEnd->asQObject() && this->asQObject())
-            QObject::connect(associationEnd->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setAssociationEnd()));
+        if (associationEnd && associationEnd->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(associationEnd->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setAssociationEnd()));
 
         // Adjust subsetted properties
         setOwner(associationEnd);
@@ -243,8 +241,8 @@ void QUmlProperty::setClass(QUmlClass *class_)
         // Adjust subsetted properties
 
         _class_ = class_;
-        if (class_ && class_->asQObject() && this->asQObject())
-            QObject::connect(class_->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setClass()));
+        if (class_ && class_->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(class_->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setClass()));
 
         // Adjust subsetted properties
         setNamespace(class_);
@@ -269,8 +267,8 @@ void QUmlProperty::setDatatype(QUmlDataType *datatype)
         // Adjust subsetted properties
 
         _datatype = datatype;
-        if (datatype && datatype->asQObject() && this->asQObject())
-            QObject::connect(datatype->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setDatatype()));
+        if (datatype && datatype->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(datatype->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setDatatype()));
 
         // Adjust subsetted properties
         setNamespace(datatype);
@@ -320,9 +318,9 @@ void QUmlProperty::setDefaultValue(QUmlValueSpecification *defaultValue)
         removeOwnedElement(_defaultValue);
 
         _defaultValue = defaultValue;
-        if (defaultValue && defaultValue->asQObject() && this->asQObject())
-            QObject::connect(defaultValue->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setDefaultValue()));
-        defaultValue->asQObject()->setParent(this->asQObject());
+        if (defaultValue && defaultValue->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(defaultValue->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setDefaultValue()));
+        defaultValue->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (defaultValue) {
@@ -349,8 +347,8 @@ void QUmlProperty::setInterface(QUmlInterface *interface_)
         // Adjust subsetted properties
 
         _interface_ = interface_;
-        if (interface_ && interface_->asQObject() && this->asQObject())
-            QObject::connect(interface_->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setInterface()));
+        if (interface_ && interface_->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(interface_->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setInterface()));
 
         // Adjust subsetted properties
         setNamespace(interface_);
@@ -397,7 +395,7 @@ void QUmlProperty::setDerived(bool isDerived)
 
     if (_isDerived != isDerived) {
         _isDerived = isDerived;
-        _modifiedResettableProperties << QStringLiteral("isDerived");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isDerived");
     }
 }
 
@@ -417,7 +415,7 @@ void QUmlProperty::setDerivedUnion(bool isDerivedUnion)
 
     if (_isDerivedUnion != isDerivedUnion) {
         _isDerivedUnion = isDerivedUnion;
-        _modifiedResettableProperties << QStringLiteral("isDerivedUnion");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isDerivedUnion");
     }
 }
 
@@ -437,7 +435,7 @@ void QUmlProperty::setID(bool isID)
 
     if (_isID != isID) {
         _isID = isID;
-        _modifiedResettableProperties << QStringLiteral("isID");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isID");
     }
 }
 
@@ -457,7 +455,7 @@ void QUmlProperty::setReadOnly(bool isReadOnly)
 
     if (_isReadOnly != isReadOnly) {
         _isReadOnly = isReadOnly;
-        _modifiedResettableProperties << QStringLiteral("isReadOnly");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isReadOnly");
     }
 }
 
@@ -505,8 +503,8 @@ void QUmlProperty::setOwningAssociation(QUmlAssociation *owningAssociation)
         removeRedefinitionContext(_owningAssociation);
 
         _owningAssociation = owningAssociation;
-        if (owningAssociation && owningAssociation->asQObject() && this->asQObject())
-            QObject::connect(owningAssociation->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setOwningAssociation()));
+        if (owningAssociation && owningAssociation->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(owningAssociation->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setOwningAssociation()));
 
         // Adjust subsetted properties
         if (owningAssociation) {
@@ -536,9 +534,9 @@ void QUmlProperty::addQualifier(QUmlProperty *qualifier)
 
     if (!_qualifiers.contains(qualifier)) {
         _qualifiers.append(qualifier);
-        if (qualifier && qualifier->asQObject() && this->asQObject())
-            QObject::connect(qualifier->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeQualifier(QObject *)));
-        qualifier->asQObject()->setParent(this->asQObject());
+        if (qualifier && qualifier->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(qualifier->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeQualifier(QObject *)));
+        qualifier->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(qualifier);
@@ -551,8 +549,8 @@ void QUmlProperty::removeQualifier(QUmlProperty *qualifier)
 
     if (_qualifiers.contains(qualifier)) {
         _qualifiers.removeAll(qualifier);
-        if (qualifier->asQObject())
-            qualifier->asQObject()->setParent(0);
+        if (qualifier->asQModelingObject())
+            qualifier->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(qualifier);
@@ -575,8 +573,8 @@ void QUmlProperty::addRedefinedProperty(QUmlProperty *redefinedProperty)
 
     if (!_redefinedProperties.contains(redefinedProperty)) {
         _redefinedProperties.insert(redefinedProperty);
-        if (redefinedProperty && redefinedProperty->asQObject() && this->asQObject())
-            QObject::connect(redefinedProperty->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeRedefinedProperty(QObject *)));
+        if (redefinedProperty && redefinedProperty->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(redefinedProperty->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeRedefinedProperty(QObject *)));
 
         // Adjust subsetted properties
         addRedefinedElement(redefinedProperty);
@@ -611,8 +609,8 @@ void QUmlProperty::addSubsettedProperty(QUmlProperty *subsettedProperty)
 
     if (!_subsettedProperties.contains(subsettedProperty)) {
         _subsettedProperties.insert(subsettedProperty);
-        if (subsettedProperty && subsettedProperty->asQObject() && this->asQObject())
-            QObject::connect(subsettedProperty->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeSubsettedProperty(QObject *)));
+        if (subsettedProperty && subsettedProperty->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(subsettedProperty->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeSubsettedProperty(QObject *)));
     }
 }
 
@@ -680,219 +678,3 @@ QSet<QUmlType *> QUmlProperty::subsettingContext() const
     return QSet<QUmlType *> ();
 }
 
-void QUmlProperty::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isOrdered"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isUnique"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lower"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lowerValue"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upper"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperValue"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("featuringClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isStatic"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlConnectableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ends"))));
-    _groupProperties.insert(QStringLiteral("QUmlConnectableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlDeploymentTarget"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deployedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlDeploymentTarget"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deployments"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("aggregation"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("association"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("associationEnd"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("class_"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("datatype"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("default_"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("defaultValue"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interface_"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isComposite"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isDerived"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isDerivedUnion"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isID"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isReadOnly"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("opposite"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningAssociation"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedProperties"))));
-    _groupProperties.insert(QStringLiteral("QUmlProperty"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("subsettedProperties"))));
-}
-
-void QUmlProperty::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("aggregation")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("aggregation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("aggregation")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("aggregation")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("aggregation")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the kind of aggregation that applies to the Property.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("aggregation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("aggregation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("aggregation")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("association")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("association")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("association")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("association")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("association")][QtModeling::DocumentationRole] = QStringLiteral("References the association of which this property is a member, if any.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("association")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("association")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_member_memberNamespace-memberNamespace");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("association")][QtModeling::OppositeEndRole] = QStringLiteral("Association-memberEnd");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("associationEnd")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("associationEnd")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("associationEnd")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("associationEnd")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("associationEnd")][QtModeling::DocumentationRole] = QStringLiteral("Designates the optional association end that owns a qualifier attribute.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("associationEnd")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("associationEnd")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("associationEnd")][QtModeling::OppositeEndRole] = QStringLiteral("Property-qualifier");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("class_")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("class_")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("class_")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("class_")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("class_")][QtModeling::DocumentationRole] = QStringLiteral("References the Class that owns the Property.References the Class that owns the Property.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("class_")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("class_")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_attribute_classifier-classifier A_ownedAttribute_structuredClassifier-structuredClassifier NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("class_")][QtModeling::OppositeEndRole] = QStringLiteral("Class-ownedAttribute");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("datatype")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("datatype")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("datatype")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("datatype")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("datatype")][QtModeling::DocumentationRole] = QStringLiteral("The DataType that owns this Property.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("datatype")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("datatype")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_attribute_classifier-classifier NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("datatype")][QtModeling::OppositeEndRole] = QStringLiteral("DataType-ownedAttribute");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("default_")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("default_")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("default_")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("default_")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("default_")][QtModeling::DocumentationRole] = QStringLiteral("Specifies a String that represents a value to be used when no argument is supplied for the Property.A String that is evaluated to give a default value for the Property when an object of the owning Classifier is instantiated.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("default_")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("default_")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("default_")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("defaultValue")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("defaultValue")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("defaultValue")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("defaultValue")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("defaultValue")][QtModeling::DocumentationRole] = QStringLiteral("A ValueSpecification that is evaluated to give a default value for the Property when an object of the owning Classifier is instantiated.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("defaultValue")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("defaultValue")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("defaultValue")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("interface_")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("interface_")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("interface_")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("interface_")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("interface_")][QtModeling::DocumentationRole] = QStringLiteral("References the Interface that owns the Property");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("interface_")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("interface_")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_attribute_classifier-classifier NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("interface_")][QtModeling::OppositeEndRole] = QStringLiteral("Interface-ownedAttribute");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isComposite")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isComposite")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isComposite")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isComposite")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isComposite")][QtModeling::DocumentationRole] = QStringLiteral("If isComposite is true, the object containing the attribute is a container for the object or value contained in the attribute.This is a derived value, indicating whether the aggregation of the Property is composite or not.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isComposite")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isComposite")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isComposite")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isDerived")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isDerived")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isDerived")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isDerived")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isDerived")][QtModeling::DocumentationRole] = QStringLiteral("If isDerived is true, the value of the attribute is derived from information elsewhere.Specifies whether the Property is derived, i.e., whether its value or values can be computed from other information.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isDerived")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isDerived")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isDerived")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isDerivedUnion")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isDerivedUnion")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isDerivedUnion")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isDerivedUnion")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isDerivedUnion")][QtModeling::DocumentationRole] = QStringLiteral("Specifies whether the property is derived as the union of all of the properties that are constrained to subset it.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isDerivedUnion")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isDerivedUnion")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isDerivedUnion")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isID")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isID")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isID")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isID")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isID")][QtModeling::DocumentationRole] = QStringLiteral("True indicates this property can be used to uniquely identify an instance of the containing Class.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isID")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isID")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isID")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isReadOnly")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isReadOnly")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isReadOnly")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isReadOnly")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isReadOnly")][QtModeling::DocumentationRole] = QStringLiteral("If true, the attribute may only be read, and not written.If isReadOnly is true, the attribute may not be written to after initialization.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isReadOnly")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("StructuralFeature-isReadOnly");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isReadOnly")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("isReadOnly")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("opposite")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("opposite")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("opposite")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("opposite")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("opposite")][QtModeling::DocumentationRole] = QStringLiteral("In the case where the property is one navigable end of a binary association with both ends navigable, this gives the other end.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("opposite")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("opposite")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("opposite")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("owningAssociation")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("owningAssociation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("owningAssociation")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("owningAssociation")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("owningAssociation")][QtModeling::DocumentationRole] = QStringLiteral("References the owning association of this property, if any.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("owningAssociation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("owningAssociation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Feature-featuringClassifier RedefinableElement-redefinitionContext NamedElement-namespace Property-association");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("owningAssociation")][QtModeling::OppositeEndRole] = QStringLiteral("Association-ownedEnd");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("qualifiers")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("qualifiers")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("qualifiers")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("qualifiers")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("qualifiers")][QtModeling::DocumentationRole] = QStringLiteral("An optional list of ordered qualifier attributes for the end. If the list is empty, then the Association is not qualified.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("qualifiers")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("qualifiers")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("qualifiers")][QtModeling::OppositeEndRole] = QStringLiteral("Property-associationEnd");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("redefinedProperties")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("redefinedProperties")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("redefinedProperties")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("redefinedProperties")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("redefinedProperties")][QtModeling::DocumentationRole] = QStringLiteral("References the properties that are redefined by this property.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("redefinedProperties")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("redefinedProperties")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("RedefinableElement-redefinedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("redefinedProperties")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("subsettedProperties")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("subsettedProperties")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("subsettedProperties")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("subsettedProperties")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("subsettedProperties")][QtModeling::DocumentationRole] = QStringLiteral("References the properties of which this property is constrained to be a subset.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("subsettedProperties")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("subsettedProperties")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("subsettedProperties")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlproperty.h b/src/uml/qumlproperty.h
index e9c1176e..0e2ebcd0 100644
--- a/src/uml/qumlproperty.h
+++ b/src/uml/qumlproperty.h
@@ -49,7 +49,6 @@
 
 
 #include <QtUml/QtUmlNamespace>
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -68,10 +67,10 @@ class QUmlValueSpecification;
 class Q_UML_EXPORT QUmlProperty : public QUmlStructuralFeature, public QUmlConnectableElement, public QUmlDeploymentTarget
 {
 public:
-    explicit QUmlProperty(bool createQObject = true);
+    explicit QUmlProperty(bool createQModelingObject = true);
     virtual ~QUmlProperty();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QtUml::AggregationKind aggregation() const;
@@ -137,9 +136,6 @@ protected:
     QList<QUmlProperty *> _qualifiers;
     QSet<QUmlProperty *> _redefinedProperties;
     QSet<QUmlProperty *> _subsettedProperties;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlprotocolconformance.cpp b/src/uml/qumlprotocolconformance.cpp
index 8610c01d..ba3591af 100644
--- a/src/uml/qumlprotocolconformance.cpp
+++ b/src/uml/qumlprotocolconformance.cpp
@@ -53,26 +53,24 @@
 
     \brief Protocol state machines can be redefined into more specific protocol state machines, or into behavioral state machines. Protocol conformance declares that the specific protocol state machine specifies a protocol that conforms to the general state machine one, or that the specific behavioral state machine abide by the protocol of the general protocol state machine.
  */
-QUmlProtocolConformance::QUmlProtocolConformance(bool createQObject) :
+QUmlProtocolConformance::QUmlProtocolConformance(bool createQModelingObject) :
     _generalMachine(0),
     _specificMachine(0)
 {
-    if (createQObject)
-        _qObject = new QUmlProtocolConformanceObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlProtocolConformanceObject(this));
 }
 
 QUmlProtocolConformance::~QUmlProtocolConformance()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlProtocolConformance::clone() const
+QModelingElement *QUmlProtocolConformance::clone() const
 {
     QUmlProtocolConformance *c = new QUmlProtocolConformance;
     foreach (QUmlComment *element, ownedComments())
@@ -105,8 +103,8 @@ void QUmlProtocolConformance::setGeneralMachine(QUmlProtocolStateMachine *genera
         removeTarget(_generalMachine);
 
         _generalMachine = generalMachine;
-        if (generalMachine && generalMachine->asQObject() && this->asQObject())
-            QObject::connect(generalMachine->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setGeneralMachine()));
+        if (generalMachine && generalMachine->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(generalMachine->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setGeneralMachine()));
 
         // Adjust subsetted properties
         if (generalMachine) {
@@ -134,8 +132,8 @@ void QUmlProtocolConformance::setSpecificMachine(QUmlProtocolStateMachine *speci
         removeSource(_specificMachine);
 
         _specificMachine = specificMachine;
-        if (specificMachine && specificMachine->asQObject() && this->asQObject())
-            QObject::connect(specificMachine->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setSpecificMachine()));
+        if (specificMachine && specificMachine->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(specificMachine->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setSpecificMachine()));
 
         // Adjust subsetted properties
         setOwner(specificMachine);
@@ -145,39 +143,3 @@ void QUmlProtocolConformance::setSpecificMachine(QUmlProtocolStateMachine *speci
     }
 }
 
-void QUmlProtocolConformance::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
-    _groupProperties.insert(QStringLiteral("QUmlProtocolConformance"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalMachine"))));
-    _groupProperties.insert(QStringLiteral("QUmlProtocolConformance"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("specificMachine"))));
-}
-
-void QUmlProtocolConformance::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolConformance")][QStringLiteral("generalMachine")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolConformance")][QStringLiteral("generalMachine")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProtocolConformance");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolConformance")][QStringLiteral("generalMachine")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolConformance")][QStringLiteral("generalMachine")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolConformance")][QStringLiteral("generalMachine")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the protocol state machine to which the specific state machine conforms.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolConformance")][QStringLiteral("generalMachine")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolConformance")][QStringLiteral("generalMachine")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("DirectedRelationship-target");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolConformance")][QStringLiteral("generalMachine")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolConformance")][QStringLiteral("specificMachine")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolConformance")][QStringLiteral("specificMachine")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProtocolConformance");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolConformance")][QStringLiteral("specificMachine")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolConformance")][QStringLiteral("specificMachine")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolConformance")][QStringLiteral("specificMachine")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the state machine which conforms to the general state machine.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolConformance")][QStringLiteral("specificMachine")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolConformance")][QStringLiteral("specificMachine")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner DirectedRelationship-source");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolConformance")][QStringLiteral("specificMachine")][QtModeling::OppositeEndRole] = QStringLiteral("ProtocolStateMachine-conformance");
-
-}
-
diff --git a/src/uml/qumlprotocolconformance.h b/src/uml/qumlprotocolconformance.h
index d6bbe0f2..129d0b59 100644
--- a/src/uml/qumlprotocolconformance.h
+++ b/src/uml/qumlprotocolconformance.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlDirectedRelationship>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlProtocolStateMachine;
 class Q_UML_EXPORT QUmlProtocolConformance : public QUmlDirectedRelationship
 {
 public:
-    explicit QUmlProtocolConformance(bool createQObject = true);
+    explicit QUmlProtocolConformance(bool createQModelingObject = true);
     virtual ~QUmlProtocolConformance();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlProtocolStateMachine *generalMachine() const;
@@ -71,9 +70,6 @@ public:
 protected:
     QUmlProtocolStateMachine *_generalMachine;
     QUmlProtocolStateMachine *_specificMachine;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlprotocolstatemachine.cpp b/src/uml/qumlprotocolstatemachine.cpp
index 66261598..ad23a3e4 100644
--- a/src/uml/qumlprotocolstatemachine.cpp
+++ b/src/uml/qumlprotocolstatemachine.cpp
@@ -95,25 +95,23 @@
 
     \brief A protocol state machine is always defined in the context of a classifier. It specifies which operations of the classifier can be called in which state and under which condition, thus specifying the allowed call sequences on the classifier's operations. A protocol state machine presents the possible and permitted transitions on the instances of its context classifier, together with the operations which carry the transitions. In this manner, an instance lifecycle can be created for a classifier, by specifying the order in which the operations can be activated and the states through which an instance progresses during its existence.
  */
-QUmlProtocolStateMachine::QUmlProtocolStateMachine(bool createQObject) :
+QUmlProtocolStateMachine::QUmlProtocolStateMachine(bool createQModelingObject) :
     QUmlStateMachine(false)
 {
-    if (createQObject)
-        _qObject = new QUmlProtocolStateMachineObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlProtocolStateMachineObject(this));
 }
 
 QUmlProtocolStateMachine::~QUmlProtocolStateMachine()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlProtocolStateMachine::clone() const
+QModelingElement *QUmlProtocolStateMachine::clone() const
 {
     QUmlProtocolStateMachine *c = new QUmlProtocolStateMachine;
     foreach (QUmlComment *element, ownedComments())
@@ -218,9 +216,9 @@ void QUmlProtocolStateMachine::addConformance(QUmlProtocolConformance *conforman
 
     if (!_conformance.contains(conformance)) {
         _conformance.insert(conformance);
-        if (conformance && conformance->asQObject() && this->asQObject())
-            QObject::connect(conformance->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeConformance(QObject *)));
-        conformance->asQObject()->setParent(this->asQObject());
+        if (conformance && conformance->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(conformance->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeConformance(QObject *)));
+        conformance->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(conformance);
@@ -238,8 +236,8 @@ void QUmlProtocolStateMachine::removeConformance(QUmlProtocolConformance *confor
 
     if (_conformance.contains(conformance)) {
         _conformance.remove(conformance);
-        if (conformance->asQObject())
-            conformance->asQObject()->setParent(0);
+        if (conformance->asQModelingObject())
+            conformance->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(conformance);
@@ -251,84 +249,3 @@ void QUmlProtocolStateMachine::removeConformance(QUmlProtocolConformance *confor
     }
 }
 
-void QUmlProtocolStateMachine::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedConnectors"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parts"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("roles"))));
-    _groupProperties.insert(QStringLiteral("QUmlEncapsulatedClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedPorts"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifierBehavior"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interfaceRealizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedBehaviors"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extensions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isActive"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedReceptions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superClasses"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameters"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameterSets"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("postconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("preconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("specification"))));
-    _groupProperties.insert(QStringLiteral("QUmlStateMachine"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("connectionPoints"))));
-    _groupProperties.insert(QStringLiteral("QUmlStateMachine"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extendedStateMachines"))));
-    _groupProperties.insert(QStringLiteral("QUmlStateMachine"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("regions"))));
-    _groupProperties.insert(QStringLiteral("QUmlStateMachine"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("submachineStates"))));
-    _groupProperties.insert(QStringLiteral("QUmlProtocolStateMachine"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("conformance"))));
-}
-
-void QUmlProtocolStateMachine::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolStateMachine")][QStringLiteral("conformance")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolStateMachine")][QStringLiteral("conformance")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProtocolStateMachine");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolStateMachine")][QStringLiteral("conformance")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolStateMachine")][QStringLiteral("conformance")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolStateMachine")][QStringLiteral("conformance")][QtModeling::DocumentationRole] = QStringLiteral("Conformance between protocol state machines.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolStateMachine")][QStringLiteral("conformance")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolStateMachine")][QStringLiteral("conformance")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_source_directedRelationship-directedRelationship Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolStateMachine")][QStringLiteral("conformance")][QtModeling::OppositeEndRole] = QStringLiteral("ProtocolConformance-specificMachine");
-
-}
-
diff --git a/src/uml/qumlprotocolstatemachine.h b/src/uml/qumlprotocolstatemachine.h
index d7f136e9..c97e14a9 100644
--- a/src/uml/qumlprotocolstatemachine.h
+++ b/src/uml/qumlprotocolstatemachine.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlStateMachine>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlProtocolConformance;
 class Q_UML_EXPORT QUmlProtocolStateMachine : public QUmlStateMachine
 {
 public:
-    explicit QUmlProtocolStateMachine(bool createQObject = true);
+    explicit QUmlProtocolStateMachine(bool createQModelingObject = true);
     virtual ~QUmlProtocolStateMachine();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlProtocolConformance *> conformance() const;
@@ -69,9 +68,6 @@ public:
 
 protected:
     QSet<QUmlProtocolConformance *> _conformance;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlprotocoltransition.cpp b/src/uml/qumlprotocoltransition.cpp
index f676cf56..ee443f36 100644
--- a/src/uml/qumlprotocoltransition.cpp
+++ b/src/uml/qumlprotocoltransition.cpp
@@ -70,27 +70,25 @@
 
     \brief A protocol transition specifies a legal transition for an operation. Transitions of protocol state machines have the following information: a pre condition (guard), on trigger, and a post condition. Every protocol transition is associated to zero or one operation (referred BehavioralFeature) that belongs to the context classifier of the protocol state machine.
  */
-QUmlProtocolTransition::QUmlProtocolTransition(bool createQObject) :
+QUmlProtocolTransition::QUmlProtocolTransition(bool createQModelingObject) :
     QUmlTransition(false),
     _postCondition(0),
     _preCondition(0)
 {
-    if (createQObject)
-        _qObject = new QUmlProtocolTransitionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlProtocolTransitionObject(this));
 }
 
 QUmlProtocolTransition::~QUmlProtocolTransition()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlProtocolTransition::clone() const
+QModelingElement *QUmlProtocolTransition::clone() const
 {
     QUmlProtocolTransition *c = new QUmlProtocolTransition;
     foreach (QUmlComment *element, ownedComments())
@@ -151,9 +149,9 @@ void QUmlProtocolTransition::setPostCondition(QUmlConstraint *postCondition)
         removeOwnedRule(_postCondition);
 
         _postCondition = postCondition;
-        if (postCondition && postCondition->asQObject() && this->asQObject())
-            QObject::connect(postCondition->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setPostCondition()));
-        postCondition->asQObject()->setParent(this->asQObject());
+        if (postCondition && postCondition->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(postCondition->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setPostCondition()));
+        postCondition->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (postCondition) {
@@ -180,9 +178,9 @@ void QUmlProtocolTransition::setPreCondition(QUmlConstraint *preCondition)
         // Adjust subsetted properties
 
         _preCondition = preCondition;
-        if (preCondition && preCondition->asQObject() && this->asQObject())
-            QObject::connect(preCondition->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setPreCondition()));
-        preCondition->asQObject()->setParent(this->asQObject());
+        if (preCondition && preCondition->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(preCondition->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setPreCondition()));
+        preCondition->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         setGuard(preCondition);
@@ -225,69 +223,3 @@ void QUmlProtocolTransition::removeReferred(QUmlOperation *referred)
     }
 }
 
-void QUmlProtocolTransition::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("container"))));
-    _groupProperties.insert(QStringLiteral("QUmlTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("effect"))));
-    _groupProperties.insert(QStringLiteral("QUmlTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("guard"))));
-    _groupProperties.insert(QStringLiteral("QUmlTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("kind"))));
-    _groupProperties.insert(QStringLiteral("QUmlTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedTransition"))));
-    _groupProperties.insert(QStringLiteral("QUmlTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContext"))));
-    _groupProperties.insert(QStringLiteral("QUmlTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("source"))));
-    _groupProperties.insert(QStringLiteral("QUmlTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("target"))));
-    _groupProperties.insert(QStringLiteral("QUmlTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("triggers"))));
-    _groupProperties.insert(QStringLiteral("QUmlProtocolTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("postCondition"))));
-    _groupProperties.insert(QStringLiteral("QUmlProtocolTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("preCondition"))));
-    _groupProperties.insert(QStringLiteral("QUmlProtocolTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("referred"))));
-}
-
-void QUmlProtocolTransition::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolTransition")][QStringLiteral("postCondition")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolTransition")][QStringLiteral("postCondition")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProtocolTransition");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolTransition")][QStringLiteral("postCondition")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolTransition")][QStringLiteral("postCondition")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolTransition")][QStringLiteral("postCondition")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the post condition of the transition which is the condition that should be obtained once the transition is triggered. This post condition is part of the post condition of the operation connected to the transition.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolTransition")][QStringLiteral("postCondition")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolTransition")][QStringLiteral("postCondition")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedRule");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolTransition")][QStringLiteral("postCondition")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolTransition")][QStringLiteral("preCondition")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolTransition")][QStringLiteral("preCondition")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProtocolTransition");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolTransition")][QStringLiteral("preCondition")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolTransition")][QStringLiteral("preCondition")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolTransition")][QStringLiteral("preCondition")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the precondition of the transition. It specifies the condition that should be verified before triggering the transition. This guard condition added to the source state will be evaluated as part of the precondition of the operation referred by the transition if any.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolTransition")][QStringLiteral("preCondition")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolTransition")][QStringLiteral("preCondition")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Transition-guard");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolTransition")][QStringLiteral("preCondition")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolTransition")][QStringLiteral("referred")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolTransition")][QStringLiteral("referred")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProtocolTransition");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolTransition")][QStringLiteral("referred")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolTransition")][QStringLiteral("referred")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolTransition")][QStringLiteral("referred")][QtModeling::DocumentationRole] = QStringLiteral("This association refers to the associated operation. It is derived from the operation of the call trigger when applicable.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolTransition")][QStringLiteral("referred")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolTransition")][QStringLiteral("referred")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlProtocolTransition")][QStringLiteral("referred")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlprotocoltransition.h b/src/uml/qumlprotocoltransition.h
index 19357b89..6f07ba65 100644
--- a/src/uml/qumlprotocoltransition.h
+++ b/src/uml/qumlprotocoltransition.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlTransition>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlOperation;
 class Q_UML_EXPORT QUmlProtocolTransition : public QUmlTransition
 {
 public:
-    explicit QUmlProtocolTransition(bool createQObject = true);
+    explicit QUmlProtocolTransition(bool createQModelingObject = true);
     virtual ~QUmlProtocolTransition();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlConstraint *postCondition() const;
@@ -75,9 +74,6 @@ public:
 protected:
     QUmlConstraint *_postCondition;
     QUmlConstraint *_preCondition;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlpseudostate.cpp b/src/uml/qumlpseudostate.cpp
index dc7b4384..0fcf7171 100644
--- a/src/uml/qumlpseudostate.cpp
+++ b/src/uml/qumlpseudostate.cpp
@@ -61,27 +61,25 @@
 
     \brief A pseudostate is an abstraction that encompasses different types of transient vertices in the state machine graph.
  */
-QUmlPseudostate::QUmlPseudostate(bool createQObject) :
+QUmlPseudostate::QUmlPseudostate(bool createQModelingObject) :
     _kind(QtUml::PseudostateKindInitial),
     _state(0),
     _stateMachine(0)
 {
-    if (createQObject)
-        _qObject = new QUmlPseudostateObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlPseudostateObject(this));
 }
 
 QUmlPseudostate::~QUmlPseudostate()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlPseudostate::clone() const
+QModelingElement *QUmlPseudostate::clone() const
 {
     QUmlPseudostate *c = new QUmlPseudostate;
     foreach (QUmlComment *element, ownedComments())
@@ -120,7 +118,7 @@ void QUmlPseudostate::setKind(QtUml::PseudostateKind kind)
 
     if (_kind != kind) {
         _kind = kind;
-        _modifiedResettableProperties << QStringLiteral("kind");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("kind");
     }
 }
 
@@ -142,8 +140,8 @@ void QUmlPseudostate::setState(QUmlState *state)
         // Adjust subsetted properties
 
         _state = state;
-        if (state && state->asQObject() && this->asQObject())
-            QObject::connect(state->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setState()));
+        if (state && state->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(state->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setState()));
 
         // Adjust subsetted properties
         setNamespace(state);
@@ -168,63 +166,11 @@ void QUmlPseudostate::setStateMachine(QUmlStateMachine *stateMachine)
         // Adjust subsetted properties
 
         _stateMachine = stateMachine;
-        if (stateMachine && stateMachine->asQObject() && this->asQObject())
-            QObject::connect(stateMachine->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setStateMachine()));
+        if (stateMachine && stateMachine->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(stateMachine->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setStateMachine()));
 
         // Adjust subsetted properties
         setNamespace(stateMachine);
     }
 }
 
-void QUmlPseudostate::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlVertex"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("container"))));
-    _groupProperties.insert(QStringLiteral("QUmlVertex"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlVertex"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlPseudostate"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("kind"))));
-    _groupProperties.insert(QStringLiteral("QUmlPseudostate"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("state"))));
-    _groupProperties.insert(QStringLiteral("QUmlPseudostate"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("stateMachine"))));
-}
-
-void QUmlPseudostate::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPseudostate")][QStringLiteral("kind")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPseudostate")][QStringLiteral("kind")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPseudostate");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPseudostate")][QStringLiteral("kind")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPseudostate")][QStringLiteral("kind")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPseudostate")][QStringLiteral("kind")][QtModeling::DocumentationRole] = QStringLiteral("Determines the precise type of the Pseudostate and can be one of: entryPoint, exitPoint, initial, deepHistory, shallowHistory, join, fork, junction, terminate or choice.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPseudostate")][QStringLiteral("kind")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPseudostate")][QStringLiteral("kind")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPseudostate")][QStringLiteral("kind")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPseudostate")][QStringLiteral("state")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPseudostate")][QStringLiteral("state")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPseudostate");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPseudostate")][QStringLiteral("state")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPseudostate")][QStringLiteral("state")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPseudostate")][QStringLiteral("state")][QtModeling::DocumentationRole] = QStringLiteral("The State that owns this pseudostate and in which it appears.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPseudostate")][QStringLiteral("state")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPseudostate")][QStringLiteral("state")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPseudostate")][QStringLiteral("state")][QtModeling::OppositeEndRole] = QStringLiteral("State-connectionPoint");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPseudostate")][QStringLiteral("stateMachine")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPseudostate")][QStringLiteral("stateMachine")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPseudostate");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPseudostate")][QStringLiteral("stateMachine")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPseudostate")][QStringLiteral("stateMachine")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPseudostate")][QStringLiteral("stateMachine")][QtModeling::DocumentationRole] = QStringLiteral("The StateMachine in which this Pseudostate is defined. This only applies to Pseudostates of the kind entryPoint or exitPoint.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPseudostate")][QStringLiteral("stateMachine")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPseudostate")][QStringLiteral("stateMachine")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlPseudostate")][QStringLiteral("stateMachine")][QtModeling::OppositeEndRole] = QStringLiteral("StateMachine-connectionPoint");
-
-}
-
diff --git a/src/uml/qumlpseudostate.h b/src/uml/qumlpseudostate.h
index e36a7bcd..8c2f6ac4 100644
--- a/src/uml/qumlpseudostate.h
+++ b/src/uml/qumlpseudostate.h
@@ -47,7 +47,6 @@
 
 
 #include <QtUml/QtUmlNamespace>
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -60,10 +59,10 @@ class QUmlStateMachine;
 class Q_UML_EXPORT QUmlPseudostate : public QUmlVertex
 {
 public:
-    explicit QUmlPseudostate(bool createQObject = true);
+    explicit QUmlPseudostate(bool createQModelingObject = true);
     virtual ~QUmlPseudostate();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QtUml::PseudostateKind kind() const;
@@ -77,9 +76,6 @@ protected:
     QtUml::PseudostateKind _kind;
     QUmlState *_state;
     QUmlStateMachine *_stateMachine;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlqualifiervalue.cpp b/src/uml/qumlqualifiervalue.cpp
index 98819bf0..1b34aced 100644
--- a/src/uml/qumlqualifiervalue.cpp
+++ b/src/uml/qumlqualifiervalue.cpp
@@ -54,26 +54,24 @@
 
     \brief A qualifier value is not an action. It is an element that identifies links. It gives a single qualifier within a link end data specification.
  */
-QUmlQualifierValue::QUmlQualifierValue(bool createQObject) :
+QUmlQualifierValue::QUmlQualifierValue(bool createQModelingObject) :
     _qualifier(0),
     _value(0)
 {
-    if (createQObject)
-        _qObject = new QUmlQualifierValueObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlQualifierValueObject(this));
 }
 
 QUmlQualifierValue::~QUmlQualifierValue()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlQualifierValue::clone() const
+QModelingElement *QUmlQualifierValue::clone() const
 {
     QUmlQualifierValue *c = new QUmlQualifierValue;
     foreach (QUmlComment *element, ownedComments())
@@ -103,8 +101,8 @@ void QUmlQualifierValue::setQualifier(QUmlProperty *qualifier)
 
     if (_qualifier != qualifier) {
         _qualifier = qualifier;
-        if (qualifier && qualifier->asQObject() && this->asQObject())
-            QObject::connect(qualifier->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setQualifier()));
+        if (qualifier && qualifier->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(qualifier->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setQualifier()));
     }
 }
 
@@ -124,41 +122,8 @@ void QUmlQualifierValue::setValue(QUmlInputPin *value)
 
     if (_value != value) {
         _value = value;
-        if (value && value->asQObject() && this->asQObject())
-            QObject::connect(value->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setValue()));
+        if (value && value->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(value->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setValue()));
     }
 }
 
-void QUmlQualifierValue::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlQualifierValue"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifier"))));
-    _groupProperties.insert(QStringLiteral("QUmlQualifierValue"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("value"))));
-}
-
-void QUmlQualifierValue::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlQualifierValue")][QStringLiteral("qualifier")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlQualifierValue")][QStringLiteral("qualifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlQualifierValue");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlQualifierValue")][QStringLiteral("qualifier")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlQualifierValue")][QStringLiteral("qualifier")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlQualifierValue")][QStringLiteral("qualifier")][QtModeling::DocumentationRole] = QStringLiteral("Attribute representing the qualifier for which the value is to be specified.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlQualifierValue")][QStringLiteral("qualifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlQualifierValue")][QStringLiteral("qualifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlQualifierValue")][QStringLiteral("qualifier")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlQualifierValue")][QStringLiteral("value")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlQualifierValue")][QStringLiteral("value")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlQualifierValue");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlQualifierValue")][QStringLiteral("value")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlQualifierValue")][QStringLiteral("value")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlQualifierValue")][QStringLiteral("value")][QtModeling::DocumentationRole] = QStringLiteral("Input pin from which the specified value for the qualifier is taken.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlQualifierValue")][QStringLiteral("value")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlQualifierValue")][QStringLiteral("value")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlQualifierValue")][QStringLiteral("value")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlqualifiervalue.h b/src/uml/qumlqualifiervalue.h
index cf90dc99..dccf1068 100644
--- a/src/uml/qumlqualifiervalue.h
+++ b/src/uml/qumlqualifiervalue.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlProperty;
 class Q_UML_EXPORT QUmlQualifierValue : public QUmlElement
 {
 public:
-    explicit QUmlQualifierValue(bool createQObject = true);
+    explicit QUmlQualifierValue(bool createQModelingObject = true);
     virtual ~QUmlQualifierValue();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlProperty *qualifier() const;
@@ -72,9 +71,6 @@ public:
 protected:
     QUmlProperty *_qualifier;
     QUmlInputPin *_value;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlraiseexceptionaction.cpp b/src/uml/qumlraiseexceptionaction.cpp
index 33092527..ef843985 100644
--- a/src/uml/qumlraiseexceptionaction.cpp
+++ b/src/uml/qumlraiseexceptionaction.cpp
@@ -70,25 +70,23 @@
 
     \brief A raise exception action is an action that causes an exception to occur. The input value becomes the exception object.
  */
-QUmlRaiseExceptionAction::QUmlRaiseExceptionAction(bool createQObject) :
+QUmlRaiseExceptionAction::QUmlRaiseExceptionAction(bool createQModelingObject) :
     _exception(0)
 {
-    if (createQObject)
-        _qObject = new QUmlRaiseExceptionActionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlRaiseExceptionActionObject(this));
 }
 
 QUmlRaiseExceptionAction::~QUmlRaiseExceptionAction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlRaiseExceptionAction::clone() const
+QModelingElement *QUmlRaiseExceptionAction::clone() const
 {
     QUmlRaiseExceptionAction *c = new QUmlRaiseExceptionAction;
     foreach (QUmlComment *element, ownedComments())
@@ -147,9 +145,9 @@ void QUmlRaiseExceptionAction::setException(QUmlInputPin *exception)
         removeInput(_exception);
 
         _exception = exception;
-        if (exception && exception->asQObject() && this->asQObject())
-            QObject::connect(exception->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setException()));
-        exception->asQObject()->setParent(this->asQObject());
+        if (exception && exception->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(exception->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setException()));
+        exception->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (exception) {
@@ -158,50 +156,3 @@ void QUmlRaiseExceptionAction::setException(QUmlInputPin *exception)
     }
 }
 
-void QUmlRaiseExceptionAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlRaiseExceptionAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("exception"))));
-}
-
-void QUmlRaiseExceptionAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRaiseExceptionAction")][QStringLiteral("exception")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRaiseExceptionAction")][QStringLiteral("exception")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRaiseExceptionAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRaiseExceptionAction")][QStringLiteral("exception")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRaiseExceptionAction")][QStringLiteral("exception")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRaiseExceptionAction")][QStringLiteral("exception")][QtModeling::DocumentationRole] = QStringLiteral("An input pin whose value becomes an exception object.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRaiseExceptionAction")][QStringLiteral("exception")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRaiseExceptionAction")][QStringLiteral("exception")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRaiseExceptionAction")][QStringLiteral("exception")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlraiseexceptionaction.h b/src/uml/qumlraiseexceptionaction.h
index 987a930e..d052f7b3 100644
--- a/src/uml/qumlraiseexceptionaction.h
+++ b/src/uml/qumlraiseexceptionaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlInputPin;
 class Q_UML_EXPORT QUmlRaiseExceptionAction : public QUmlAction
 {
 public:
-    explicit QUmlRaiseExceptionAction(bool createQObject = true);
+    explicit QUmlRaiseExceptionAction(bool createQModelingObject = true);
     virtual ~QUmlRaiseExceptionAction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlInputPin *exception() const;
@@ -68,9 +67,6 @@ public:
 
 protected:
     QUmlInputPin *_exception;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlreadextentaction.cpp b/src/uml/qumlreadextentaction.cpp
index 8f03dc1e..097cc2e8 100644
--- a/src/uml/qumlreadextentaction.cpp
+++ b/src/uml/qumlreadextentaction.cpp
@@ -70,26 +70,24 @@
 
     \brief A read extent action is an action that retrieves the current instances of a classifier.
  */
-QUmlReadExtentAction::QUmlReadExtentAction(bool createQObject) :
+QUmlReadExtentAction::QUmlReadExtentAction(bool createQModelingObject) :
     _classifier(0),
     _result(0)
 {
-    if (createQObject)
-        _qObject = new QUmlReadExtentActionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlReadExtentActionObject(this));
 }
 
 QUmlReadExtentAction::~QUmlReadExtentAction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlReadExtentAction::clone() const
+QModelingElement *QUmlReadExtentAction::clone() const
 {
     QUmlReadExtentAction *c = new QUmlReadExtentAction;
     foreach (QUmlComment *element, ownedComments())
@@ -147,8 +145,8 @@ void QUmlReadExtentAction::setClassifier(QUmlClassifier *classifier)
 
     if (_classifier != classifier) {
         _classifier = classifier;
-        if (classifier && classifier->asQObject() && this->asQObject())
-            QObject::connect(classifier->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setClassifier()));
+        if (classifier && classifier->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(classifier->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setClassifier()));
     }
 }
 
@@ -171,9 +169,9 @@ void QUmlReadExtentAction::setResult(QUmlOutputPin *result)
         removeOutput(_result);
 
         _result = result;
-        if (result && result->asQObject() && this->asQObject())
-            QObject::connect(result->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setResult()));
-        result->asQObject()->setParent(this->asQObject());
+        if (result && result->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(result->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setResult()));
+        result->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (result) {
@@ -182,60 +180,3 @@ void QUmlReadExtentAction::setResult(QUmlOutputPin *result)
     }
 }
 
-void QUmlReadExtentAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlReadExtentAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifier"))));
-    _groupProperties.insert(QStringLiteral("QUmlReadExtentAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("result"))));
-}
-
-void QUmlReadExtentAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadExtentAction")][QStringLiteral("classifier")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadExtentAction")][QStringLiteral("classifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReadExtentAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadExtentAction")][QStringLiteral("classifier")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadExtentAction")][QStringLiteral("classifier")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadExtentAction")][QStringLiteral("classifier")][QtModeling::DocumentationRole] = QStringLiteral("The classifier whose instances are to be retrieved.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadExtentAction")][QStringLiteral("classifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadExtentAction")][QStringLiteral("classifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadExtentAction")][QStringLiteral("classifier")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadExtentAction")][QStringLiteral("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadExtentAction")][QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReadExtentAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadExtentAction")][QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadExtentAction")][QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadExtentAction")][QStringLiteral("result")][QtModeling::DocumentationRole] = QStringLiteral("The runtime instances of the classifier.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadExtentAction")][QStringLiteral("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadExtentAction")][QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadExtentAction")][QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlreadextentaction.h b/src/uml/qumlreadextentaction.h
index 6accd053..69b5c054 100644
--- a/src/uml/qumlreadextentaction.h
+++ b/src/uml/qumlreadextentaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlOutputPin;
 class Q_UML_EXPORT QUmlReadExtentAction : public QUmlAction
 {
 public:
-    explicit QUmlReadExtentAction(bool createQObject = true);
+    explicit QUmlReadExtentAction(bool createQModelingObject = true);
     virtual ~QUmlReadExtentAction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlClassifier *classifier() const;
@@ -72,9 +71,6 @@ public:
 protected:
     QUmlClassifier *_classifier;
     QUmlOutputPin *_result;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlreadisclassifiedobjectaction.cpp b/src/uml/qumlreadisclassifiedobjectaction.cpp
index 69d49a60..7d07d767 100644
--- a/src/uml/qumlreadisclassifiedobjectaction.cpp
+++ b/src/uml/qumlreadisclassifiedobjectaction.cpp
@@ -70,28 +70,26 @@
 
     \brief A read is classified object action is an action that determines whether a runtime object is classified by a given classifier.
  */
-QUmlReadIsClassifiedObjectAction::QUmlReadIsClassifiedObjectAction(bool createQObject) :
+QUmlReadIsClassifiedObjectAction::QUmlReadIsClassifiedObjectAction(bool createQModelingObject) :
     _classifier(0),
     _isDirect(false),
     _object(0),
     _result(0)
 {
-    if (createQObject)
-        _qObject = new QUmlReadIsClassifiedObjectActionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlReadIsClassifiedObjectActionObject(this));
 }
 
 QUmlReadIsClassifiedObjectAction::~QUmlReadIsClassifiedObjectAction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlReadIsClassifiedObjectAction::clone() const
+QModelingElement *QUmlReadIsClassifiedObjectAction::clone() const
 {
     QUmlReadIsClassifiedObjectAction *c = new QUmlReadIsClassifiedObjectAction;
     foreach (QUmlComment *element, ownedComments())
@@ -152,8 +150,8 @@ void QUmlReadIsClassifiedObjectAction::setClassifier(QUmlClassifier *classifier)
 
     if (_classifier != classifier) {
         _classifier = classifier;
-        if (classifier && classifier->asQObject() && this->asQObject())
-            QObject::connect(classifier->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setClassifier()));
+        if (classifier && classifier->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(classifier->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setClassifier()));
     }
 }
 
@@ -173,7 +171,7 @@ void QUmlReadIsClassifiedObjectAction::setDirect(bool isDirect)
 
     if (_isDirect != isDirect) {
         _isDirect = isDirect;
-        _modifiedResettableProperties << QStringLiteral("isDirect");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isDirect");
     }
 }
 
@@ -196,9 +194,9 @@ void QUmlReadIsClassifiedObjectAction::setObject(QUmlInputPin *object)
         removeInput(_object);
 
         _object = object;
-        if (object && object->asQObject() && this->asQObject())
-            QObject::connect(object->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setObject()));
-        object->asQObject()->setParent(this->asQObject());
+        if (object && object->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(object->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setObject()));
+        object->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (object) {
@@ -226,9 +224,9 @@ void QUmlReadIsClassifiedObjectAction::setResult(QUmlOutputPin *result)
         removeOutput(_result);
 
         _result = result;
-        if (result && result->asQObject() && this->asQObject())
-            QObject::connect(result->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setResult()));
-        result->asQObject()->setParent(this->asQObject());
+        if (result && result->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(result->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setResult()));
+        result->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (result) {
@@ -237,80 +235,3 @@ void QUmlReadIsClassifiedObjectAction::setResult(QUmlOutputPin *result)
     }
 }
 
-void QUmlReadIsClassifiedObjectAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlReadIsClassifiedObjectAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifier"))));
-    _groupProperties.insert(QStringLiteral("QUmlReadIsClassifiedObjectAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isDirect"))));
-    _groupProperties.insert(QStringLiteral("QUmlReadIsClassifiedObjectAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("object"))));
-    _groupProperties.insert(QStringLiteral("QUmlReadIsClassifiedObjectAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("result"))));
-}
-
-void QUmlReadIsClassifiedObjectAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadIsClassifiedObjectAction")][QStringLiteral("classifier")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadIsClassifiedObjectAction")][QStringLiteral("classifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReadIsClassifiedObjectAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadIsClassifiedObjectAction")][QStringLiteral("classifier")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadIsClassifiedObjectAction")][QStringLiteral("classifier")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadIsClassifiedObjectAction")][QStringLiteral("classifier")][QtModeling::DocumentationRole] = QStringLiteral("The classifier against which the classification of the input object is tested.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadIsClassifiedObjectAction")][QStringLiteral("classifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadIsClassifiedObjectAction")][QStringLiteral("classifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadIsClassifiedObjectAction")][QStringLiteral("classifier")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadIsClassifiedObjectAction")][QStringLiteral("isDirect")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadIsClassifiedObjectAction")][QStringLiteral("isDirect")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReadIsClassifiedObjectAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadIsClassifiedObjectAction")][QStringLiteral("isDirect")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadIsClassifiedObjectAction")][QStringLiteral("isDirect")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadIsClassifiedObjectAction")][QStringLiteral("isDirect")][QtModeling::DocumentationRole] = QStringLiteral("Indicates whether the classifier must directly classify the input object.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadIsClassifiedObjectAction")][QStringLiteral("isDirect")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadIsClassifiedObjectAction")][QStringLiteral("isDirect")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadIsClassifiedObjectAction")][QStringLiteral("isDirect")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadIsClassifiedObjectAction")][QStringLiteral("object")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadIsClassifiedObjectAction")][QStringLiteral("object")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReadIsClassifiedObjectAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadIsClassifiedObjectAction")][QStringLiteral("object")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadIsClassifiedObjectAction")][QStringLiteral("object")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadIsClassifiedObjectAction")][QStringLiteral("object")][QtModeling::DocumentationRole] = QStringLiteral("Holds the object whose classification is to be tested.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadIsClassifiedObjectAction")][QStringLiteral("object")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadIsClassifiedObjectAction")][QStringLiteral("object")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadIsClassifiedObjectAction")][QStringLiteral("object")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadIsClassifiedObjectAction")][QStringLiteral("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadIsClassifiedObjectAction")][QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReadIsClassifiedObjectAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadIsClassifiedObjectAction")][QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadIsClassifiedObjectAction")][QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadIsClassifiedObjectAction")][QStringLiteral("result")][QtModeling::DocumentationRole] = QStringLiteral("After termination of the action, will hold the result of the test.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadIsClassifiedObjectAction")][QStringLiteral("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadIsClassifiedObjectAction")][QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadIsClassifiedObjectAction")][QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlreadisclassifiedobjectaction.h b/src/uml/qumlreadisclassifiedobjectaction.h
index 37a4ddf0..f5f40c4c 100644
--- a/src/uml/qumlreadisclassifiedobjectaction.h
+++ b/src/uml/qumlreadisclassifiedobjectaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -59,10 +58,10 @@ class QUmlOutputPin;
 class Q_UML_EXPORT QUmlReadIsClassifiedObjectAction : public QUmlAction
 {
 public:
-    explicit QUmlReadIsClassifiedObjectAction(bool createQObject = true);
+    explicit QUmlReadIsClassifiedObjectAction(bool createQModelingObject = true);
     virtual ~QUmlReadIsClassifiedObjectAction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlClassifier *classifier() const;
@@ -79,9 +78,6 @@ protected:
     bool _isDirect;
     QUmlInputPin *_object;
     QUmlOutputPin *_result;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlreadlinkaction.cpp b/src/uml/qumlreadlinkaction.cpp
index c1452562..26860b2b 100644
--- a/src/uml/qumlreadlinkaction.cpp
+++ b/src/uml/qumlreadlinkaction.cpp
@@ -72,25 +72,23 @@
 
     \brief A read link action is a link action that navigates across associations to retrieve objects on one end.
  */
-QUmlReadLinkAction::QUmlReadLinkAction(bool createQObject) :
+QUmlReadLinkAction::QUmlReadLinkAction(bool createQModelingObject) :
     _result(0)
 {
-    if (createQObject)
-        _qObject = new QUmlReadLinkActionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlReadLinkActionObject(this));
 }
 
 QUmlReadLinkAction::~QUmlReadLinkAction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlReadLinkAction::clone() const
+QModelingElement *QUmlReadLinkAction::clone() const
 {
     QUmlReadLinkAction *c = new QUmlReadLinkAction;
     foreach (QUmlComment *element, ownedComments())
@@ -153,9 +151,9 @@ void QUmlReadLinkAction::setResult(QUmlOutputPin *result)
         removeOutput(_result);
 
         _result = result;
-        if (result && result->asQObject() && this->asQObject())
-            QObject::connect(result->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setResult()));
-        result->asQObject()->setParent(this->asQObject());
+        if (result && result->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(result->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setResult()));
+        result->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (result) {
@@ -164,52 +162,3 @@ void QUmlReadLinkAction::setResult(QUmlOutputPin *result)
     }
 }
 
-void QUmlReadLinkAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlLinkAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("endData"))));
-    _groupProperties.insert(QStringLiteral("QUmlLinkAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputValues"))));
-    _groupProperties.insert(QStringLiteral("QUmlReadLinkAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("result"))));
-}
-
-void QUmlReadLinkAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkAction")][QStringLiteral("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkAction")][QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReadLinkAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkAction")][QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkAction")][QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkAction")][QStringLiteral("result")][QtModeling::DocumentationRole] = QStringLiteral("The pin on which are put the objects participating in the association at the end not specified by the inputs.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkAction")][QStringLiteral("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkAction")][QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkAction")][QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlreadlinkaction.h b/src/uml/qumlreadlinkaction.h
index 90bd2ae9..86bc1ec0 100644
--- a/src/uml/qumlreadlinkaction.h
+++ b/src/uml/qumlreadlinkaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlLinkAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlOutputPin;
 class Q_UML_EXPORT QUmlReadLinkAction : public QUmlLinkAction
 {
 public:
-    explicit QUmlReadLinkAction(bool createQObject = true);
+    explicit QUmlReadLinkAction(bool createQModelingObject = true);
     virtual ~QUmlReadLinkAction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlOutputPin *result() const;
@@ -68,9 +67,6 @@ public:
 
 protected:
     QUmlOutputPin *_result;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlreadlinkobjectendaction.cpp b/src/uml/qumlreadlinkobjectendaction.cpp
index 405d4eb5..ea98ef02 100644
--- a/src/uml/qumlreadlinkobjectendaction.cpp
+++ b/src/uml/qumlreadlinkobjectendaction.cpp
@@ -71,27 +71,25 @@
 
     \brief A read link object end action is an action that retrieves an end object from a link object.
  */
-QUmlReadLinkObjectEndAction::QUmlReadLinkObjectEndAction(bool createQObject) :
+QUmlReadLinkObjectEndAction::QUmlReadLinkObjectEndAction(bool createQModelingObject) :
     _end(0),
     _object(0),
     _result(0)
 {
-    if (createQObject)
-        _qObject = new QUmlReadLinkObjectEndActionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlReadLinkObjectEndActionObject(this));
 }
 
 QUmlReadLinkObjectEndAction::~QUmlReadLinkObjectEndAction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlReadLinkObjectEndAction::clone() const
+QModelingElement *QUmlReadLinkObjectEndAction::clone() const
 {
     QUmlReadLinkObjectEndAction *c = new QUmlReadLinkObjectEndAction;
     foreach (QUmlComment *element, ownedComments())
@@ -151,8 +149,8 @@ void QUmlReadLinkObjectEndAction::setEnd(QUmlProperty *end)
 
     if (_end != end) {
         _end = end;
-        if (end && end->asQObject() && this->asQObject())
-            QObject::connect(end->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setEnd()));
+        if (end && end->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(end->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setEnd()));
     }
 }
 
@@ -175,9 +173,9 @@ void QUmlReadLinkObjectEndAction::setObject(QUmlInputPin *object)
         removeInput(_object);
 
         _object = object;
-        if (object && object->asQObject() && this->asQObject())
-            QObject::connect(object->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setObject()));
-        object->asQObject()->setParent(this->asQObject());
+        if (object && object->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(object->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setObject()));
+        object->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (object) {
@@ -205,9 +203,9 @@ void QUmlReadLinkObjectEndAction::setResult(QUmlOutputPin *result)
         removeOutput(_result);
 
         _result = result;
-        if (result && result->asQObject() && this->asQObject())
-            QObject::connect(result->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setResult()));
-        result->asQObject()->setParent(this->asQObject());
+        if (result && result->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(result->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setResult()));
+        result->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (result) {
@@ -216,70 +214,3 @@ void QUmlReadLinkObjectEndAction::setResult(QUmlOutputPin *result)
     }
 }
 
-void QUmlReadLinkObjectEndAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlReadLinkObjectEndAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("end"))));
-    _groupProperties.insert(QStringLiteral("QUmlReadLinkObjectEndAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("object"))));
-    _groupProperties.insert(QStringLiteral("QUmlReadLinkObjectEndAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("result"))));
-}
-
-void QUmlReadLinkObjectEndAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndAction")][QStringLiteral("end")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndAction")][QStringLiteral("end")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReadLinkObjectEndAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndAction")][QStringLiteral("end")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndAction")][QStringLiteral("end")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndAction")][QStringLiteral("end")][QtModeling::DocumentationRole] = QStringLiteral("Link end to be read.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndAction")][QStringLiteral("end")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndAction")][QStringLiteral("end")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndAction")][QStringLiteral("end")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndAction")][QStringLiteral("object")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndAction")][QStringLiteral("object")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReadLinkObjectEndAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndAction")][QStringLiteral("object")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndAction")][QStringLiteral("object")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndAction")][QStringLiteral("object")][QtModeling::DocumentationRole] = QStringLiteral("Gives the input pin from which the link object is obtained.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndAction")][QStringLiteral("object")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndAction")][QStringLiteral("object")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndAction")][QStringLiteral("object")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndAction")][QStringLiteral("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndAction")][QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReadLinkObjectEndAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndAction")][QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndAction")][QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndAction")][QStringLiteral("result")][QtModeling::DocumentationRole] = QStringLiteral("Pin where the result value is placed.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndAction")][QStringLiteral("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndAction")][QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndAction")][QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlreadlinkobjectendaction.h b/src/uml/qumlreadlinkobjectendaction.h
index 77198090..a7ebe777 100644
--- a/src/uml/qumlreadlinkobjectendaction.h
+++ b/src/uml/qumlreadlinkobjectendaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -59,10 +58,10 @@ class QUmlProperty;
 class Q_UML_EXPORT QUmlReadLinkObjectEndAction : public QUmlAction
 {
 public:
-    explicit QUmlReadLinkObjectEndAction(bool createQObject = true);
+    explicit QUmlReadLinkObjectEndAction(bool createQModelingObject = true);
     virtual ~QUmlReadLinkObjectEndAction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlProperty *end() const;
@@ -76,9 +75,6 @@ protected:
     QUmlProperty *_end;
     QUmlInputPin *_object;
     QUmlOutputPin *_result;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlreadlinkobjectendqualifieraction.cpp b/src/uml/qumlreadlinkobjectendqualifieraction.cpp
index 60258934..c3190904 100644
--- a/src/uml/qumlreadlinkobjectendqualifieraction.cpp
+++ b/src/uml/qumlreadlinkobjectendqualifieraction.cpp
@@ -71,27 +71,25 @@
 
     \brief A read link object end qualifier action is an action that retrieves a qualifier end value from a link object.
  */
-QUmlReadLinkObjectEndQualifierAction::QUmlReadLinkObjectEndQualifierAction(bool createQObject) :
+QUmlReadLinkObjectEndQualifierAction::QUmlReadLinkObjectEndQualifierAction(bool createQModelingObject) :
     _object(0),
     _qualifier(0),
     _result(0)
 {
-    if (createQObject)
-        _qObject = new QUmlReadLinkObjectEndQualifierActionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlReadLinkObjectEndQualifierActionObject(this));
 }
 
 QUmlReadLinkObjectEndQualifierAction::~QUmlReadLinkObjectEndQualifierAction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlReadLinkObjectEndQualifierAction::clone() const
+QModelingElement *QUmlReadLinkObjectEndQualifierAction::clone() const
 {
     QUmlReadLinkObjectEndQualifierAction *c = new QUmlReadLinkObjectEndQualifierAction;
     foreach (QUmlComment *element, ownedComments())
@@ -154,9 +152,9 @@ void QUmlReadLinkObjectEndQualifierAction::setObject(QUmlInputPin *object)
         removeInput(_object);
 
         _object = object;
-        if (object && object->asQObject() && this->asQObject())
-            QObject::connect(object->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setObject()));
-        object->asQObject()->setParent(this->asQObject());
+        if (object && object->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(object->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setObject()));
+        object->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (object) {
@@ -181,8 +179,8 @@ void QUmlReadLinkObjectEndQualifierAction::setQualifier(QUmlProperty *qualifier)
 
     if (_qualifier != qualifier) {
         _qualifier = qualifier;
-        if (qualifier && qualifier->asQObject() && this->asQObject())
-            QObject::connect(qualifier->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setQualifier()));
+        if (qualifier && qualifier->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(qualifier->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setQualifier()));
     }
 }
 
@@ -205,9 +203,9 @@ void QUmlReadLinkObjectEndQualifierAction::setResult(QUmlOutputPin *result)
         removeOutput(_result);
 
         _result = result;
-        if (result && result->asQObject() && this->asQObject())
-            QObject::connect(result->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setResult()));
-        result->asQObject()->setParent(this->asQObject());
+        if (result && result->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(result->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setResult()));
+        result->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (result) {
@@ -216,70 +214,3 @@ void QUmlReadLinkObjectEndQualifierAction::setResult(QUmlOutputPin *result)
     }
 }
 
-void QUmlReadLinkObjectEndQualifierAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlReadLinkObjectEndQualifierAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("object"))));
-    _groupProperties.insert(QStringLiteral("QUmlReadLinkObjectEndQualifierAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifier"))));
-    _groupProperties.insert(QStringLiteral("QUmlReadLinkObjectEndQualifierAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("result"))));
-}
-
-void QUmlReadLinkObjectEndQualifierAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndQualifierAction")][QStringLiteral("object")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndQualifierAction")][QStringLiteral("object")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReadLinkObjectEndQualifierAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndQualifierAction")][QStringLiteral("object")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndQualifierAction")][QStringLiteral("object")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndQualifierAction")][QStringLiteral("object")][QtModeling::DocumentationRole] = QStringLiteral("Gives the input pin from which the link object is obtained.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndQualifierAction")][QStringLiteral("object")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndQualifierAction")][QStringLiteral("object")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndQualifierAction")][QStringLiteral("object")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndQualifierAction")][QStringLiteral("qualifier")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndQualifierAction")][QStringLiteral("qualifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReadLinkObjectEndQualifierAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndQualifierAction")][QStringLiteral("qualifier")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndQualifierAction")][QStringLiteral("qualifier")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndQualifierAction")][QStringLiteral("qualifier")][QtModeling::DocumentationRole] = QStringLiteral("The attribute representing the qualifier to be read.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndQualifierAction")][QStringLiteral("qualifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndQualifierAction")][QStringLiteral("qualifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndQualifierAction")][QStringLiteral("qualifier")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndQualifierAction")][QStringLiteral("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndQualifierAction")][QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReadLinkObjectEndQualifierAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndQualifierAction")][QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndQualifierAction")][QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndQualifierAction")][QStringLiteral("result")][QtModeling::DocumentationRole] = QStringLiteral("Pin where the result value is placed.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndQualifierAction")][QStringLiteral("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndQualifierAction")][QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadLinkObjectEndQualifierAction")][QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlreadlinkobjectendqualifieraction.h b/src/uml/qumlreadlinkobjectendqualifieraction.h
index cbbc52b8..f1feb8b4 100644
--- a/src/uml/qumlreadlinkobjectendqualifieraction.h
+++ b/src/uml/qumlreadlinkobjectendqualifieraction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -59,10 +58,10 @@ class QUmlProperty;
 class Q_UML_EXPORT QUmlReadLinkObjectEndQualifierAction : public QUmlAction
 {
 public:
-    explicit QUmlReadLinkObjectEndQualifierAction(bool createQObject = true);
+    explicit QUmlReadLinkObjectEndQualifierAction(bool createQModelingObject = true);
     virtual ~QUmlReadLinkObjectEndQualifierAction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlInputPin *object() const;
@@ -76,9 +75,6 @@ protected:
     QUmlInputPin *_object;
     QUmlProperty *_qualifier;
     QUmlOutputPin *_result;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlreadselfaction.cpp b/src/uml/qumlreadselfaction.cpp
index 4092448e..d9eb3728 100644
--- a/src/uml/qumlreadselfaction.cpp
+++ b/src/uml/qumlreadselfaction.cpp
@@ -70,25 +70,23 @@
 
     \brief A read self action is an action that retrieves the host object of an action.
  */
-QUmlReadSelfAction::QUmlReadSelfAction(bool createQObject) :
+QUmlReadSelfAction::QUmlReadSelfAction(bool createQModelingObject) :
     _result(0)
 {
-    if (createQObject)
-        _qObject = new QUmlReadSelfActionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlReadSelfActionObject(this));
 }
 
 QUmlReadSelfAction::~QUmlReadSelfAction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlReadSelfAction::clone() const
+QModelingElement *QUmlReadSelfAction::clone() const
 {
     QUmlReadSelfAction *c = new QUmlReadSelfAction;
     foreach (QUmlComment *element, ownedComments())
@@ -147,9 +145,9 @@ void QUmlReadSelfAction::setResult(QUmlOutputPin *result)
         removeOutput(_result);
 
         _result = result;
-        if (result && result->asQObject() && this->asQObject())
-            QObject::connect(result->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setResult()));
-        result->asQObject()->setParent(this->asQObject());
+        if (result && result->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(result->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setResult()));
+        result->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (result) {
@@ -158,50 +156,3 @@ void QUmlReadSelfAction::setResult(QUmlOutputPin *result)
     }
 }
 
-void QUmlReadSelfAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlReadSelfAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("result"))));
-}
-
-void QUmlReadSelfAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadSelfAction")][QStringLiteral("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadSelfAction")][QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReadSelfAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadSelfAction")][QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadSelfAction")][QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadSelfAction")][QStringLiteral("result")][QtModeling::DocumentationRole] = QStringLiteral("Gives the output pin on which the hosting object is placed.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadSelfAction")][QStringLiteral("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadSelfAction")][QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadSelfAction")][QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlreadselfaction.h b/src/uml/qumlreadselfaction.h
index c45852a5..7b00877d 100644
--- a/src/uml/qumlreadselfaction.h
+++ b/src/uml/qumlreadselfaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlOutputPin;
 class Q_UML_EXPORT QUmlReadSelfAction : public QUmlAction
 {
 public:
-    explicit QUmlReadSelfAction(bool createQObject = true);
+    explicit QUmlReadSelfAction(bool createQModelingObject = true);
     virtual ~QUmlReadSelfAction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlOutputPin *result() const;
@@ -68,9 +67,6 @@ public:
 
 protected:
     QUmlOutputPin *_result;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlreadstructuralfeatureaction.cpp b/src/uml/qumlreadstructuralfeatureaction.cpp
index fe50cda3..dde7d493 100644
--- a/src/uml/qumlreadstructuralfeatureaction.cpp
+++ b/src/uml/qumlreadstructuralfeatureaction.cpp
@@ -71,25 +71,23 @@
 
     \brief A read structural feature action is a structural feature action that retrieves the values of a structural feature.
  */
-QUmlReadStructuralFeatureAction::QUmlReadStructuralFeatureAction(bool createQObject) :
+QUmlReadStructuralFeatureAction::QUmlReadStructuralFeatureAction(bool createQModelingObject) :
     _result(0)
 {
-    if (createQObject)
-        _qObject = new QUmlReadStructuralFeatureActionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlReadStructuralFeatureActionObject(this));
 }
 
 QUmlReadStructuralFeatureAction::~QUmlReadStructuralFeatureAction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlReadStructuralFeatureAction::clone() const
+QModelingElement *QUmlReadStructuralFeatureAction::clone() const
 {
     QUmlReadStructuralFeatureAction *c = new QUmlReadStructuralFeatureAction;
     foreach (QUmlComment *element, ownedComments())
@@ -152,9 +150,9 @@ void QUmlReadStructuralFeatureAction::setResult(QUmlOutputPin *result)
         removeOutput(_result);
 
         _result = result;
-        if (result && result->asQObject() && this->asQObject())
-            QObject::connect(result->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setResult()));
-        result->asQObject()->setParent(this->asQObject());
+        if (result && result->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(result->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setResult()));
+        result->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (result) {
@@ -163,52 +161,3 @@ void QUmlReadStructuralFeatureAction::setResult(QUmlOutputPin *result)
     }
 }
 
-void QUmlReadStructuralFeatureAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuralFeatureAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("object"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuralFeatureAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("structuralFeature"))));
-    _groupProperties.insert(QStringLiteral("QUmlReadStructuralFeatureAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("result"))));
-}
-
-void QUmlReadStructuralFeatureAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadStructuralFeatureAction")][QStringLiteral("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadStructuralFeatureAction")][QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReadStructuralFeatureAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadStructuralFeatureAction")][QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadStructuralFeatureAction")][QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadStructuralFeatureAction")][QStringLiteral("result")][QtModeling::DocumentationRole] = QStringLiteral("Gives the output pin on which the result is put.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadStructuralFeatureAction")][QStringLiteral("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadStructuralFeatureAction")][QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadStructuralFeatureAction")][QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlreadstructuralfeatureaction.h b/src/uml/qumlreadstructuralfeatureaction.h
index e6a6cc6c..feff0376 100644
--- a/src/uml/qumlreadstructuralfeatureaction.h
+++ b/src/uml/qumlreadstructuralfeatureaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlStructuralFeatureAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlOutputPin;
 class Q_UML_EXPORT QUmlReadStructuralFeatureAction : public QUmlStructuralFeatureAction
 {
 public:
-    explicit QUmlReadStructuralFeatureAction(bool createQObject = true);
+    explicit QUmlReadStructuralFeatureAction(bool createQModelingObject = true);
     virtual ~QUmlReadStructuralFeatureAction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlOutputPin *result() const;
@@ -68,9 +67,6 @@ public:
 
 protected:
     QUmlOutputPin *_result;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlreadvariableaction.cpp b/src/uml/qumlreadvariableaction.cpp
index ea5dd2a0..9fad67a0 100644
--- a/src/uml/qumlreadvariableaction.cpp
+++ b/src/uml/qumlreadvariableaction.cpp
@@ -71,25 +71,23 @@
 
     \brief A read variable action is a variable action that retrieves the values of a variable.
  */
-QUmlReadVariableAction::QUmlReadVariableAction(bool createQObject) :
+QUmlReadVariableAction::QUmlReadVariableAction(bool createQModelingObject) :
     _result(0)
 {
-    if (createQObject)
-        _qObject = new QUmlReadVariableActionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlReadVariableActionObject(this));
 }
 
 QUmlReadVariableAction::~QUmlReadVariableAction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlReadVariableAction::clone() const
+QModelingElement *QUmlReadVariableAction::clone() const
 {
     QUmlReadVariableAction *c = new QUmlReadVariableAction;
     foreach (QUmlComment *element, ownedComments())
@@ -150,9 +148,9 @@ void QUmlReadVariableAction::setResult(QUmlOutputPin *result)
         removeOutput(_result);
 
         _result = result;
-        if (result && result->asQObject() && this->asQObject())
-            QObject::connect(result->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setResult()));
-        result->asQObject()->setParent(this->asQObject());
+        if (result && result->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(result->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setResult()));
+        result->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (result) {
@@ -161,51 +159,3 @@ void QUmlReadVariableAction::setResult(QUmlOutputPin *result)
     }
 }
 
-void QUmlReadVariableAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlVariableAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("variable"))));
-    _groupProperties.insert(QStringLiteral("QUmlReadVariableAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("result"))));
-}
-
-void QUmlReadVariableAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadVariableAction")][QStringLiteral("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadVariableAction")][QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReadVariableAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadVariableAction")][QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadVariableAction")][QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadVariableAction")][QStringLiteral("result")][QtModeling::DocumentationRole] = QStringLiteral("Gives the output pin on which the result is put.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadVariableAction")][QStringLiteral("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadVariableAction")][QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReadVariableAction")][QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlreadvariableaction.h b/src/uml/qumlreadvariableaction.h
index 0587cf7e..8fe3c8e4 100644
--- a/src/uml/qumlreadvariableaction.h
+++ b/src/uml/qumlreadvariableaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlVariableAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlOutputPin;
 class Q_UML_EXPORT QUmlReadVariableAction : public QUmlVariableAction
 {
 public:
-    explicit QUmlReadVariableAction(bool createQObject = true);
+    explicit QUmlReadVariableAction(bool createQModelingObject = true);
     virtual ~QUmlReadVariableAction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlOutputPin *result() const;
@@ -68,9 +67,6 @@ public:
 
 protected:
     QUmlOutputPin *_result;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlrealization.cpp b/src/uml/qumlrealization.cpp
index d4d2e4da..5e6b0806 100644
--- a/src/uml/qumlrealization.cpp
+++ b/src/uml/qumlrealization.cpp
@@ -60,25 +60,23 @@
 
     \brief Realization is a specialized abstraction relationship between two sets of model elements, one representing a specification (the supplier) and the other represents an implementation of the latter (the client). Realization can be used to model stepwise refinement, optimizations, transformations, templates, model synthesis, framework composition, etc.
  */
-QUmlRealization::QUmlRealization(bool createQObject) :
+QUmlRealization::QUmlRealization(bool createQModelingObject) :
     QUmlAbstraction(false)
 {
-    if (createQObject)
-        _qObject = new QUmlRealizationObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlRealizationObject(this));
 }
 
 QUmlRealization::~QUmlRealization()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlRealization::clone() const
+QModelingElement *QUmlRealization::clone() const
 {
     QUmlRealization *c = new QUmlRealization;
     foreach (QUmlComment *element, ownedComments())
@@ -102,30 +100,3 @@ QModelingObject *QUmlRealization::clone() const
     return c;
 }
 
-void QUmlRealization::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
-    _groupProperties.insert(QStringLiteral("QUmlDependency"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clients"))));
-    _groupProperties.insert(QStringLiteral("QUmlDependency"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("suppliers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAbstraction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("mapping"))));
-}
-
-void QUmlRealization::setPropertyData()
-{
-}
-
diff --git a/src/uml/qumlrealization.h b/src/uml/qumlrealization.h
index 1bce3ed8..f90fabf8 100644
--- a/src/uml/qumlrealization.h
+++ b/src/uml/qumlrealization.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlAbstraction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,16 +54,13 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlRealization : public QUmlAbstraction
 {
 public:
-    explicit QUmlRealization(bool createQObject = true);
+    explicit QUmlRealization(bool createQModelingObject = true);
     virtual ~QUmlRealization();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
 
 protected:
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlreception.cpp b/src/uml/qumlreception.cpp
index 0e38f439..5cd2448e 100644
--- a/src/uml/qumlreception.cpp
+++ b/src/uml/qumlreception.cpp
@@ -68,25 +68,23 @@
 
     \brief A reception is a declaration stating that a classifier is prepared to react to the receipt of a signal. A reception designates a signal and specifies the expected behavioral response. The details of handling a signal are specified by the behavior associated with the reception or the classifier itself.
  */
-QUmlReception::QUmlReception(bool createQObject) :
+QUmlReception::QUmlReception(bool createQModelingObject) :
     _signal(0)
 {
-    if (createQObject)
-        _qObject = new QUmlReceptionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlReceptionObject(this));
 }
 
 QUmlReception::~QUmlReception()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlReception::clone() const
+QModelingElement *QUmlReception::clone() const
 {
     QUmlReception *c = new QUmlReception;
     foreach (QUmlComment *element, ownedComments())
@@ -138,54 +136,8 @@ void QUmlReception::setSignal(QUmlSignal *signal)
 
     if (_signal != signal) {
         _signal = signal;
-        if (signal && signal->asQObject() && this->asQObject())
-            QObject::connect(signal->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setSignal()));
+        if (signal && signal->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(signal->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setSignal()));
     }
 }
 
-void QUmlReception::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("featuringClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isStatic"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioralFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("concurrency"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioralFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioralFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("methods"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioralFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameters"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioralFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameterSets"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioralFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("raisedExceptions"))));
-    _groupProperties.insert(QStringLiteral("QUmlReception"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("signal"))));
-}
-
-void QUmlReception::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReception")][QStringLiteral("signal")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReception")][QStringLiteral("signal")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReception");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReception")][QStringLiteral("signal")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReception")][QStringLiteral("signal")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReception")][QStringLiteral("signal")][QtModeling::DocumentationRole] = QStringLiteral("The signal that this reception handles.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReception")][QStringLiteral("signal")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReception")][QStringLiteral("signal")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReception")][QStringLiteral("signal")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlreception.h b/src/uml/qumlreception.h
index 3f495fff..b13adcb0 100644
--- a/src/uml/qumlreception.h
+++ b/src/uml/qumlreception.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlBehavioralFeature>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlSignal;
 class Q_UML_EXPORT QUmlReception : public QUmlBehavioralFeature
 {
 public:
-    explicit QUmlReception(bool createQObject = true);
+    explicit QUmlReception(bool createQModelingObject = true);
     virtual ~QUmlReception();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlSignal *signal() const;
@@ -68,9 +67,6 @@ public:
 
 protected:
     QUmlSignal *_signal;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlreclassifyobjectaction.cpp b/src/uml/qumlreclassifyobjectaction.cpp
index 9ad7c12d..53033a4f 100644
--- a/src/uml/qumlreclassifyobjectaction.cpp
+++ b/src/uml/qumlreclassifyobjectaction.cpp
@@ -70,26 +70,24 @@
 
     \brief A reclassify object action is an action that changes which classifiers classify an object.
  */
-QUmlReclassifyObjectAction::QUmlReclassifyObjectAction(bool createQObject) :
+QUmlReclassifyObjectAction::QUmlReclassifyObjectAction(bool createQModelingObject) :
     _isReplaceAll(false),
     _object(0)
 {
-    if (createQObject)
-        _qObject = new QUmlReclassifyObjectActionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlReclassifyObjectActionObject(this));
 }
 
 QUmlReclassifyObjectAction::~QUmlReclassifyObjectAction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlReclassifyObjectAction::clone() const
+QModelingElement *QUmlReclassifyObjectAction::clone() const
 {
     QUmlReclassifyObjectAction *c = new QUmlReclassifyObjectAction;
     foreach (QUmlComment *element, ownedComments())
@@ -150,7 +148,7 @@ void QUmlReclassifyObjectAction::setReplaceAll(bool isReplaceAll)
 
     if (_isReplaceAll != isReplaceAll) {
         _isReplaceAll = isReplaceAll;
-        _modifiedResettableProperties << QStringLiteral("isReplaceAll");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isReplaceAll");
     }
 }
 
@@ -170,8 +168,8 @@ void QUmlReclassifyObjectAction::addNewClassifier(QUmlClassifier *newClassifier)
 
     if (!_newClassifiers.contains(newClassifier)) {
         _newClassifiers.insert(newClassifier);
-        if (newClassifier && newClassifier->asQObject() && this->asQObject())
-            QObject::connect(newClassifier->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeNewClassifier(QObject *)));
+        if (newClassifier && newClassifier->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(newClassifier->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeNewClassifier(QObject *)));
     }
 }
 
@@ -203,9 +201,9 @@ void QUmlReclassifyObjectAction::setObject(QUmlInputPin *object)
         removeInput(_object);
 
         _object = object;
-        if (object && object->asQObject() && this->asQObject())
-            QObject::connect(object->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setObject()));
-        object->asQObject()->setParent(this->asQObject());
+        if (object && object->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(object->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setObject()));
+        object->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (object) {
@@ -230,8 +228,8 @@ void QUmlReclassifyObjectAction::addOldClassifier(QUmlClassifier *oldClassifier)
 
     if (!_oldClassifiers.contains(oldClassifier)) {
         _oldClassifiers.insert(oldClassifier);
-        if (oldClassifier && oldClassifier->asQObject() && this->asQObject())
-            QObject::connect(oldClassifier->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeOldClassifier(QObject *)));
+        if (oldClassifier && oldClassifier->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(oldClassifier->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeOldClassifier(QObject *)));
     }
 }
 
@@ -244,80 +242,3 @@ void QUmlReclassifyObjectAction::removeOldClassifier(QUmlClassifier *oldClassifi
     }
 }
 
-void QUmlReclassifyObjectAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlReclassifyObjectAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isReplaceAll"))));
-    _groupProperties.insert(QStringLiteral("QUmlReclassifyObjectAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("newClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlReclassifyObjectAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("object"))));
-    _groupProperties.insert(QStringLiteral("QUmlReclassifyObjectAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("oldClassifiers"))));
-}
-
-void QUmlReclassifyObjectAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("isReplaceAll")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("isReplaceAll")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReclassifyObjectAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("isReplaceAll")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("isReplaceAll")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("isReplaceAll")][QtModeling::DocumentationRole] = QStringLiteral("Specifies whether existing classifiers should be removed before adding the new classifiers.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("isReplaceAll")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("isReplaceAll")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("isReplaceAll")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("newClassifiers")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("newClassifiers")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReclassifyObjectAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("newClassifiers")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("newClassifiers")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("newClassifiers")][QtModeling::DocumentationRole] = QStringLiteral("A set of classifiers to be added to the classifiers of the object.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("newClassifiers")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("newClassifiers")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("newClassifiers")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("object")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("object")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReclassifyObjectAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("object")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("object")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("object")][QtModeling::DocumentationRole] = QStringLiteral("Holds the object to be reclassified.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("object")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("object")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("object")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("oldClassifiers")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("oldClassifiers")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReclassifyObjectAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("oldClassifiers")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("oldClassifiers")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("oldClassifiers")][QtModeling::DocumentationRole] = QStringLiteral("A set of classifiers to be removed from the classifiers of the object.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("oldClassifiers")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("oldClassifiers")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("oldClassifiers")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlreclassifyobjectaction.h b/src/uml/qumlreclassifyobjectaction.h
index c994a381..5e8212ec 100644
--- a/src/uml/qumlreclassifyobjectaction.h
+++ b/src/uml/qumlreclassifyobjectaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlInputPin;
 class Q_UML_EXPORT QUmlReclassifyObjectAction : public QUmlAction
 {
 public:
-    explicit QUmlReclassifyObjectAction(bool createQObject = true);
+    explicit QUmlReclassifyObjectAction(bool createQModelingObject = true);
     virtual ~QUmlReclassifyObjectAction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     bool isReplaceAll() const;
@@ -80,9 +79,6 @@ protected:
     QSet<QUmlClassifier *> _newClassifiers;
     QUmlInputPin *_object;
     QSet<QUmlClassifier *> _oldClassifiers;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlredefinableelement.cpp b/src/uml/qumlredefinableelement.cpp
index 18261cf4..30bee339 100644
--- a/src/uml/qumlredefinableelement.cpp
+++ b/src/uml/qumlredefinableelement.cpp
@@ -59,15 +59,13 @@
 QUmlRedefinableElement::QUmlRedefinableElement() :
     _isLeaf(false)
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlRedefinableElement::~QUmlRedefinableElement()
 {
 }
 
-QModelingObject *QUmlRedefinableElement::clone() const
+QModelingElement *QUmlRedefinableElement::clone() const
 {
     QUmlRedefinableElement *c = new QUmlRedefinableElement;
     foreach (QUmlComment *element, ownedComments())
@@ -100,7 +98,7 @@ void QUmlRedefinableElement::setLeaf(bool isLeaf)
 
     if (_isLeaf != isLeaf) {
         _isLeaf = isLeaf;
-        _modifiedResettableProperties << QStringLiteral("isLeaf");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isLeaf");
     }
 }
 
@@ -120,8 +118,8 @@ void QUmlRedefinableElement::addRedefinedElement(QUmlRedefinableElement *redefin
 
     if (!_redefinedElements.contains(redefinedElement)) {
         _redefinedElements.insert(redefinedElement);
-        if (redefinedElement && redefinedElement->asQObject() && this->asQObject())
-            QObject::connect(redefinedElement->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeRedefinedElement(QObject *)));
+        if (redefinedElement && redefinedElement->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(redefinedElement->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeRedefinedElement(QObject *)));
     }
 }
 
@@ -150,8 +148,8 @@ void QUmlRedefinableElement::addRedefinitionContext(QUmlClassifier *redefinition
 
     if (!_redefinitionContexts.contains(redefinitionContext)) {
         _redefinitionContexts.insert(redefinitionContext);
-        if (redefinitionContext && redefinitionContext->asQObject() && this->asQObject())
-            QObject::connect(redefinitionContext->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeRedefinitionContext(QObject *)));
+        if (redefinitionContext && redefinitionContext->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(redefinitionContext->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeRedefinitionContext(QObject *)));
     }
 }
 
@@ -188,52 +186,3 @@ bool QUmlRedefinableElement::isRedefinitionContextValid(QUmlRedefinableElement *
     return bool ();
 }
 
-void QUmlRedefinableElement::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-}
-
-void QUmlRedefinableElement::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("isLeaf")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("isLeaf")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRedefinableElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("isLeaf")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("isLeaf")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("isLeaf")][QtModeling::DocumentationRole] = QStringLiteral("Indicates whether it is possible to further redefine a RedefinableElement. If the value is true, then it is not possible to further redefine the RedefinableElement. Note that this property is preserved through package merge operations; that is, the capability to redefine a RedefinableElement (i.e., isLeaf=false) must be preserved in the resulting RedefinableElement of a package merge operation where a RedefinableElement with isLeaf=false is merged with a matching RedefinableElement with isLeaf=true: the resulting RedefinableElement will have isLeaf=false. Default value is false.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("isLeaf")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("isLeaf")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("isLeaf")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("redefinedElements")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("redefinedElements")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRedefinableElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("redefinedElements")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("redefinedElements")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("redefinedElements")][QtModeling::DocumentationRole] = QStringLiteral("The redefinable element that is being redefined by this element.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("redefinedElements")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("redefinedElements")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("redefinedElements")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("redefinitionContexts")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("redefinitionContexts")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRedefinableElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("redefinitionContexts")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("redefinitionContexts")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("redefinitionContexts")][QtModeling::DocumentationRole] = QStringLiteral("References the contexts that this element may be redefined from.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("redefinitionContexts")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("redefinitionContexts")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("redefinitionContexts")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlredefinableelement.h b/src/uml/qumlredefinableelement.h
index 04bbc659..53d0d65e 100644
--- a/src/uml/qumlredefinableelement.h
+++ b/src/uml/qumlredefinableelement.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlNamedElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -59,7 +58,7 @@ class Q_UML_EXPORT QUmlRedefinableElement : public virtual QUmlNamedElement
 public:
     virtual ~QUmlRedefinableElement();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     bool isLeaf() const;
@@ -81,9 +80,6 @@ protected:
     bool _isLeaf;
     QSet<QUmlRedefinableElement *> _redefinedElements;
     QSet<QUmlClassifier *> _redefinitionContexts;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlredefinabletemplatesignature.cpp b/src/uml/qumlredefinabletemplatesignature.cpp
index 5319d326..781357c2 100644
--- a/src/uml/qumlredefinabletemplatesignature.cpp
+++ b/src/uml/qumlredefinabletemplatesignature.cpp
@@ -61,26 +61,24 @@
 
     \brief A redefinable template signature supports the addition of formal template parameters in a specialization of a template classifier.
  */
-QUmlRedefinableTemplateSignature::QUmlRedefinableTemplateSignature(bool createQObject) :
+QUmlRedefinableTemplateSignature::QUmlRedefinableTemplateSignature(bool createQModelingObject) :
     QUmlTemplateSignature(false),
     _classifier(0)
 {
-    if (createQObject)
-        _qObject = new QUmlRedefinableTemplateSignatureObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlRedefinableTemplateSignatureObject(this));
 }
 
 QUmlRedefinableTemplateSignature::~QUmlRedefinableTemplateSignature()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlRedefinableTemplateSignature::clone() const
+QModelingElement *QUmlRedefinableTemplateSignature::clone() const
 {
     QUmlRedefinableTemplateSignature *c = new QUmlRedefinableTemplateSignature;
     foreach (QUmlComment *element, ownedComments())
@@ -126,8 +124,8 @@ void QUmlRedefinableTemplateSignature::setClassifier(QUmlClassifier *classifier)
         removeRedefinitionContext(_classifier);
 
         _classifier = classifier;
-        if (classifier && classifier->asQObject() && this->asQObject())
-            QObject::connect(classifier->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setClassifier()));
+        if (classifier && classifier->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(classifier->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setClassifier()));
 
         // Adjust subsetted properties
         if (classifier) {
@@ -152,8 +150,8 @@ void QUmlRedefinableTemplateSignature::addExtendedSignature(QUmlRedefinableTempl
 
     if (!_extendedSignatures.contains(extendedSignature)) {
         _extendedSignatures.insert(extendedSignature);
-        if (extendedSignature && extendedSignature->asQObject() && this->asQObject())
-            QObject::connect(extendedSignature->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeExtendedSignature(QObject *)));
+        if (extendedSignature && extendedSignature->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(extendedSignature->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeExtendedSignature(QObject *)));
 
         // Adjust subsetted properties
         addRedefinedElement(extendedSignature);
@@ -227,58 +225,3 @@ bool QUmlRedefinableTemplateSignature::isConsistentWith(QUmlRedefinableElement *
     return bool ();
 }
 
-void QUmlRedefinableTemplateSignature::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateSignature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameters"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateSignature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parameters"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateSignature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("template_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableTemplateSignature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifier"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableTemplateSignature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extendedSignatures"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableTemplateSignature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedParameters"))));
-}
-
-void QUmlRedefinableTemplateSignature::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("classifier")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("classifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRedefinableTemplateSignature");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("classifier")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("classifier")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("classifier")][QtModeling::DocumentationRole] = QStringLiteral("The classifier that owns this template signature.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("classifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("TemplateSignature-template");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("classifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("RedefinableElement-redefinitionContext");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("classifier")][QtModeling::OppositeEndRole] = QStringLiteral("Classifier-ownedTemplateSignature");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("extendedSignatures")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("extendedSignatures")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRedefinableTemplateSignature");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("extendedSignatures")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("extendedSignatures")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("extendedSignatures")][QtModeling::DocumentationRole] = QStringLiteral("The template signature that is extended by this template signature.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("extendedSignatures")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("extendedSignatures")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("RedefinableElement-redefinedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("extendedSignatures")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("inheritedParameters")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("inheritedParameters")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRedefinableTemplateSignature");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("inheritedParameters")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("inheritedParameters")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("inheritedParameters")][QtModeling::DocumentationRole] = QStringLiteral("The formal template parameters of the extendedSignature.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("inheritedParameters")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("inheritedParameters")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("TemplateSignature-parameter");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("inheritedParameters")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlredefinabletemplatesignature.h b/src/uml/qumlredefinabletemplatesignature.h
index 22aed004..a11b4ba5 100644
--- a/src/uml/qumlredefinabletemplatesignature.h
+++ b/src/uml/qumlredefinabletemplatesignature.h
@@ -46,7 +46,6 @@
 #include <QtUml/QUmlTemplateSignature>
 #include <QtUml/QUmlRedefinableElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -59,10 +58,10 @@ class QUmlTemplateParameter;
 class Q_UML_EXPORT QUmlRedefinableTemplateSignature : public QUmlTemplateSignature, public QUmlRedefinableElement
 {
 public:
-    explicit QUmlRedefinableTemplateSignature(bool createQObject = true);
+    explicit QUmlRedefinableTemplateSignature(bool createQModelingObject = true);
     virtual ~QUmlRedefinableTemplateSignature();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlClassifier *classifier() const;
@@ -80,9 +79,6 @@ public:
 protected:
     QUmlClassifier *_classifier;
     QSet<QUmlRedefinableTemplateSignature *> _extendedSignatures;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlreduceaction.cpp b/src/uml/qumlreduceaction.cpp
index 6d9dff6a..fdb206fd 100644
--- a/src/uml/qumlreduceaction.cpp
+++ b/src/uml/qumlreduceaction.cpp
@@ -71,28 +71,26 @@
 
     \brief A reduce action is an action that reduces a collection to a single value by combining the elements of the collection.
  */
-QUmlReduceAction::QUmlReduceAction(bool createQObject) :
+QUmlReduceAction::QUmlReduceAction(bool createQModelingObject) :
     _collection(0),
     _isOrdered(false),
     _reducer(0),
     _result(0)
 {
-    if (createQObject)
-        _qObject = new QUmlReduceActionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlReduceActionObject(this));
 }
 
 QUmlReduceAction::~QUmlReduceAction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlReduceAction::clone() const
+QModelingElement *QUmlReduceAction::clone() const
 {
     QUmlReduceAction *c = new QUmlReduceAction;
     foreach (QUmlComment *element, ownedComments())
@@ -156,9 +154,9 @@ void QUmlReduceAction::setCollection(QUmlInputPin *collection)
         removeInput(_collection);
 
         _collection = collection;
-        if (collection && collection->asQObject() && this->asQObject())
-            QObject::connect(collection->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setCollection()));
-        collection->asQObject()->setParent(this->asQObject());
+        if (collection && collection->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(collection->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setCollection()));
+        collection->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (collection) {
@@ -183,7 +181,7 @@ void QUmlReduceAction::setOrdered(bool isOrdered)
 
     if (_isOrdered != isOrdered) {
         _isOrdered = isOrdered;
-        _modifiedResettableProperties << QStringLiteral("isOrdered");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isOrdered");
     }
 }
 
@@ -203,8 +201,8 @@ void QUmlReduceAction::setReducer(QUmlBehavior *reducer)
 
     if (_reducer != reducer) {
         _reducer = reducer;
-        if (reducer && reducer->asQObject() && this->asQObject())
-            QObject::connect(reducer->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setReducer()));
+        if (reducer && reducer->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(reducer->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setReducer()));
     }
 }
 
@@ -227,9 +225,9 @@ void QUmlReduceAction::setResult(QUmlOutputPin *result)
         removeOutput(_result);
 
         _result = result;
-        if (result && result->asQObject() && this->asQObject())
-            QObject::connect(result->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setResult()));
-        result->asQObject()->setParent(this->asQObject());
+        if (result && result->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(result->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setResult()));
+        result->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (result) {
@@ -238,80 +236,3 @@ void QUmlReduceAction::setResult(QUmlOutputPin *result)
     }
 }
 
-void QUmlReduceAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlReduceAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collection"))));
-    _groupProperties.insert(QStringLiteral("QUmlReduceAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isOrdered"))));
-    _groupProperties.insert(QStringLiteral("QUmlReduceAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("reducer"))));
-    _groupProperties.insert(QStringLiteral("QUmlReduceAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("result"))));
-}
-
-void QUmlReduceAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReduceAction")][QStringLiteral("collection")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReduceAction")][QStringLiteral("collection")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReduceAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReduceAction")][QStringLiteral("collection")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReduceAction")][QStringLiteral("collection")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReduceAction")][QStringLiteral("collection")][QtModeling::DocumentationRole] = QStringLiteral("The collection to be reduced.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReduceAction")][QStringLiteral("collection")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReduceAction")][QStringLiteral("collection")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReduceAction")][QStringLiteral("collection")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReduceAction")][QStringLiteral("isOrdered")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReduceAction")][QStringLiteral("isOrdered")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReduceAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReduceAction")][QStringLiteral("isOrdered")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReduceAction")][QStringLiteral("isOrdered")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReduceAction")][QStringLiteral("isOrdered")][QtModeling::DocumentationRole] = QStringLiteral("Tells whether the order of the input collection should determine the order in which the behavior is applied to its elements.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReduceAction")][QStringLiteral("isOrdered")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReduceAction")][QStringLiteral("isOrdered")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReduceAction")][QStringLiteral("isOrdered")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReduceAction")][QStringLiteral("reducer")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReduceAction")][QStringLiteral("reducer")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReduceAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReduceAction")][QStringLiteral("reducer")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReduceAction")][QStringLiteral("reducer")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReduceAction")][QStringLiteral("reducer")][QtModeling::DocumentationRole] = QStringLiteral("Behavior that is applied to two elements of the input collection to produce a value that is the same type as elements of the collection.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReduceAction")][QStringLiteral("reducer")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReduceAction")][QStringLiteral("reducer")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReduceAction")][QStringLiteral("reducer")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReduceAction")][QStringLiteral("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReduceAction")][QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReduceAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReduceAction")][QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReduceAction")][QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReduceAction")][QStringLiteral("result")][QtModeling::DocumentationRole] = QStringLiteral("Gives the output pin on which the result is put.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReduceAction")][QStringLiteral("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReduceAction")][QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReduceAction")][QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlreduceaction.h b/src/uml/qumlreduceaction.h
index 5b92cfde..1f2d52ab 100644
--- a/src/uml/qumlreduceaction.h
+++ b/src/uml/qumlreduceaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -59,10 +58,10 @@ class QUmlOutputPin;
 class Q_UML_EXPORT QUmlReduceAction : public QUmlAction
 {
 public:
-    explicit QUmlReduceAction(bool createQObject = true);
+    explicit QUmlReduceAction(bool createQModelingObject = true);
     virtual ~QUmlReduceAction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlInputPin *collection() const;
@@ -79,9 +78,6 @@ protected:
     bool _isOrdered;
     QUmlBehavior *_reducer;
     QUmlOutputPin *_result;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlregion.cpp b/src/uml/qumlregion.cpp
index ae958171..301b7b59 100644
--- a/src/uml/qumlregion.cpp
+++ b/src/uml/qumlregion.cpp
@@ -67,27 +67,25 @@
 
     \brief A region is an orthogonal part of either a composite state or a state machine. It contains states and transitions.
  */
-QUmlRegion::QUmlRegion(bool createQObject) :
+QUmlRegion::QUmlRegion(bool createQModelingObject) :
     _extendedRegion(0),
     _state(0),
     _stateMachine(0)
 {
-    if (createQObject)
-        _qObject = new QUmlRegionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlRegionObject(this));
 }
 
 QUmlRegion::~QUmlRegion()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlRegion::clone() const
+QModelingElement *QUmlRegion::clone() const
 {
     QUmlRegion *c = new QUmlRegion;
     foreach (QUmlComment *element, ownedComments())
@@ -139,8 +137,8 @@ void QUmlRegion::setExtendedRegion(QUmlRegion *extendedRegion)
         removeRedefinedElement(_extendedRegion);
 
         _extendedRegion = extendedRegion;
-        if (extendedRegion && extendedRegion->asQObject() && this->asQObject())
-            QObject::connect(extendedRegion->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setExtendedRegion()));
+        if (extendedRegion && extendedRegion->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(extendedRegion->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setExtendedRegion()));
 
         // Adjust subsetted properties
         if (extendedRegion) {
@@ -191,8 +189,8 @@ void QUmlRegion::setState(QUmlState *state)
         // Adjust subsetted properties
 
         _state = state;
-        if (state && state->asQObject() && this->asQObject())
-            QObject::connect(state->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setState()));
+        if (state && state->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(state->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setState()));
 
         // Adjust subsetted properties
         setNamespace(state);
@@ -217,8 +215,8 @@ void QUmlRegion::setStateMachine(QUmlStateMachine *stateMachine)
         // Adjust subsetted properties
 
         _stateMachine = stateMachine;
-        if (stateMachine && stateMachine->asQObject() && this->asQObject())
-            QObject::connect(stateMachine->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setStateMachine()));
+        if (stateMachine && stateMachine->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(stateMachine->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setStateMachine()));
 
         // Adjust subsetted properties
         setNamespace(stateMachine);
@@ -241,9 +239,9 @@ void QUmlRegion::addSubvertex(QUmlVertex *subvertex)
 
     if (!_subvertices.contains(subvertex)) {
         _subvertices.insert(subvertex);
-        if (subvertex && subvertex->asQObject() && this->asQObject())
-            QObject::connect(subvertex->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeSubvertex(QObject *)));
-        subvertex->asQObject()->setParent(this->asQObject());
+        if (subvertex && subvertex->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(subvertex->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeSubvertex(QObject *)));
+        subvertex->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedMember(subvertex);
@@ -261,8 +259,8 @@ void QUmlRegion::removeSubvertex(QUmlVertex *subvertex)
 
     if (_subvertices.contains(subvertex)) {
         _subvertices.remove(subvertex);
-        if (subvertex->asQObject())
-            subvertex->asQObject()->setParent(0);
+        if (subvertex->asQModelingObject())
+            subvertex->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedMember(subvertex);
@@ -290,9 +288,9 @@ void QUmlRegion::addTransition(QUmlTransition *transition)
 
     if (!_transitions.contains(transition)) {
         _transitions.insert(transition);
-        if (transition && transition->asQObject() && this->asQObject())
-            QObject::connect(transition->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeTransition(QObject *)));
-        transition->asQObject()->setParent(this->asQObject());
+        if (transition && transition->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(transition->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeTransition(QObject *)));
+        transition->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedMember(transition);
@@ -310,8 +308,8 @@ void QUmlRegion::removeTransition(QUmlTransition *transition)
 
     if (_transitions.contains(transition)) {
         _transitions.remove(transition);
-        if (transition->asQObject())
-            transition->asQObject()->setParent(0);
+        if (transition->asQModelingObject())
+            transition->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedMember(transition);
@@ -367,90 +365,3 @@ bool QUmlRegion::isRedefinitionContextValid(QUmlRegion *redefined) const
     return bool ();
 }
 
-void QUmlRegion::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlRegion"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extendedRegion"))));
-    _groupProperties.insert(QStringLiteral("QUmlRegion"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContext"))));
-    _groupProperties.insert(QStringLiteral("QUmlRegion"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("state"))));
-    _groupProperties.insert(QStringLiteral("QUmlRegion"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("stateMachine"))));
-    _groupProperties.insert(QStringLiteral("QUmlRegion"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("subvertices"))));
-    _groupProperties.insert(QStringLiteral("QUmlRegion"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("transitions"))));
-}
-
-void QUmlRegion::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("extendedRegion")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("extendedRegion")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRegion");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("extendedRegion")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("extendedRegion")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("extendedRegion")][QtModeling::DocumentationRole] = QStringLiteral("The region of which this region is an extension.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("extendedRegion")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("extendedRegion")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("RedefinableElement-redefinedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("extendedRegion")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("redefinitionContext")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("redefinitionContext")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRegion");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("redefinitionContext")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("redefinitionContext")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("redefinitionContext")][QtModeling::DocumentationRole] = QStringLiteral("References the classifier in which context this element may be redefined.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("redefinitionContext")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("RedefinableElement-redefinitionContext");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("redefinitionContext")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("redefinitionContext")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("state")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("state")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRegion");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("state")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("state")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("state")][QtModeling::DocumentationRole] = QStringLiteral("The State that owns the Region. If a Region is owned by a State, then it cannot also be owned by a StateMachine.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("state")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("state")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("state")][QtModeling::OppositeEndRole] = QStringLiteral("State-region");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("stateMachine")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("stateMachine")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRegion");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("stateMachine")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("stateMachine")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("stateMachine")][QtModeling::DocumentationRole] = QStringLiteral("The StateMachine that owns the Region. If a Region is owned by a StateMachine, then it cannot also be owned by a State.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("stateMachine")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("stateMachine")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("stateMachine")][QtModeling::OppositeEndRole] = QStringLiteral("StateMachine-region");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("subvertices")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("subvertices")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRegion");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("subvertices")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("subvertices")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("subvertices")][QtModeling::DocumentationRole] = QStringLiteral("The set of vertices that are owned by this region.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("subvertices")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("subvertices")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("subvertices")][QtModeling::OppositeEndRole] = QStringLiteral("Vertex-container");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("transitions")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("transitions")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRegion");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("transitions")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("transitions")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("transitions")][QtModeling::DocumentationRole] = QStringLiteral("The set of transitions owned by the region.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("transitions")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("transitions")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("transitions")][QtModeling::OppositeEndRole] = QStringLiteral("Transition-container");
-
-}
-
diff --git a/src/uml/qumlregion.h b/src/uml/qumlregion.h
index 4ef697c7..8cdaf5d5 100644
--- a/src/uml/qumlregion.h
+++ b/src/uml/qumlregion.h
@@ -46,7 +46,6 @@
 #include <QtUml/QUmlRedefinableElement>
 #include <QtUml/QUmlNamespace>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -62,10 +61,10 @@ class QUmlVertex;
 class Q_UML_EXPORT QUmlRegion : public QUmlRedefinableElement, public QUmlNamespace
 {
 public:
-    explicit QUmlRegion(bool createQObject = true);
+    explicit QUmlRegion(bool createQModelingObject = true);
     virtual ~QUmlRegion();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlRegion *extendedRegion() const;
@@ -95,9 +94,6 @@ protected:
     QUmlStateMachine *_stateMachine;
     QSet<QUmlVertex *> _subvertices;
     QSet<QUmlTransition *> _transitions;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlrelationship.cpp b/src/uml/qumlrelationship.cpp
index f69207a1..a7f805bc 100644
--- a/src/uml/qumlrelationship.cpp
+++ b/src/uml/qumlrelationship.cpp
@@ -52,15 +52,13 @@
  */
 QUmlRelationship::QUmlRelationship()
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlRelationship::~QUmlRelationship()
 {
 }
 
-QModelingObject *QUmlRelationship::clone() const
+QModelingElement *QUmlRelationship::clone() const
 {
     QUmlRelationship *c = new QUmlRelationship;
     foreach (QUmlComment *element, ownedComments())
@@ -86,8 +84,8 @@ void QUmlRelationship::addRelatedElement(QUmlElement *relatedElement)
 
     if (!_relatedElements.contains(relatedElement)) {
         _relatedElements.insert(relatedElement);
-        if (relatedElement && relatedElement->asQObject() && this->asQObject())
-            QObject::connect(relatedElement->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeRelatedElement(QObject *)));
+        if (relatedElement && relatedElement->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(relatedElement->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeRelatedElement(QObject *)));
     }
 }
 
@@ -100,26 +98,3 @@ void QUmlRelationship::removeRelatedElement(QUmlElement *relatedElement)
     }
 }
 
-void QUmlRelationship::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
-}
-
-void QUmlRelationship::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRelationship")][QStringLiteral("relatedElements")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRelationship")][QStringLiteral("relatedElements")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRelationship");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRelationship")][QStringLiteral("relatedElements")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRelationship")][QStringLiteral("relatedElements")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRelationship")][QStringLiteral("relatedElements")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the elements related by the Relationship.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRelationship")][QStringLiteral("relatedElements")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRelationship")][QStringLiteral("relatedElements")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRelationship")][QStringLiteral("relatedElements")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlrelationship.h b/src/uml/qumlrelationship.h
index 8ec7d6f8..be6d2a29 100644
--- a/src/uml/qumlrelationship.h
+++ b/src/uml/qumlrelationship.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,7 +56,7 @@ class Q_UML_EXPORT QUmlRelationship : public virtual QUmlElement
 public:
     virtual ~QUmlRelationship();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlElement *> relatedElements() const;
@@ -68,9 +67,6 @@ protected:
     explicit QUmlRelationship();
 
     QSet<QUmlElement *> _relatedElements;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlremovestructuralfeaturevalueaction.cpp b/src/uml/qumlremovestructuralfeaturevalueaction.cpp
index a47995ff..e9513a7b 100644
--- a/src/uml/qumlremovestructuralfeaturevalueaction.cpp
+++ b/src/uml/qumlremovestructuralfeaturevalueaction.cpp
@@ -71,26 +71,24 @@
 
     \brief A remove structural feature value action is a write structural feature action that removes values from structural features.
  */
-QUmlRemoveStructuralFeatureValueAction::QUmlRemoveStructuralFeatureValueAction(bool createQObject) :
+QUmlRemoveStructuralFeatureValueAction::QUmlRemoveStructuralFeatureValueAction(bool createQModelingObject) :
     _isRemoveDuplicates(false),
     _removeAt(0)
 {
-    if (createQObject)
-        _qObject = new QUmlRemoveStructuralFeatureValueActionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlRemoveStructuralFeatureValueActionObject(this));
 }
 
 QUmlRemoveStructuralFeatureValueAction::~QUmlRemoveStructuralFeatureValueAction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlRemoveStructuralFeatureValueAction::clone() const
+QModelingElement *QUmlRemoveStructuralFeatureValueAction::clone() const
 {
     QUmlRemoveStructuralFeatureValueAction *c = new QUmlRemoveStructuralFeatureValueAction;
     foreach (QUmlComment *element, ownedComments())
@@ -155,7 +153,7 @@ void QUmlRemoveStructuralFeatureValueAction::setRemoveDuplicates(bool isRemoveDu
 
     if (_isRemoveDuplicates != isRemoveDuplicates) {
         _isRemoveDuplicates = isRemoveDuplicates;
-        _modifiedResettableProperties << QStringLiteral("isRemoveDuplicates");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isRemoveDuplicates");
     }
 }
 
@@ -178,9 +176,9 @@ void QUmlRemoveStructuralFeatureValueAction::setRemoveAt(QUmlInputPin *removeAt)
         removeInput(_removeAt);
 
         _removeAt = removeAt;
-        if (removeAt && removeAt->asQObject() && this->asQObject())
-            QObject::connect(removeAt->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setRemoveAt()));
-        removeAt->asQObject()->setParent(this->asQObject());
+        if (removeAt && removeAt->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(removeAt->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setRemoveAt()));
+        removeAt->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (removeAt) {
@@ -189,64 +187,3 @@ void QUmlRemoveStructuralFeatureValueAction::setRemoveAt(QUmlInputPin *removeAt)
     }
 }
 
-void QUmlRemoveStructuralFeatureValueAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuralFeatureAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("object"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuralFeatureAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("structuralFeature"))));
-    _groupProperties.insert(QStringLiteral("QUmlWriteStructuralFeatureAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("result"))));
-    _groupProperties.insert(QStringLiteral("QUmlWriteStructuralFeatureAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("value"))));
-    _groupProperties.insert(QStringLiteral("QUmlRemoveStructuralFeatureValueAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isRemoveDuplicates"))));
-    _groupProperties.insert(QStringLiteral("QUmlRemoveStructuralFeatureValueAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("removeAt"))));
-}
-
-void QUmlRemoveStructuralFeatureValueAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRemoveStructuralFeatureValueAction")][QStringLiteral("isRemoveDuplicates")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRemoveStructuralFeatureValueAction")][QStringLiteral("isRemoveDuplicates")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRemoveStructuralFeatureValueAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRemoveStructuralFeatureValueAction")][QStringLiteral("isRemoveDuplicates")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRemoveStructuralFeatureValueAction")][QStringLiteral("isRemoveDuplicates")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRemoveStructuralFeatureValueAction")][QStringLiteral("isRemoveDuplicates")][QtModeling::DocumentationRole] = QStringLiteral("Specifies whether to remove duplicates of the value in nonunique structural features.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRemoveStructuralFeatureValueAction")][QStringLiteral("isRemoveDuplicates")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRemoveStructuralFeatureValueAction")][QStringLiteral("isRemoveDuplicates")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRemoveStructuralFeatureValueAction")][QStringLiteral("isRemoveDuplicates")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRemoveStructuralFeatureValueAction")][QStringLiteral("removeAt")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRemoveStructuralFeatureValueAction")][QStringLiteral("removeAt")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRemoveStructuralFeatureValueAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRemoveStructuralFeatureValueAction")][QStringLiteral("removeAt")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRemoveStructuralFeatureValueAction")][QStringLiteral("removeAt")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRemoveStructuralFeatureValueAction")][QStringLiteral("removeAt")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the position of an existing value to remove in ordered nonunique structural features. The type of the pin is UnlimitedNatural, but the value cannot be zero or unlimited.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRemoveStructuralFeatureValueAction")][QStringLiteral("removeAt")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRemoveStructuralFeatureValueAction")][QStringLiteral("removeAt")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRemoveStructuralFeatureValueAction")][QStringLiteral("removeAt")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlremovestructuralfeaturevalueaction.h b/src/uml/qumlremovestructuralfeaturevalueaction.h
index 403da5c0..e3273754 100644
--- a/src/uml/qumlremovestructuralfeaturevalueaction.h
+++ b/src/uml/qumlremovestructuralfeaturevalueaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlWriteStructuralFeatureAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlInputPin;
 class Q_UML_EXPORT QUmlRemoveStructuralFeatureValueAction : public QUmlWriteStructuralFeatureAction
 {
 public:
-    explicit QUmlRemoveStructuralFeatureValueAction(bool createQObject = true);
+    explicit QUmlRemoveStructuralFeatureValueAction(bool createQModelingObject = true);
     virtual ~QUmlRemoveStructuralFeatureValueAction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     bool isRemoveDuplicates() const;
@@ -71,9 +70,6 @@ public:
 protected:
     bool _isRemoveDuplicates;
     QUmlInputPin *_removeAt;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlremovevariablevalueaction.cpp b/src/uml/qumlremovevariablevalueaction.cpp
index 07adaeeb..e0d2bc25 100644
--- a/src/uml/qumlremovevariablevalueaction.cpp
+++ b/src/uml/qumlremovevariablevalueaction.cpp
@@ -71,26 +71,24 @@
 
     \brief A remove variable value action is a write variable action that removes values from variables.
  */
-QUmlRemoveVariableValueAction::QUmlRemoveVariableValueAction(bool createQObject) :
+QUmlRemoveVariableValueAction::QUmlRemoveVariableValueAction(bool createQModelingObject) :
     _isRemoveDuplicates(false),
     _removeAt(0)
 {
-    if (createQObject)
-        _qObject = new QUmlRemoveVariableValueActionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlRemoveVariableValueActionObject(this));
 }
 
 QUmlRemoveVariableValueAction::~QUmlRemoveVariableValueAction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlRemoveVariableValueAction::clone() const
+QModelingElement *QUmlRemoveVariableValueAction::clone() const
 {
     QUmlRemoveVariableValueAction *c = new QUmlRemoveVariableValueAction;
     foreach (QUmlComment *element, ownedComments())
@@ -151,7 +149,7 @@ void QUmlRemoveVariableValueAction::setRemoveDuplicates(bool isRemoveDuplicates)
 
     if (_isRemoveDuplicates != isRemoveDuplicates) {
         _isRemoveDuplicates = isRemoveDuplicates;
-        _modifiedResettableProperties << QStringLiteral("isRemoveDuplicates");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isRemoveDuplicates");
     }
 }
 
@@ -174,9 +172,9 @@ void QUmlRemoveVariableValueAction::setRemoveAt(QUmlInputPin *removeAt)
         removeInput(_removeAt);
 
         _removeAt = removeAt;
-        if (removeAt && removeAt->asQObject() && this->asQObject())
-            QObject::connect(removeAt->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setRemoveAt()));
-        removeAt->asQObject()->setParent(this->asQObject());
+        if (removeAt && removeAt->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(removeAt->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setRemoveAt()));
+        removeAt->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (removeAt) {
@@ -185,62 +183,3 @@ void QUmlRemoveVariableValueAction::setRemoveAt(QUmlInputPin *removeAt)
     }
 }
 
-void QUmlRemoveVariableValueAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlVariableAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("variable"))));
-    _groupProperties.insert(QStringLiteral("QUmlWriteVariableAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("value"))));
-    _groupProperties.insert(QStringLiteral("QUmlRemoveVariableValueAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isRemoveDuplicates"))));
-    _groupProperties.insert(QStringLiteral("QUmlRemoveVariableValueAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("removeAt"))));
-}
-
-void QUmlRemoveVariableValueAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRemoveVariableValueAction")][QStringLiteral("isRemoveDuplicates")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRemoveVariableValueAction")][QStringLiteral("isRemoveDuplicates")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRemoveVariableValueAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRemoveVariableValueAction")][QStringLiteral("isRemoveDuplicates")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRemoveVariableValueAction")][QStringLiteral("isRemoveDuplicates")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRemoveVariableValueAction")][QStringLiteral("isRemoveDuplicates")][QtModeling::DocumentationRole] = QStringLiteral("Specifies whether to remove duplicates of the value in nonunique variables.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRemoveVariableValueAction")][QStringLiteral("isRemoveDuplicates")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRemoveVariableValueAction")][QStringLiteral("isRemoveDuplicates")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRemoveVariableValueAction")][QStringLiteral("isRemoveDuplicates")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRemoveVariableValueAction")][QStringLiteral("removeAt")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRemoveVariableValueAction")][QStringLiteral("removeAt")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRemoveVariableValueAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRemoveVariableValueAction")][QStringLiteral("removeAt")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRemoveVariableValueAction")][QStringLiteral("removeAt")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRemoveVariableValueAction")][QStringLiteral("removeAt")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the position of an existing value to remove in ordered nonunique variables. The type of the pin is UnlimitedNatural, but the value cannot be zero or unlimited.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRemoveVariableValueAction")][QStringLiteral("removeAt")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRemoveVariableValueAction")][QStringLiteral("removeAt")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlRemoveVariableValueAction")][QStringLiteral("removeAt")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlremovevariablevalueaction.h b/src/uml/qumlremovevariablevalueaction.h
index f64fd2aa..149692d5 100644
--- a/src/uml/qumlremovevariablevalueaction.h
+++ b/src/uml/qumlremovevariablevalueaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlWriteVariableAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlInputPin;
 class Q_UML_EXPORT QUmlRemoveVariableValueAction : public QUmlWriteVariableAction
 {
 public:
-    explicit QUmlRemoveVariableValueAction(bool createQObject = true);
+    explicit QUmlRemoveVariableValueAction(bool createQModelingObject = true);
     virtual ~QUmlRemoveVariableValueAction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     bool isRemoveDuplicates() const;
@@ -71,9 +70,6 @@ public:
 protected:
     bool _isRemoveDuplicates;
     QUmlInputPin *_removeAt;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlreplyaction.cpp b/src/uml/qumlreplyaction.cpp
index e8abc569..1b8725e6 100644
--- a/src/uml/qumlreplyaction.cpp
+++ b/src/uml/qumlreplyaction.cpp
@@ -71,26 +71,24 @@
 
     \brief A reply action is an action that accepts a set of return values and a value containing return information produced by a previous accept call action. The reply action returns the values to the caller of the previous call, completing execution of the call.
  */
-QUmlReplyAction::QUmlReplyAction(bool createQObject) :
+QUmlReplyAction::QUmlReplyAction(bool createQModelingObject) :
     _replyToCall(0),
     _returnInformation(0)
 {
-    if (createQObject)
-        _qObject = new QUmlReplyActionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlReplyActionObject(this));
 }
 
 QUmlReplyAction::~QUmlReplyAction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlReplyAction::clone() const
+QModelingElement *QUmlReplyAction::clone() const
 {
     QUmlReplyAction *c = new QUmlReplyAction;
     foreach (QUmlComment *element, ownedComments())
@@ -150,8 +148,8 @@ void QUmlReplyAction::setReplyToCall(QUmlTrigger *replyToCall)
 
     if (_replyToCall != replyToCall) {
         _replyToCall = replyToCall;
-        if (replyToCall && replyToCall->asQObject() && this->asQObject())
-            QObject::connect(replyToCall->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setReplyToCall()));
+        if (replyToCall && replyToCall->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(replyToCall->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setReplyToCall()));
     }
 }
 
@@ -171,9 +169,9 @@ void QUmlReplyAction::addReplyValue(QUmlInputPin *replyValue)
 
     if (!_replyValues.contains(replyValue)) {
         _replyValues.insert(replyValue);
-        if (replyValue && replyValue->asQObject() && this->asQObject())
-            QObject::connect(replyValue->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeReplyValue(QObject *)));
-        replyValue->asQObject()->setParent(this->asQObject());
+        if (replyValue && replyValue->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(replyValue->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeReplyValue(QObject *)));
+        replyValue->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addInput(replyValue);
@@ -186,8 +184,8 @@ void QUmlReplyAction::removeReplyValue(QUmlInputPin *replyValue)
 
     if (_replyValues.contains(replyValue)) {
         _replyValues.remove(replyValue);
-        if (replyValue->asQObject())
-            replyValue->asQObject()->setParent(0);
+        if (replyValue->asQModelingObject())
+            replyValue->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeInput(replyValue);
@@ -213,9 +211,9 @@ void QUmlReplyAction::setReturnInformation(QUmlInputPin *returnInformation)
         removeInput(_returnInformation);
 
         _returnInformation = returnInformation;
-        if (returnInformation && returnInformation->asQObject() && this->asQObject())
-            QObject::connect(returnInformation->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setReturnInformation()));
-        returnInformation->asQObject()->setParent(this->asQObject());
+        if (returnInformation && returnInformation->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(returnInformation->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setReturnInformation()));
+        returnInformation->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (returnInformation) {
@@ -224,70 +222,3 @@ void QUmlReplyAction::setReturnInformation(QUmlInputPin *returnInformation)
     }
 }
 
-void QUmlReplyAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlReplyAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("replyToCall"))));
-    _groupProperties.insert(QStringLiteral("QUmlReplyAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("replyValues"))));
-    _groupProperties.insert(QStringLiteral("QUmlReplyAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("returnInformation"))));
-}
-
-void QUmlReplyAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReplyAction")][QStringLiteral("replyToCall")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReplyAction")][QStringLiteral("replyToCall")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReplyAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReplyAction")][QStringLiteral("replyToCall")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReplyAction")][QStringLiteral("replyToCall")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReplyAction")][QStringLiteral("replyToCall")][QtModeling::DocumentationRole] = QStringLiteral("The trigger specifying the operation whose call is being replied to.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReplyAction")][QStringLiteral("replyToCall")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReplyAction")][QStringLiteral("replyToCall")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReplyAction")][QStringLiteral("replyToCall")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReplyAction")][QStringLiteral("replyValues")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReplyAction")][QStringLiteral("replyValues")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReplyAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReplyAction")][QStringLiteral("replyValues")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReplyAction")][QStringLiteral("replyValues")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReplyAction")][QStringLiteral("replyValues")][QtModeling::DocumentationRole] = QStringLiteral("A list of pins containing the reply values of the operation. These values are returned to the caller.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReplyAction")][QStringLiteral("replyValues")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReplyAction")][QStringLiteral("replyValues")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReplyAction")][QStringLiteral("replyValues")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReplyAction")][QStringLiteral("returnInformation")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReplyAction")][QStringLiteral("returnInformation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReplyAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReplyAction")][QStringLiteral("returnInformation")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReplyAction")][QStringLiteral("returnInformation")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReplyAction")][QStringLiteral("returnInformation")][QtModeling::DocumentationRole] = QStringLiteral("A pin containing the return information value produced by an earlier AcceptCallAction.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReplyAction")][QStringLiteral("returnInformation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReplyAction")][QStringLiteral("returnInformation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlReplyAction")][QStringLiteral("returnInformation")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlreplyaction.h b/src/uml/qumlreplyaction.h
index 0a919127..fec4f906 100644
--- a/src/uml/qumlreplyaction.h
+++ b/src/uml/qumlreplyaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlTrigger;
 class Q_UML_EXPORT QUmlReplyAction : public QUmlAction
 {
 public:
-    explicit QUmlReplyAction(bool createQObject = true);
+    explicit QUmlReplyAction(bool createQModelingObject = true);
     virtual ~QUmlReplyAction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlTrigger *replyToCall() const;
@@ -76,9 +75,6 @@ protected:
     QUmlTrigger *_replyToCall;
     QSet<QUmlInputPin *> _replyValues;
     QUmlInputPin *_returnInformation;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlsendobjectaction.cpp b/src/uml/qumlsendobjectaction.cpp
index 4234c71c..4e8b21f0 100644
--- a/src/uml/qumlsendobjectaction.cpp
+++ b/src/uml/qumlsendobjectaction.cpp
@@ -71,26 +71,24 @@
 
     \brief A send object action is an action that transmits an object to the target object, where it may invoke behavior such as the firing of state machine transitions or the execution of an activity. The value of the object is available to the execution of invoked behaviors. The requestor continues execution immediately. Any reply message is ignored and is not transmitted to the requestor.
  */
-QUmlSendObjectAction::QUmlSendObjectAction(bool createQObject) :
+QUmlSendObjectAction::QUmlSendObjectAction(bool createQModelingObject) :
     _request(0),
     _target(0)
 {
-    if (createQObject)
-        _qObject = new QUmlSendObjectActionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlSendObjectActionObject(this));
 }
 
 QUmlSendObjectAction::~QUmlSendObjectAction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlSendObjectAction::clone() const
+QModelingElement *QUmlSendObjectAction::clone() const
 {
     QUmlSendObjectAction *c = new QUmlSendObjectAction;
     foreach (QUmlComment *element, ownedComments())
@@ -150,9 +148,9 @@ void QUmlSendObjectAction::setRequest(QUmlInputPin *request)
 
     if (_request != request) {
         _request = request;
-        if (request && request->asQObject() && this->asQObject())
-            QObject::connect(request->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setRequest()));
-        request->asQObject()->setParent(this->asQObject());
+        if (request && request->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(request->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setRequest()));
+        request->asQModelingObject()->setParent(this->asQModelingObject());
     }
 }
 
@@ -175,9 +173,9 @@ void QUmlSendObjectAction::setTarget(QUmlInputPin *target)
         removeInput(_target);
 
         _target = target;
-        if (target && target->asQObject() && this->asQObject())
-            QObject::connect(target->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setTarget()));
-        target->asQObject()->setParent(this->asQObject());
+        if (target && target->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(target->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setTarget()));
+        target->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (target) {
@@ -186,61 +184,3 @@ void QUmlSendObjectAction::setTarget(QUmlInputPin *target)
     }
 }
 
-void QUmlSendObjectAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlInvocationAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("onPort"))));
-    _groupProperties.insert(QStringLiteral("QUmlSendObjectAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("request"))));
-    _groupProperties.insert(QStringLiteral("QUmlSendObjectAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("target"))));
-}
-
-void QUmlSendObjectAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSendObjectAction")][QStringLiteral("request")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSendObjectAction")][QStringLiteral("request")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlSendObjectAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSendObjectAction")][QStringLiteral("request")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSendObjectAction")][QStringLiteral("request")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSendObjectAction")][QStringLiteral("request")][QtModeling::DocumentationRole] = QStringLiteral("The request object, which is transmitted to the target object. The object may be copied in transmission, so identity might not be preserved.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSendObjectAction")][QStringLiteral("request")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("InvocationAction-argument");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSendObjectAction")][QStringLiteral("request")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSendObjectAction")][QStringLiteral("request")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSendObjectAction")][QStringLiteral("target")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSendObjectAction")][QStringLiteral("target")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlSendObjectAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSendObjectAction")][QStringLiteral("target")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSendObjectAction")][QStringLiteral("target")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSendObjectAction")][QStringLiteral("target")][QtModeling::DocumentationRole] = QStringLiteral("The target object to which the object is sent.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSendObjectAction")][QStringLiteral("target")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSendObjectAction")][QStringLiteral("target")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSendObjectAction")][QStringLiteral("target")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlsendobjectaction.h b/src/uml/qumlsendobjectaction.h
index f8840e1c..2da299c4 100644
--- a/src/uml/qumlsendobjectaction.h
+++ b/src/uml/qumlsendobjectaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlInvocationAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlInputPin;
 class Q_UML_EXPORT QUmlSendObjectAction : public QUmlInvocationAction
 {
 public:
-    explicit QUmlSendObjectAction(bool createQObject = true);
+    explicit QUmlSendObjectAction(bool createQModelingObject = true);
     virtual ~QUmlSendObjectAction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlInputPin *request() const;
@@ -71,9 +70,6 @@ public:
 protected:
     QUmlInputPin *_request;
     QUmlInputPin *_target;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlsendsignalaction.cpp b/src/uml/qumlsendsignalaction.cpp
index 513df72d..e2c860f9 100644
--- a/src/uml/qumlsendsignalaction.cpp
+++ b/src/uml/qumlsendsignalaction.cpp
@@ -72,26 +72,24 @@
 
     \brief A send signal action is an action that creates a signal instance from its inputs, and transmits it to the target object, where it may cause the firing of a state machine transition or the execution of an activity. The argument values are available to the execution of associated behaviors. The requestor continues execution immediately. Any reply message is ignored and is not transmitted to the requestor. If the input is already a signal instance, use a send object action.
  */
-QUmlSendSignalAction::QUmlSendSignalAction(bool createQObject) :
+QUmlSendSignalAction::QUmlSendSignalAction(bool createQModelingObject) :
     _signal(0),
     _target(0)
 {
-    if (createQObject)
-        _qObject = new QUmlSendSignalActionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlSendSignalActionObject(this));
 }
 
 QUmlSendSignalAction::~QUmlSendSignalAction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlSendSignalAction::clone() const
+QModelingElement *QUmlSendSignalAction::clone() const
 {
     QUmlSendSignalAction *c = new QUmlSendSignalAction;
     foreach (QUmlComment *element, ownedComments())
@@ -153,8 +151,8 @@ void QUmlSendSignalAction::setSignal(QUmlSignal *signal)
 
     if (_signal != signal) {
         _signal = signal;
-        if (signal && signal->asQObject() && this->asQObject())
-            QObject::connect(signal->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setSignal()));
+        if (signal && signal->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(signal->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setSignal()));
     }
 }
 
@@ -177,9 +175,9 @@ void QUmlSendSignalAction::setTarget(QUmlInputPin *target)
         removeInput(_target);
 
         _target = target;
-        if (target && target->asQObject() && this->asQObject())
-            QObject::connect(target->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setTarget()));
-        target->asQObject()->setParent(this->asQObject());
+        if (target && target->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(target->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setTarget()));
+        target->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (target) {
@@ -188,62 +186,3 @@ void QUmlSendSignalAction::setTarget(QUmlInputPin *target)
     }
 }
 
-void QUmlSendSignalAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlInvocationAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("arguments"))));
-    _groupProperties.insert(QStringLiteral("QUmlInvocationAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("onPort"))));
-    _groupProperties.insert(QStringLiteral("QUmlSendSignalAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("signal"))));
-    _groupProperties.insert(QStringLiteral("QUmlSendSignalAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("target"))));
-}
-
-void QUmlSendSignalAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSendSignalAction")][QStringLiteral("signal")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSendSignalAction")][QStringLiteral("signal")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlSendSignalAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSendSignalAction")][QStringLiteral("signal")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSendSignalAction")][QStringLiteral("signal")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSendSignalAction")][QStringLiteral("signal")][QtModeling::DocumentationRole] = QStringLiteral("The type of signal transmitted to the target object.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSendSignalAction")][QStringLiteral("signal")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSendSignalAction")][QStringLiteral("signal")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSendSignalAction")][QStringLiteral("signal")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSendSignalAction")][QStringLiteral("target")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSendSignalAction")][QStringLiteral("target")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlSendSignalAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSendSignalAction")][QStringLiteral("target")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSendSignalAction")][QStringLiteral("target")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSendSignalAction")][QStringLiteral("target")][QtModeling::DocumentationRole] = QStringLiteral("The target object to which the signal is sent.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSendSignalAction")][QStringLiteral("target")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSendSignalAction")][QStringLiteral("target")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSendSignalAction")][QStringLiteral("target")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlsendsignalaction.h b/src/uml/qumlsendsignalaction.h
index f07a6cfb..cb639ff4 100644
--- a/src/uml/qumlsendsignalaction.h
+++ b/src/uml/qumlsendsignalaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlInvocationAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlSignal;
 class Q_UML_EXPORT QUmlSendSignalAction : public QUmlInvocationAction
 {
 public:
-    explicit QUmlSendSignalAction(bool createQObject = true);
+    explicit QUmlSendSignalAction(bool createQModelingObject = true);
     virtual ~QUmlSendSignalAction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlSignal *signal() const;
@@ -72,9 +71,6 @@ public:
 protected:
     QUmlSignal *_signal;
     QUmlInputPin *_target;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlsequencenode.cpp b/src/uml/qumlsequencenode.cpp
index cfb8b8cc..6aa46d80 100644
--- a/src/uml/qumlsequencenode.cpp
+++ b/src/uml/qumlsequencenode.cpp
@@ -75,25 +75,23 @@
 
     \brief A sequence node is a structured activity node that executes its actions in order.
  */
-QUmlSequenceNode::QUmlSequenceNode(bool createQObject) :
+QUmlSequenceNode::QUmlSequenceNode(bool createQModelingObject) :
     QUmlStructuredActivityNode(false)
 {
-    if (createQObject)
-        _qObject = new QUmlSequenceNodeObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlSequenceNodeObject(this));
 }
 
 QUmlSequenceNode::~QUmlSequenceNode()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlSequenceNode::clone() const
+QModelingElement *QUmlSequenceNode::clone() const
 {
     QUmlSequenceNode *c = new QUmlSequenceNode;
     foreach (QUmlComment *element, ownedComments())
@@ -164,9 +162,9 @@ void QUmlSequenceNode::addExecutableNode(QUmlExecutableNode *executableNode)
 
     if (!_executableNodes.contains(executableNode)) {
         _executableNodes.append(executableNode);
-        if (executableNode && executableNode->asQObject() && this->asQObject())
-            QObject::connect(executableNode->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeExecutableNode(QObject *)));
-        executableNode->asQObject()->setParent(this->asQObject());
+        if (executableNode && executableNode->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(executableNode->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeExecutableNode(QObject *)));
+        executableNode->asQModelingObject()->setParent(this->asQModelingObject());
     }
 }
 
@@ -176,70 +174,8 @@ void QUmlSequenceNode::removeExecutableNode(QUmlExecutableNode *executableNode)
 
     if (_executableNodes.contains(executableNode)) {
         _executableNodes.removeAll(executableNode);
-        if (executableNode->asQObject())
-            executableNode->asQObject()->setParent(0);
+        if (executableNode->asQModelingObject())
+            executableNode->asQModelingObject()->setParent(0);
     }
 }
 
-void QUmlSequenceNode::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("containedEdges"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("containedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("subgroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superGroup"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("edges"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("mustIsolate"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("structuredNodeInputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("structuredNodeOutputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("variables"))));
-    _groupProperties.insert(QStringLiteral("QUmlSequenceNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("executableNodes"))));
-}
-
-void QUmlSequenceNode::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSequenceNode")][QStringLiteral("executableNodes")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSequenceNode")][QStringLiteral("executableNodes")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlSequenceNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSequenceNode")][QStringLiteral("executableNodes")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSequenceNode")][QStringLiteral("executableNodes")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSequenceNode")][QStringLiteral("executableNodes")][QtModeling::DocumentationRole] = QStringLiteral("An ordered set of executable nodes.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSequenceNode")][QStringLiteral("executableNodes")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("StructuredActivityNode-node");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSequenceNode")][QStringLiteral("executableNodes")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSequenceNode")][QStringLiteral("executableNodes")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlsequencenode.h b/src/uml/qumlsequencenode.h
index 0db1c60f..99f6bdc7 100644
--- a/src/uml/qumlsequencenode.h
+++ b/src/uml/qumlsequencenode.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlStructuredActivityNode>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlExecutableNode;
 class Q_UML_EXPORT QUmlSequenceNode : public QUmlStructuredActivityNode
 {
 public:
-    explicit QUmlSequenceNode(bool createQObject = true);
+    explicit QUmlSequenceNode(bool createQModelingObject = true);
     virtual ~QUmlSequenceNode();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QList<QUmlExecutableNode *> executableNodes() const;
@@ -69,9 +68,6 @@ public:
 
 protected:
     QList<QUmlExecutableNode *> _executableNodes;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlsignal.cpp b/src/uml/qumlsignal.cpp
index 73692337..b9ecbfa0 100644
--- a/src/uml/qumlsignal.cpp
+++ b/src/uml/qumlsignal.cpp
@@ -77,24 +77,22 @@
 
     \brief A signal is a specification of send request instances communicated between objects. The receiving object handles the received request instances as specified by its receptions. The data carried by a send request (which was passed to it by the send invocation occurrence that caused that request) are represented as attributes of the signal. A signal is defined independently of the classifiers handling the signal occurrence.
  */
-QUmlSignal::QUmlSignal(bool createQObject)
+QUmlSignal::QUmlSignal(bool createQModelingObject)
 {
-    if (createQObject)
-        _qObject = new QUmlSignalObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlSignalObject(this));
 }
 
 QUmlSignal::~QUmlSignal()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlSignal::clone() const
+QModelingElement *QUmlSignal::clone() const
 {
     QUmlSignal *c = new QUmlSignal;
     foreach (QUmlComment *element, ownedComments())
@@ -163,9 +161,9 @@ void QUmlSignal::addOwnedAttribute(QUmlProperty *ownedAttribute)
 
     if (!_ownedAttributes.contains(ownedAttribute)) {
         _ownedAttributes.append(ownedAttribute);
-        if (ownedAttribute && ownedAttribute->asQObject() && this->asQObject())
-            QObject::connect(ownedAttribute->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeOwnedAttribute(QObject *)));
-        ownedAttribute->asQObject()->setParent(this->asQObject());
+        if (ownedAttribute && ownedAttribute->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(ownedAttribute->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeOwnedAttribute(QObject *)));
+        ownedAttribute->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedMember(ownedAttribute);
@@ -179,8 +177,8 @@ void QUmlSignal::removeOwnedAttribute(QUmlProperty *ownedAttribute)
 
     if (_ownedAttributes.contains(ownedAttribute)) {
         _ownedAttributes.removeAll(ownedAttribute);
-        if (ownedAttribute->asQObject())
-            ownedAttribute->asQObject()->setParent(0);
+        if (ownedAttribute->asQModelingObject())
+            ownedAttribute->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedMember(ownedAttribute);
@@ -188,60 +186,3 @@ void QUmlSignal::removeOwnedAttribute(QUmlProperty *ownedAttribute)
     }
 }
 
-void QUmlSignal::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generals"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlSignal"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
-}
-
-void QUmlSignal::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSignal")][QStringLiteral("ownedAttributes")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSignal")][QStringLiteral("ownedAttributes")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlSignal");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSignal")][QStringLiteral("ownedAttributes")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSignal")][QStringLiteral("ownedAttributes")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSignal")][QStringLiteral("ownedAttributes")][QtModeling::DocumentationRole] = QStringLiteral("The attributes owned by the signal.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSignal")][QStringLiteral("ownedAttributes")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSignal")][QStringLiteral("ownedAttributes")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember Classifier-attribute");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSignal")][QStringLiteral("ownedAttributes")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlsignal.h b/src/uml/qumlsignal.h
index d06105b8..fc884ff0 100644
--- a/src/uml/qumlsignal.h
+++ b/src/uml/qumlsignal.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlClassifier>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlProperty;
 class Q_UML_EXPORT QUmlSignal : public QUmlClassifier
 {
 public:
-    explicit QUmlSignal(bool createQObject = true);
+    explicit QUmlSignal(bool createQModelingObject = true);
     virtual ~QUmlSignal();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QList<QUmlProperty *> ownedAttributes() const;
@@ -69,9 +68,6 @@ public:
 
 protected:
     QList<QUmlProperty *> _ownedAttributes;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlsignalevent.cpp b/src/uml/qumlsignalevent.cpp
index c3603651..e17e2eb6 100644
--- a/src/uml/qumlsignalevent.cpp
+++ b/src/uml/qumlsignalevent.cpp
@@ -60,25 +60,23 @@
 
     \brief A signal event represents the receipt of an asynchronous signal instance. A signal event may, for example, cause a state machine to trigger a transition.
  */
-QUmlSignalEvent::QUmlSignalEvent(bool createQObject) :
+QUmlSignalEvent::QUmlSignalEvent(bool createQModelingObject) :
     _signal(0)
 {
-    if (createQObject)
-        _qObject = new QUmlSignalEventObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlSignalEventObject(this));
 }
 
 QUmlSignalEvent::~QUmlSignalEvent()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlSignalEvent::clone() const
+QModelingElement *QUmlSignalEvent::clone() const
 {
     QUmlSignalEvent *c = new QUmlSignalEvent;
     foreach (QUmlComment *element, ownedComments())
@@ -116,39 +114,8 @@ void QUmlSignalEvent::setSignal(QUmlSignal *signal)
 
     if (_signal != signal) {
         _signal = signal;
-        if (signal && signal->asQObject() && this->asQObject())
-            QObject::connect(signal->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setSignal()));
+        if (signal && signal->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(signal->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setSignal()));
     }
 }
 
-void QUmlSignalEvent::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlSignalEvent"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("signal"))));
-}
-
-void QUmlSignalEvent::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSignalEvent")][QStringLiteral("signal")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSignalEvent")][QStringLiteral("signal")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlSignalEvent");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSignalEvent")][QStringLiteral("signal")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSignalEvent")][QStringLiteral("signal")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSignalEvent")][QStringLiteral("signal")][QtModeling::DocumentationRole] = QStringLiteral("The specific signal that is associated with this event.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSignalEvent")][QStringLiteral("signal")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSignalEvent")][QStringLiteral("signal")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSignalEvent")][QStringLiteral("signal")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlsignalevent.h b/src/uml/qumlsignalevent.h
index c05d1f7f..44be20e2 100644
--- a/src/uml/qumlsignalevent.h
+++ b/src/uml/qumlsignalevent.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlMessageEvent>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlSignal;
 class Q_UML_EXPORT QUmlSignalEvent : public QUmlMessageEvent
 {
 public:
-    explicit QUmlSignalEvent(bool createQObject = true);
+    explicit QUmlSignalEvent(bool createQModelingObject = true);
     virtual ~QUmlSignalEvent();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlSignal *signal() const;
@@ -68,9 +67,6 @@ public:
 
 protected:
     QUmlSignal *_signal;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlslot.cpp b/src/uml/qumlslot.cpp
index 042f3ae1..49da17ad 100644
--- a/src/uml/qumlslot.cpp
+++ b/src/uml/qumlslot.cpp
@@ -55,26 +55,24 @@
 
     \brief A slot specifies that an entity modeled by an instance specification has a value or values for a specific structural feature.
  */
-QUmlSlot::QUmlSlot(bool createQObject) :
+QUmlSlot::QUmlSlot(bool createQModelingObject) :
     _definingFeature(0),
     _owningInstance(0)
 {
-    if (createQObject)
-        _qObject = new QUmlSlotObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlSlotObject(this));
 }
 
 QUmlSlot::~QUmlSlot()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlSlot::clone() const
+QModelingElement *QUmlSlot::clone() const
 {
     QUmlSlot *c = new QUmlSlot;
     foreach (QUmlComment *element, ownedComments())
@@ -106,8 +104,8 @@ void QUmlSlot::setDefiningFeature(QUmlStructuralFeature *definingFeature)
 
     if (_definingFeature != definingFeature) {
         _definingFeature = definingFeature;
-        if (definingFeature && definingFeature->asQObject() && this->asQObject())
-            QObject::connect(definingFeature->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setDefiningFeature()));
+        if (definingFeature && definingFeature->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(definingFeature->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setDefiningFeature()));
     }
 }
 
@@ -129,8 +127,8 @@ void QUmlSlot::setOwningInstance(QUmlInstanceSpecification *owningInstance)
         // Adjust subsetted properties
 
         _owningInstance = owningInstance;
-        if (owningInstance && owningInstance->asQObject() && this->asQObject())
-            QObject::connect(owningInstance->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setOwningInstance()));
+        if (owningInstance && owningInstance->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(owningInstance->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setOwningInstance()));
 
         // Adjust subsetted properties
         setOwner(owningInstance);
@@ -153,9 +151,9 @@ void QUmlSlot::addValue(QUmlValueSpecification *value)
 
     if (!_values.contains(value)) {
         _values.append(value);
-        if (value && value->asQObject() && this->asQObject())
-            QObject::connect(value->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeValue(QObject *)));
-        value->asQObject()->setParent(this->asQObject());
+        if (value && value->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(value->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeValue(QObject *)));
+        value->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(value);
@@ -168,54 +166,11 @@ void QUmlSlot::removeValue(QUmlValueSpecification *value)
 
     if (_values.contains(value)) {
         _values.removeAll(value);
-        if (value->asQObject())
-            value->asQObject()->setParent(0);
+        if (value->asQModelingObject())
+            value->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(value);
     }
 }
 
-void QUmlSlot::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlSlot"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("definingFeature"))));
-    _groupProperties.insert(QStringLiteral("QUmlSlot"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningInstance"))));
-    _groupProperties.insert(QStringLiteral("QUmlSlot"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("values"))));
-}
-
-void QUmlSlot::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSlot")][QStringLiteral("definingFeature")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSlot")][QStringLiteral("definingFeature")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlSlot");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSlot")][QStringLiteral("definingFeature")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSlot")][QStringLiteral("definingFeature")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSlot")][QStringLiteral("definingFeature")][QtModeling::DocumentationRole] = QStringLiteral("The structural feature that specifies the values that may be held by the slot.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSlot")][QStringLiteral("definingFeature")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSlot")][QStringLiteral("definingFeature")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSlot")][QStringLiteral("definingFeature")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSlot")][QStringLiteral("owningInstance")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSlot")][QStringLiteral("owningInstance")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlSlot");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSlot")][QStringLiteral("owningInstance")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSlot")][QStringLiteral("owningInstance")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSlot")][QStringLiteral("owningInstance")][QtModeling::DocumentationRole] = QStringLiteral("The instance specification that owns this slot.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSlot")][QStringLiteral("owningInstance")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSlot")][QStringLiteral("owningInstance")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSlot")][QStringLiteral("owningInstance")][QtModeling::OppositeEndRole] = QStringLiteral("InstanceSpecification-slot");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSlot")][QStringLiteral("values")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSlot")][QStringLiteral("values")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlSlot");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSlot")][QStringLiteral("values")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSlot")][QStringLiteral("values")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSlot")][QStringLiteral("values")][QtModeling::DocumentationRole] = QStringLiteral("The value or values corresponding to the defining feature for the owning instance specification.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSlot")][QStringLiteral("values")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSlot")][QStringLiteral("values")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSlot")][QStringLiteral("values")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlslot.h b/src/uml/qumlslot.h
index 0e2a6801..c6e82353 100644
--- a/src/uml/qumlslot.h
+++ b/src/uml/qumlslot.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -59,10 +58,10 @@ class QUmlValueSpecification;
 class Q_UML_EXPORT QUmlSlot : public QUmlElement
 {
 public:
-    explicit QUmlSlot(bool createQObject = true);
+    explicit QUmlSlot(bool createQModelingObject = true);
     virtual ~QUmlSlot();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlStructuralFeature *definingFeature() const;
@@ -77,9 +76,6 @@ protected:
     QUmlStructuralFeature *_definingFeature;
     QUmlInstanceSpecification *_owningInstance;
     QList<QUmlValueSpecification *> _values;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlstartclassifierbehavioraction.cpp b/src/uml/qumlstartclassifierbehavioraction.cpp
index 7a0c2505..30bceb48 100644
--- a/src/uml/qumlstartclassifierbehavioraction.cpp
+++ b/src/uml/qumlstartclassifierbehavioraction.cpp
@@ -70,25 +70,23 @@
 
     \brief A start classifier behavior action is an action that starts the classifier behavior of the input.
  */
-QUmlStartClassifierBehaviorAction::QUmlStartClassifierBehaviorAction(bool createQObject) :
+QUmlStartClassifierBehaviorAction::QUmlStartClassifierBehaviorAction(bool createQModelingObject) :
     _object(0)
 {
-    if (createQObject)
-        _qObject = new QUmlStartClassifierBehaviorActionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlStartClassifierBehaviorActionObject(this));
 }
 
 QUmlStartClassifierBehaviorAction::~QUmlStartClassifierBehaviorAction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlStartClassifierBehaviorAction::clone() const
+QModelingElement *QUmlStartClassifierBehaviorAction::clone() const
 {
     QUmlStartClassifierBehaviorAction *c = new QUmlStartClassifierBehaviorAction;
     foreach (QUmlComment *element, ownedComments())
@@ -147,9 +145,9 @@ void QUmlStartClassifierBehaviorAction::setObject(QUmlInputPin *object)
         removeInput(_object);
 
         _object = object;
-        if (object && object->asQObject() && this->asQObject())
-            QObject::connect(object->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setObject()));
-        object->asQObject()->setParent(this->asQObject());
+        if (object && object->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(object->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setObject()));
+        object->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (object) {
@@ -158,50 +156,3 @@ void QUmlStartClassifierBehaviorAction::setObject(QUmlInputPin *object)
     }
 }
 
-void QUmlStartClassifierBehaviorAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlStartClassifierBehaviorAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("object"))));
-}
-
-void QUmlStartClassifierBehaviorAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStartClassifierBehaviorAction")][QStringLiteral("object")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStartClassifierBehaviorAction")][QStringLiteral("object")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStartClassifierBehaviorAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStartClassifierBehaviorAction")][QStringLiteral("object")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStartClassifierBehaviorAction")][QStringLiteral("object")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStartClassifierBehaviorAction")][QStringLiteral("object")][QtModeling::DocumentationRole] = QStringLiteral("Holds the object on which to start the owned behavior.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStartClassifierBehaviorAction")][QStringLiteral("object")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStartClassifierBehaviorAction")][QStringLiteral("object")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStartClassifierBehaviorAction")][QStringLiteral("object")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlstartclassifierbehavioraction.h b/src/uml/qumlstartclassifierbehavioraction.h
index 54dda17f..31e0c384 100644
--- a/src/uml/qumlstartclassifierbehavioraction.h
+++ b/src/uml/qumlstartclassifierbehavioraction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlInputPin;
 class Q_UML_EXPORT QUmlStartClassifierBehaviorAction : public QUmlAction
 {
 public:
-    explicit QUmlStartClassifierBehaviorAction(bool createQObject = true);
+    explicit QUmlStartClassifierBehaviorAction(bool createQModelingObject = true);
     virtual ~QUmlStartClassifierBehaviorAction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlInputPin *object() const;
@@ -68,9 +67,6 @@ public:
 
 protected:
     QUmlInputPin *_object;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlstartobjectbehavioraction.cpp b/src/uml/qumlstartobjectbehavioraction.cpp
index bf95e2c5..50adc849 100644
--- a/src/uml/qumlstartobjectbehavioraction.cpp
+++ b/src/uml/qumlstartobjectbehavioraction.cpp
@@ -71,25 +71,23 @@
 
     \brief StartObjectBehaviorAction is an action that starts the execution either of a directly instantiated behavior or of the classifier behavior of an object. Argument values may be supplied for the input parameters of the behavior. If the behavior is invoked synchronously, then output values may be obtained for output parameters.
  */
-QUmlStartObjectBehaviorAction::QUmlStartObjectBehaviorAction(bool createQObject) :
+QUmlStartObjectBehaviorAction::QUmlStartObjectBehaviorAction(bool createQModelingObject) :
     _object(0)
 {
-    if (createQObject)
-        _qObject = new QUmlStartObjectBehaviorActionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlStartObjectBehaviorActionObject(this));
 }
 
 QUmlStartObjectBehaviorAction::~QUmlStartObjectBehaviorAction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlStartObjectBehaviorAction::clone() const
+QModelingElement *QUmlStartObjectBehaviorAction::clone() const
 {
     QUmlStartObjectBehaviorAction *c = new QUmlStartObjectBehaviorAction;
     foreach (QUmlComment *element, ownedComments())
@@ -155,9 +153,9 @@ void QUmlStartObjectBehaviorAction::setObject(QUmlInputPin *object)
         removeInput(_object);
 
         _object = object;
-        if (object && object->asQObject() && this->asQObject())
-            QObject::connect(object->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setObject()));
-        object->asQObject()->setParent(this->asQObject());
+        if (object && object->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(object->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setObject()));
+        object->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (object) {
@@ -166,54 +164,3 @@ void QUmlStartObjectBehaviorAction::setObject(QUmlInputPin *object)
     }
 }
 
-void QUmlStartObjectBehaviorAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlInvocationAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("arguments"))));
-    _groupProperties.insert(QStringLiteral("QUmlInvocationAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("onPort"))));
-    _groupProperties.insert(QStringLiteral("QUmlCallAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isSynchronous"))));
-    _groupProperties.insert(QStringLiteral("QUmlCallAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("results"))));
-    _groupProperties.insert(QStringLiteral("QUmlStartObjectBehaviorAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("object"))));
-}
-
-void QUmlStartObjectBehaviorAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStartObjectBehaviorAction")][QStringLiteral("object")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStartObjectBehaviorAction")][QStringLiteral("object")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStartObjectBehaviorAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStartObjectBehaviorAction")][QStringLiteral("object")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStartObjectBehaviorAction")][QStringLiteral("object")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStartObjectBehaviorAction")][QStringLiteral("object")][QtModeling::DocumentationRole] = QStringLiteral("Holds the object which is either a behavior to be started or has a classifier behavior to be started.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStartObjectBehaviorAction")][QStringLiteral("object")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStartObjectBehaviorAction")][QStringLiteral("object")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStartObjectBehaviorAction")][QStringLiteral("object")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlstartobjectbehavioraction.h b/src/uml/qumlstartobjectbehavioraction.h
index 45ea7fe3..6666ba7b 100644
--- a/src/uml/qumlstartobjectbehavioraction.h
+++ b/src/uml/qumlstartobjectbehavioraction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlCallAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlInputPin;
 class Q_UML_EXPORT QUmlStartObjectBehaviorAction : public QUmlCallAction
 {
 public:
-    explicit QUmlStartObjectBehaviorAction(bool createQObject = true);
+    explicit QUmlStartObjectBehaviorAction(bool createQModelingObject = true);
     virtual ~QUmlStartObjectBehaviorAction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlInputPin *object() const;
@@ -68,9 +67,6 @@ public:
 
 protected:
     QUmlInputPin *_object;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlstate.cpp b/src/uml/qumlstate.cpp
index 8bb4fcac..5a255ec2 100644
--- a/src/uml/qumlstate.cpp
+++ b/src/uml/qumlstate.cpp
@@ -70,7 +70,7 @@
 
     \brief A state models a situation during which some (usually implicit) invariant condition holds.The states of protocol state machines are exposed to the users of their context classifiers. A protocol state represents an exposed stable situation of its context classifier: when an instance of the classifier is not processing any operation, users of this instance can always know its state configuration.
  */
-QUmlState::QUmlState(bool createQObject) :
+QUmlState::QUmlState(bool createQModelingObject) :
     _doActivity(0),
     _entry(0),
     _exit(0),
@@ -78,22 +78,20 @@ QUmlState::QUmlState(bool createQObject) :
     _stateInvariant(0),
     _submachine(0)
 {
-    if (createQObject)
-        _qObject = new QUmlStateObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlStateObject(this));
 }
 
 QUmlState::~QUmlState()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlState::clone() const
+QModelingElement *QUmlState::clone() const
 {
     QUmlState *c = new QUmlState;
     foreach (QUmlComment *element, ownedComments())
@@ -154,9 +152,9 @@ void QUmlState::addConnection(QUmlConnectionPointReference *connection)
 
     if (!_connections.contains(connection)) {
         _connections.insert(connection);
-        if (connection && connection->asQObject() && this->asQObject())
-            QObject::connect(connection->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeConnection(QObject *)));
-        connection->asQObject()->setParent(this->asQObject());
+        if (connection && connection->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(connection->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeConnection(QObject *)));
+        connection->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedMember(connection);
@@ -174,8 +172,8 @@ void QUmlState::removeConnection(QUmlConnectionPointReference *connection)
 
     if (_connections.contains(connection)) {
         _connections.remove(connection);
-        if (connection->asQObject())
-            connection->asQObject()->setParent(0);
+        if (connection->asQModelingObject())
+            connection->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedMember(connection);
@@ -203,9 +201,9 @@ void QUmlState::addConnectionPoint(QUmlPseudostate *connectionPoint)
 
     if (!_connectionPoints.contains(connectionPoint)) {
         _connectionPoints.insert(connectionPoint);
-        if (connectionPoint && connectionPoint->asQObject() && this->asQObject())
-            QObject::connect(connectionPoint->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeConnectionPoint(QObject *)));
-        connectionPoint->asQObject()->setParent(this->asQObject());
+        if (connectionPoint && connectionPoint->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(connectionPoint->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeConnectionPoint(QObject *)));
+        connectionPoint->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedMember(connectionPoint);
@@ -223,8 +221,8 @@ void QUmlState::removeConnectionPoint(QUmlPseudostate *connectionPoint)
 
     if (_connectionPoints.contains(connectionPoint)) {
         _connectionPoints.remove(connectionPoint);
-        if (connectionPoint->asQObject())
-            connectionPoint->asQObject()->setParent(0);
+        if (connectionPoint->asQModelingObject())
+            connectionPoint->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedMember(connectionPoint);
@@ -252,9 +250,9 @@ void QUmlState::addDeferrableTrigger(QUmlTrigger *deferrableTrigger)
 
     if (!_deferrableTriggers.contains(deferrableTrigger)) {
         _deferrableTriggers.insert(deferrableTrigger);
-        if (deferrableTrigger && deferrableTrigger->asQObject() && this->asQObject())
-            QObject::connect(deferrableTrigger->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeDeferrableTrigger(QObject *)));
-        deferrableTrigger->asQObject()->setParent(this->asQObject());
+        if (deferrableTrigger && deferrableTrigger->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(deferrableTrigger->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeDeferrableTrigger(QObject *)));
+        deferrableTrigger->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(deferrableTrigger);
@@ -267,8 +265,8 @@ void QUmlState::removeDeferrableTrigger(QUmlTrigger *deferrableTrigger)
 
     if (_deferrableTriggers.contains(deferrableTrigger)) {
         _deferrableTriggers.remove(deferrableTrigger);
-        if (deferrableTrigger->asQObject())
-            deferrableTrigger->asQObject()->setParent(0);
+        if (deferrableTrigger->asQModelingObject())
+            deferrableTrigger->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(deferrableTrigger);
@@ -294,9 +292,9 @@ void QUmlState::setDoActivity(QUmlBehavior *doActivity)
         removeOwnedElement(_doActivity);
 
         _doActivity = doActivity;
-        if (doActivity && doActivity->asQObject() && this->asQObject())
-            QObject::connect(doActivity->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setDoActivity()));
-        doActivity->asQObject()->setParent(this->asQObject());
+        if (doActivity && doActivity->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(doActivity->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setDoActivity()));
+        doActivity->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (doActivity) {
@@ -324,9 +322,9 @@ void QUmlState::setEntry(QUmlBehavior *entry)
         removeOwnedElement(_entry);
 
         _entry = entry;
-        if (entry && entry->asQObject() && this->asQObject())
-            QObject::connect(entry->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setEntry()));
-        entry->asQObject()->setParent(this->asQObject());
+        if (entry && entry->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(entry->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setEntry()));
+        entry->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (entry) {
@@ -354,9 +352,9 @@ void QUmlState::setExit(QUmlBehavior *exit)
         removeOwnedElement(_exit);
 
         _exit = exit;
-        if (exit && exit->asQObject() && this->asQObject())
-            QObject::connect(exit->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setExit()));
-        exit->asQObject()->setParent(this->asQObject());
+        if (exit && exit->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(exit->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setExit()));
+        exit->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (exit) {
@@ -480,8 +478,8 @@ void QUmlState::setRedefinedState(QUmlState *redefinedState)
         removeRedefinedElement(_redefinedState);
 
         _redefinedState = redefinedState;
-        if (redefinedState && redefinedState->asQObject() && this->asQObject())
-            QObject::connect(redefinedState->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setRedefinedState()));
+        if (redefinedState && redefinedState->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(redefinedState->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setRedefinedState()));
 
         // Adjust subsetted properties
         if (redefinedState) {
@@ -530,9 +528,9 @@ void QUmlState::addRegion(QUmlRegion *region)
 
     if (!_regions.contains(region)) {
         _regions.insert(region);
-        if (region && region->asQObject() && this->asQObject())
-            QObject::connect(region->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeRegion(QObject *)));
-        region->asQObject()->setParent(this->asQObject());
+        if (region && region->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(region->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeRegion(QObject *)));
+        region->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedMember(region);
@@ -550,8 +548,8 @@ void QUmlState::removeRegion(QUmlRegion *region)
 
     if (_regions.contains(region)) {
         _regions.remove(region);
-        if (region->asQObject())
-            region->asQObject()->setParent(0);
+        if (region->asQModelingObject())
+            region->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedMember(region);
@@ -582,9 +580,9 @@ void QUmlState::setStateInvariant(QUmlConstraint *stateInvariant)
         removeOwnedRule(_stateInvariant);
 
         _stateInvariant = stateInvariant;
-        if (stateInvariant && stateInvariant->asQObject() && this->asQObject())
-            QObject::connect(stateInvariant->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setStateInvariant()));
-        stateInvariant->asQObject()->setParent(this->asQObject());
+        if (stateInvariant && stateInvariant->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(stateInvariant->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setStateInvariant()));
+        stateInvariant->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (stateInvariant) {
@@ -609,8 +607,8 @@ void QUmlState::setSubmachine(QUmlStateMachine *submachine)
 
     if (_submachine != submachine) {
         _submachine = submachine;
-        if (submachine && submachine->asQObject() && this->asQObject())
-            QObject::connect(submachine->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setSubmachine()));
+        if (submachine && submachine->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(submachine->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setSubmachine()));
     }
 }
 
@@ -648,183 +646,3 @@ bool QUmlState::isRedefinitionContextValid(QUmlState *redefined) const
     return bool ();
 }
 
-void QUmlState::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlVertex"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("container"))));
-    _groupProperties.insert(QStringLiteral("QUmlVertex"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlVertex"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("connections"))));
-    _groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("connectionPoints"))));
-    _groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("deferrableTriggers"))));
-    _groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("doActivity"))));
-    _groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("entry"))));
-    _groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("exit"))));
-    _groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isComposite"))));
-    _groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isOrthogonal"))));
-    _groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isSimple"))));
-    _groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isSubmachineState"))));
-    _groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedState"))));
-    _groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContext"))));
-    _groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("regions"))));
-    _groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("stateInvariant"))));
-    _groupProperties.insert(QStringLiteral("QUmlState"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("submachine"))));
-}
-
-void QUmlState::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("connections")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("connections")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlState");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("connections")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("connections")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("connections")][QtModeling::DocumentationRole] = QStringLiteral("The entry and exit connection points used in conjunction with this (submachine) state, i.e. as targets and sources, respectively, in the region with the submachine state. A connection point reference references the corresponding definition of a connection point pseudostate in the statemachine referenced by the submachinestate.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("connections")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("connections")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("connections")][QtModeling::OppositeEndRole] = QStringLiteral("ConnectionPointReference-state");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("connectionPoints")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("connectionPoints")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlState");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("connectionPoints")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("connectionPoints")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("connectionPoints")][QtModeling::DocumentationRole] = QStringLiteral("The entry and exit pseudostates of a composite state. These can only be entry or exit Pseudostates, and they must have different names. They can only be defined for composite states.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("connectionPoints")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("connectionPoints")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("connectionPoints")][QtModeling::OppositeEndRole] = QStringLiteral("Pseudostate-state");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("deferrableTriggers")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("deferrableTriggers")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlState");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("deferrableTriggers")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("deferrableTriggers")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("deferrableTriggers")][QtModeling::DocumentationRole] = QStringLiteral("A list of triggers that are candidates to be retained by the state machine if they trigger no transitions out of the state (not consumed). A deferred trigger is retained until the state machine reaches a state configuration where it is no longer deferred.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("deferrableTriggers")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("deferrableTriggers")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("deferrableTriggers")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("doActivity")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("doActivity")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlState");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("doActivity")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("doActivity")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("doActivity")][QtModeling::DocumentationRole] = QStringLiteral("An optional behavior that is executed while being in the state. The execution starts when this state is entered, and stops either by itself, or when the state is exited, whichever comes first.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("doActivity")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("doActivity")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("doActivity")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("entry")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("entry")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlState");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("entry")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("entry")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("entry")][QtModeling::DocumentationRole] = QStringLiteral("An optional behavior that is executed whenever this state is entered regardless of the transition taken to reach the state. If defined, entry actions are always executed to completion prior to any internal behavior or transitions performed within the state.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("entry")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("entry")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("entry")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("exit")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("exit")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlState");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("exit")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("exit")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("exit")][QtModeling::DocumentationRole] = QStringLiteral("An optional behavior that is executed whenever this state is exited regardless of which transition was taken out of the state. If defined, exit actions are always executed to completion only after all internal activities and transition actions have completed execution.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("exit")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("exit")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("exit")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("isComposite")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("isComposite")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlState");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("isComposite")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("isComposite")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("isComposite")][QtModeling::DocumentationRole] = QStringLiteral("A state with isComposite=true is said to be a composite state. A composite state is a state that contains at least one region.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("isComposite")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("isComposite")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("isComposite")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("isOrthogonal")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("isOrthogonal")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlState");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("isOrthogonal")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("isOrthogonal")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("isOrthogonal")][QtModeling::DocumentationRole] = QStringLiteral("A state with isOrthogonal=true is said to be an orthogonal composite state. An orthogonal composite state contains two or more regions.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("isOrthogonal")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("isOrthogonal")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("isOrthogonal")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("isSimple")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("isSimple")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlState");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("isSimple")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("isSimple")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("isSimple")][QtModeling::DocumentationRole] = QStringLiteral("A state with isSimple=true is said to be a simple state. A simple state does not have any regions and it does not refer to any submachine state machine.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("isSimple")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("isSimple")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("isSimple")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("isSubmachineState")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("isSubmachineState")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlState");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("isSubmachineState")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("isSubmachineState")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("isSubmachineState")][QtModeling::DocumentationRole] = QStringLiteral("A state with isSubmachineState=true is said to be a submachine state. Such a state refers to a state machine (submachine).");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("isSubmachineState")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("isSubmachineState")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("isSubmachineState")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("redefinedState")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("redefinedState")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlState");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("redefinedState")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("redefinedState")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("redefinedState")][QtModeling::DocumentationRole] = QStringLiteral("The state of which this state is a redefinition.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("redefinedState")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("redefinedState")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("RedefinableElement-redefinedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("redefinedState")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("redefinitionContext")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("redefinitionContext")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlState");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("redefinitionContext")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("redefinitionContext")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("redefinitionContext")][QtModeling::DocumentationRole] = QStringLiteral("References the classifier in which context this element may be redefined.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("redefinitionContext")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("RedefinableElement-redefinitionContext");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("redefinitionContext")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("redefinitionContext")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("regions")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("regions")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlState");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("regions")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("regions")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("regions")][QtModeling::DocumentationRole] = QStringLiteral("The regions owned directly by the state.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("regions")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("regions")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("regions")][QtModeling::OppositeEndRole] = QStringLiteral("Region-state");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("stateInvariant")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("stateInvariant")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlState");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("stateInvariant")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("stateInvariant")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("stateInvariant")][QtModeling::DocumentationRole] = QStringLiteral("Specifies conditions that are always true when this state is the current state. In protocol state machines, state invariants are additional conditions to the preconditions of the outgoing transitions, and to the postcondition of the incoming transitions.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("stateInvariant")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("stateInvariant")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedRule");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("stateInvariant")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("submachine")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("submachine")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlState");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("submachine")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("submachine")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("submachine")][QtModeling::DocumentationRole] = QStringLiteral("The state machine that is to be inserted in place of the (submachine) state.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("submachine")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("submachine")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("submachine")][QtModeling::OppositeEndRole] = QStringLiteral("StateMachine-submachineState");
-
-}
-
diff --git a/src/uml/qumlstate.h b/src/uml/qumlstate.h
index d345468c..425cd836 100644
--- a/src/uml/qumlstate.h
+++ b/src/uml/qumlstate.h
@@ -47,7 +47,6 @@
 #include <QtUml/QUmlRedefinableElement>
 #include <QtUml/QUmlVertex>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -66,10 +65,10 @@ class QUmlTrigger;
 class Q_UML_EXPORT QUmlState : public QUmlNamespace, public QUmlRedefinableElement, public QUmlVertex
 {
 public:
-    explicit QUmlState(bool createQObject = true);
+    explicit QUmlState(bool createQModelingObject = true);
     virtual ~QUmlState();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlConnectionPointReference *> connections() const;
@@ -123,9 +122,6 @@ protected:
     QSet<QUmlRegion *> _regions;
     QUmlConstraint *_stateInvariant;
     QUmlStateMachine *_submachine;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlstateinvariant.cpp b/src/uml/qumlstateinvariant.cpp
index bfa139d6..ba6403a5 100644
--- a/src/uml/qumlstateinvariant.cpp
+++ b/src/uml/qumlstateinvariant.cpp
@@ -62,26 +62,24 @@
 
     \brief A state invariant is a runtime constraint on the participants of the interaction. It may be used to specify a variety of different kinds of constraints, such as values of attributes or variables, internal or external states, and so on. A state invariant is an interaction fragment and it is placed on a lifeline.
  */
-QUmlStateInvariant::QUmlStateInvariant(bool createQObject) :
+QUmlStateInvariant::QUmlStateInvariant(bool createQModelingObject) :
     _covered(0),
     _invariant(0)
 {
-    if (createQObject)
-        _qObject = new QUmlStateInvariantObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlStateInvariantObject(this));
 }
 
 QUmlStateInvariant::~QUmlStateInvariant()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlStateInvariant::clone() const
+QModelingElement *QUmlStateInvariant::clone() const
 {
     QUmlStateInvariant *c = new QUmlStateInvariant;
     foreach (QUmlComment *element, ownedComments())
@@ -123,8 +121,8 @@ void QUmlStateInvariant::setCovered(QUmlLifeline *covered)
 
     if (_covered != covered) {
         _covered = covered;
-        if (covered && covered->asQObject() && this->asQObject())
-            QObject::connect(covered->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setCovered()));
+        if (covered && covered->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(covered->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setCovered()));
     }
 }
 
@@ -147,9 +145,9 @@ void QUmlStateInvariant::setInvariant(QUmlConstraint *invariant)
         removeOwnedElement(_invariant);
 
         _invariant = invariant;
-        if (invariant && invariant->asQObject() && this->asQObject())
-            QObject::connect(invariant->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setInvariant()));
-        invariant->asQObject()->setParent(this->asQObject());
+        if (invariant && invariant->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(invariant->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setInvariant()));
+        invariant->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (invariant) {
@@ -158,45 +156,3 @@ void QUmlStateInvariant::setInvariant(QUmlConstraint *invariant)
     }
 }
 
-void QUmlStateInvariant::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingInteraction"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("enclosingOperand"))));
-    _groupProperties.insert(QStringLiteral("QUmlInteractionFragment"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalOrderings"))));
-    _groupProperties.insert(QStringLiteral("QUmlStateInvariant"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("covered"))));
-    _groupProperties.insert(QStringLiteral("QUmlStateInvariant"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("invariant"))));
-}
-
-void QUmlStateInvariant::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateInvariant")][QStringLiteral("covered")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateInvariant")][QStringLiteral("covered")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStateInvariant");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateInvariant")][QStringLiteral("covered")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateInvariant")][QStringLiteral("covered")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateInvariant")][QStringLiteral("covered")][QtModeling::DocumentationRole] = QStringLiteral("References the Lifeline on which the StateInvariant appears.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateInvariant")][QStringLiteral("covered")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("InteractionFragment-covered");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateInvariant")][QStringLiteral("covered")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateInvariant")][QStringLiteral("covered")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateInvariant")][QStringLiteral("invariant")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateInvariant")][QStringLiteral("invariant")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStateInvariant");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateInvariant")][QStringLiteral("invariant")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateInvariant")][QStringLiteral("invariant")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateInvariant")][QStringLiteral("invariant")][QtModeling::DocumentationRole] = QStringLiteral("A Constraint that should hold at runtime for this StateInvariant");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateInvariant")][QStringLiteral("invariant")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateInvariant")][QStringLiteral("invariant")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateInvariant")][QStringLiteral("invariant")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlstateinvariant.h b/src/uml/qumlstateinvariant.h
index 5a3ab7f5..2fe65a50 100644
--- a/src/uml/qumlstateinvariant.h
+++ b/src/uml/qumlstateinvariant.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlInteractionFragment>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlLifeline;
 class Q_UML_EXPORT QUmlStateInvariant : public QUmlInteractionFragment
 {
 public:
-    explicit QUmlStateInvariant(bool createQObject = true);
+    explicit QUmlStateInvariant(bool createQModelingObject = true);
     virtual ~QUmlStateInvariant();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlLifeline *covered() const;
@@ -72,9 +71,6 @@ public:
 protected:
     QUmlLifeline *_covered;
     QUmlConstraint *_invariant;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlstatemachine.cpp b/src/uml/qumlstatemachine.cpp
index 43628735..21456300 100644
--- a/src/uml/qumlstatemachine.cpp
+++ b/src/uml/qumlstatemachine.cpp
@@ -93,24 +93,22 @@
 
     \brief State machines can be used to express the behavior of part of a system. Behavior is modeled as a traversal of a graph of state nodes interconnected by one or more joined transition arcs that are triggered by the dispatching of series of (event) occurrences. During this traversal, the state machine executes a series of activities associated with various elements of the state machine.
  */
-QUmlStateMachine::QUmlStateMachine(bool createQObject)
+QUmlStateMachine::QUmlStateMachine(bool createQModelingObject)
 {
-    if (createQObject)
-        _qObject = new QUmlStateMachineObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlStateMachineObject(this));
 }
 
 QUmlStateMachine::~QUmlStateMachine()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlStateMachine::clone() const
+QModelingElement *QUmlStateMachine::clone() const
 {
     QUmlStateMachine *c = new QUmlStateMachine;
     foreach (QUmlComment *element, ownedComments())
@@ -213,9 +211,9 @@ void QUmlStateMachine::addConnectionPoint(QUmlPseudostate *connectionPoint)
 
     if (!_connectionPoints.contains(connectionPoint)) {
         _connectionPoints.insert(connectionPoint);
-        if (connectionPoint && connectionPoint->asQObject() && this->asQObject())
-            QObject::connect(connectionPoint->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeConnectionPoint(QObject *)));
-        connectionPoint->asQObject()->setParent(this->asQObject());
+        if (connectionPoint && connectionPoint->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(connectionPoint->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeConnectionPoint(QObject *)));
+        connectionPoint->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedMember(connectionPoint);
@@ -233,8 +231,8 @@ void QUmlStateMachine::removeConnectionPoint(QUmlPseudostate *connectionPoint)
 
     if (_connectionPoints.contains(connectionPoint)) {
         _connectionPoints.remove(connectionPoint);
-        if (connectionPoint->asQObject())
-            connectionPoint->asQObject()->setParent(0);
+        if (connectionPoint->asQModelingObject())
+            connectionPoint->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedMember(connectionPoint);
@@ -262,8 +260,8 @@ void QUmlStateMachine::addExtendedStateMachine(QUmlStateMachine *extendedStateMa
 
     if (!_extendedStateMachines.contains(extendedStateMachine)) {
         _extendedStateMachines.insert(extendedStateMachine);
-        if (extendedStateMachine && extendedStateMachine->asQObject() && this->asQObject())
-            QObject::connect(extendedStateMachine->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeExtendedStateMachine(QObject *)));
+        if (extendedStateMachine && extendedStateMachine->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(extendedStateMachine->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeExtendedStateMachine(QObject *)));
     }
 }
 
@@ -292,9 +290,9 @@ void QUmlStateMachine::addRegion(QUmlRegion *region)
 
     if (!_regions.contains(region)) {
         _regions.insert(region);
-        if (region && region->asQObject() && this->asQObject())
-            QObject::connect(region->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeRegion(QObject *)));
-        region->asQObject()->setParent(this->asQObject());
+        if (region && region->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(region->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeRegion(QObject *)));
+        region->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedMember(region);
@@ -312,8 +310,8 @@ void QUmlStateMachine::removeRegion(QUmlRegion *region)
 
     if (_regions.contains(region)) {
         _regions.remove(region);
-        if (region->asQObject())
-            region->asQObject()->setParent(0);
+        if (region->asQModelingObject())
+            region->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedMember(region);
@@ -341,8 +339,8 @@ void QUmlStateMachine::addSubmachineState(QUmlState *submachineState)
 
     if (!_submachineStates.contains(submachineState)) {
         _submachineStates.insert(submachineState);
-        if (submachineState && submachineState->asQObject() && this->asQObject())
-            QObject::connect(submachineState->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeSubmachineState(QObject *)));
+        if (submachineState && submachineState->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(submachineState->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeSubmachineState(QObject *)));
 
         // Adjust opposite properties
         if (submachineState) {
@@ -413,110 +411,3 @@ bool QUmlStateMachine::isRedefinitionContextValid(QUmlStateMachine *redefined) c
     return bool ();
 }
 
-void QUmlStateMachine::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedConnectors"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parts"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("roles"))));
-    _groupProperties.insert(QStringLiteral("QUmlEncapsulatedClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedPorts"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifierBehavior"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interfaceRealizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedBehaviors"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extensions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isActive"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedReceptions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superClasses"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameters"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameterSets"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("postconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("preconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavior"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("specification"))));
-    _groupProperties.insert(QStringLiteral("QUmlStateMachine"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("connectionPoints"))));
-    _groupProperties.insert(QStringLiteral("QUmlStateMachine"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extendedStateMachines"))));
-    _groupProperties.insert(QStringLiteral("QUmlStateMachine"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("regions"))));
-    _groupProperties.insert(QStringLiteral("QUmlStateMachine"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("submachineStates"))));
-}
-
-void QUmlStateMachine::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("connectionPoints")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("connectionPoints")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStateMachine");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("connectionPoints")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("connectionPoints")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("connectionPoints")][QtModeling::DocumentationRole] = QStringLiteral("The connection points defined for this state machine. They represent the interface of the state machine when used as part of submachine state.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("connectionPoints")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("connectionPoints")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("connectionPoints")][QtModeling::OppositeEndRole] = QStringLiteral("Pseudostate-stateMachine");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("extendedStateMachines")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("extendedStateMachines")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStateMachine");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("extendedStateMachines")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("extendedStateMachines")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("extendedStateMachines")][QtModeling::DocumentationRole] = QStringLiteral("The state machines of which this is an extension.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("extendedStateMachines")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("Behavior-redefinedBehavior");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("extendedStateMachines")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("extendedStateMachines")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("regions")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("regions")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStateMachine");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("regions")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("regions")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("regions")][QtModeling::DocumentationRole] = QStringLiteral("The regions owned directly by the state machine.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("regions")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("regions")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("regions")][QtModeling::OppositeEndRole] = QStringLiteral("Region-stateMachine");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("submachineStates")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("submachineStates")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStateMachine");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("submachineStates")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("submachineStates")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("submachineStates")][QtModeling::DocumentationRole] = QStringLiteral("References the submachine(s) in case of a submachine state. Multiple machines are referenced in case of a concurrent state.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("submachineStates")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("submachineStates")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("submachineStates")][QtModeling::OppositeEndRole] = QStringLiteral("State-submachine");
-
-}
-
diff --git a/src/uml/qumlstatemachine.h b/src/uml/qumlstatemachine.h
index 598f00a7..744b54a2 100644
--- a/src/uml/qumlstatemachine.h
+++ b/src/uml/qumlstatemachine.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlBehavior>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -61,10 +60,10 @@ class QUmlState;
 class Q_UML_EXPORT QUmlStateMachine : public QUmlBehavior
 {
 public:
-    explicit QUmlStateMachine(bool createQObject = true);
+    explicit QUmlStateMachine(bool createQModelingObject = true);
     virtual ~QUmlStateMachine();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlPseudostate *> connectionPoints() const;
@@ -91,9 +90,6 @@ protected:
     QSet<QUmlStateMachine *> _extendedStateMachines;
     QSet<QUmlRegion *> _regions;
     QSet<QUmlState *> _submachineStates;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlstereotype.cpp b/src/uml/qumlstereotype.cpp
index fcf8a209..2ba16c43 100644
--- a/src/uml/qumlstereotype.cpp
+++ b/src/uml/qumlstereotype.cpp
@@ -88,25 +88,23 @@
 
     \brief A stereotype defines how an existing metaclass may be extended, and enables the use of platform or domain specific terminology or notation in place of, or in addition to, the ones used for the extended metaclass.
  */
-QUmlStereotype::QUmlStereotype(bool createQObject) :
+QUmlStereotype::QUmlStereotype(bool createQModelingObject) :
     QUmlClass(false)
 {
-    if (createQObject)
-        _qObject = new QUmlStereotypeObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlStereotypeObject(this));
 }
 
 QUmlStereotype::~QUmlStereotype()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlStereotype::clone() const
+QModelingElement *QUmlStereotype::clone() const
 {
     QUmlStereotype *c = new QUmlStereotype;
     foreach (QUmlComment *element, ownedComments())
@@ -192,9 +190,9 @@ void QUmlStereotype::addIcon(QUmlImage *icon)
 
     if (!_icons.contains(icon)) {
         _icons.insert(icon);
-        if (icon && icon->asQObject() && this->asQObject())
-            QObject::connect(icon->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeIcon(QObject *)));
-        icon->asQObject()->setParent(this->asQObject());
+        if (icon && icon->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(icon->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeIcon(QObject *)));
+        icon->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(icon);
@@ -207,8 +205,8 @@ void QUmlStereotype::removeIcon(QUmlImage *icon)
 
     if (_icons.contains(icon)) {
         _icons.remove(icon);
-        if (icon->asQObject())
-            icon->asQObject()->setParent(0);
+        if (icon->asQModelingObject())
+            icon->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(icon);
@@ -251,83 +249,3 @@ QUmlProfile *QUmlStereotype::containingProfile() const
     return 0;
 }
 
-void QUmlStereotype::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedConnectors"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parts"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("roles"))));
-    _groupProperties.insert(QStringLiteral("QUmlEncapsulatedClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedPorts"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifierBehavior"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interfaceRealizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedBehaviors"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extensions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isActive"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nestedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedOperations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedReceptions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClass"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superClasses"))));
-    _groupProperties.insert(QStringLiteral("QUmlStereotype"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("icons"))));
-    _groupProperties.insert(QStringLiteral("QUmlStereotype"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("profile"))));
-}
-
-void QUmlStereotype::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStereotype")][QStringLiteral("icons")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStereotype")][QStringLiteral("icons")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStereotype");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStereotype")][QStringLiteral("icons")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStereotype")][QStringLiteral("icons")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStereotype")][QStringLiteral("icons")][QtModeling::DocumentationRole] = QStringLiteral("Stereotype can change the graphical appearance of the extended model element by using attached icons. When this association is not null, it references the location of the icon content to be displayed within diagrams presenting the extended model elements.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStereotype")][QStringLiteral("icons")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStereotype")][QStringLiteral("icons")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStereotype")][QStringLiteral("icons")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStereotype")][QStringLiteral("profile")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStereotype")][QStringLiteral("profile")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStereotype");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStereotype")][QStringLiteral("profile")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStereotype")][QStringLiteral("profile")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStereotype")][QStringLiteral("profile")][QtModeling::DocumentationRole] = QStringLiteral("The profile that directly or indirectly contains this stereotype.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStereotype")][QStringLiteral("profile")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStereotype")][QStringLiteral("profile")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStereotype")][QStringLiteral("profile")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlstereotype.h b/src/uml/qumlstereotype.h
index 66a1ee11..284858da 100644
--- a/src/uml/qumlstereotype.h
+++ b/src/uml/qumlstereotype.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlClass>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlProfile;
 class Q_UML_EXPORT QUmlStereotype : public QUmlClass
 {
 public:
-    explicit QUmlStereotype(bool createQObject = true);
+    explicit QUmlStereotype(bool createQModelingObject = true);
     virtual ~QUmlStereotype();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlImage *> icons() const;
@@ -75,9 +74,6 @@ public:
 
 protected:
     QSet<QUmlImage *> _icons;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlstringexpression.cpp b/src/uml/qumlstringexpression.cpp
index 40a6d8dd..7da01118 100644
--- a/src/uml/qumlstringexpression.cpp
+++ b/src/uml/qumlstringexpression.cpp
@@ -62,26 +62,24 @@
 
     \brief An expression that specifies a string value that is derived by concatenating a set of sub string expressions, some of which might be template parameters.
  */
-QUmlStringExpression::QUmlStringExpression(bool createQObject) :
+QUmlStringExpression::QUmlStringExpression(bool createQModelingObject) :
     QUmlExpression(false),
     _owningExpression(0)
 {
-    if (createQObject)
-        _qObject = new QUmlStringExpressionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlStringExpressionObject(this));
 }
 
 QUmlStringExpression::~QUmlStringExpression()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlStringExpression::clone() const
+QModelingElement *QUmlStringExpression::clone() const
 {
     QUmlStringExpression *c = new QUmlStringExpression;
     foreach (QUmlComment *element, ownedComments())
@@ -132,8 +130,8 @@ void QUmlStringExpression::setOwningExpression(QUmlStringExpression *owningExpre
         // Adjust subsetted properties
 
         _owningExpression = owningExpression;
-        if (owningExpression && owningExpression->asQObject() && this->asQObject())
-            QObject::connect(owningExpression->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setOwningExpression()));
+        if (owningExpression && owningExpression->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(owningExpression->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setOwningExpression()));
 
         // Adjust subsetted properties
         setOwner(owningExpression);
@@ -156,9 +154,9 @@ void QUmlStringExpression::addSubExpression(QUmlStringExpression *subExpression)
 
     if (!_subExpressions.contains(subExpression)) {
         _subExpressions.insert(subExpression);
-        if (subExpression && subExpression->asQObject() && this->asQObject())
-            QObject::connect(subExpression->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeSubExpression(QObject *)));
-        subExpression->asQObject()->setParent(this->asQObject());
+        if (subExpression && subExpression->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(subExpression->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeSubExpression(QObject *)));
+        subExpression->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(subExpression);
@@ -171,8 +169,8 @@ void QUmlStringExpression::removeSubExpression(QUmlStringExpression *subExpressi
 
     if (_subExpressions.contains(subExpression)) {
         _subExpressions.remove(subExpression);
-        if (subExpression->asQObject())
-            subExpression->asQObject()->setParent(0);
+        if (subExpression->asQModelingObject())
+            subExpression->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(subExpression);
@@ -191,49 +189,3 @@ QString QUmlStringExpression::stringValue() const
     return QString ();
 }
 
-void QUmlStringExpression::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlExpression"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("operands"))));
-    _groupProperties.insert(QStringLiteral("QUmlExpression"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("symbol"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
-    _groupProperties.insert(QStringLiteral("QUmlStringExpression"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlStringExpression"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("subExpressions"))));
-}
-
-void QUmlStringExpression::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStringExpression")][QStringLiteral("owningExpression")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStringExpression")][QStringLiteral("owningExpression")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStringExpression");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStringExpression")][QStringLiteral("owningExpression")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStringExpression")][QStringLiteral("owningExpression")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStringExpression")][QStringLiteral("owningExpression")][QtModeling::DocumentationRole] = QStringLiteral("The string expression of which this expression is a substring.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStringExpression")][QStringLiteral("owningExpression")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStringExpression")][QStringLiteral("owningExpression")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStringExpression")][QStringLiteral("owningExpression")][QtModeling::OppositeEndRole] = QStringLiteral("StringExpression-subExpression");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStringExpression")][QStringLiteral("subExpressions")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStringExpression")][QStringLiteral("subExpressions")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStringExpression");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStringExpression")][QStringLiteral("subExpressions")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStringExpression")][QStringLiteral("subExpressions")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStringExpression")][QStringLiteral("subExpressions")][QtModeling::DocumentationRole] = QStringLiteral("The StringExpressions that constitute this StringExpression.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStringExpression")][QStringLiteral("subExpressions")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStringExpression")][QStringLiteral("subExpressions")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStringExpression")][QStringLiteral("subExpressions")][QtModeling::OppositeEndRole] = QStringLiteral("StringExpression-owningExpression");
-
-}
-
diff --git a/src/uml/qumlstringexpression.h b/src/uml/qumlstringexpression.h
index cc736af0..780cfdfa 100644
--- a/src/uml/qumlstringexpression.h
+++ b/src/uml/qumlstringexpression.h
@@ -46,7 +46,6 @@
 #include <QtUml/QUmlExpression>
 #include <QtUml/QUmlTemplateableElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -56,10 +55,10 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlStringExpression : public QUmlExpression, public QUmlTemplateableElement
 {
 public:
-    explicit QUmlStringExpression(bool createQObject = true);
+    explicit QUmlStringExpression(bool createQModelingObject = true);
     virtual ~QUmlStringExpression();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlStringExpression *owningExpression() const;
@@ -74,9 +73,6 @@ public:
 protected:
     QUmlStringExpression *_owningExpression;
     QSet<QUmlStringExpression *> _subExpressions;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlstructuralfeature.cpp b/src/uml/qumlstructuralfeature.cpp
index a65cc840..6d86600a 100644
--- a/src/uml/qumlstructuralfeature.cpp
+++ b/src/uml/qumlstructuralfeature.cpp
@@ -63,15 +63,13 @@
 QUmlStructuralFeature::QUmlStructuralFeature() :
     _isReadOnly(false)
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlStructuralFeature::~QUmlStructuralFeature()
 {
 }
 
-QModelingObject *QUmlStructuralFeature::clone() const
+QModelingElement *QUmlStructuralFeature::clone() const
 {
     QUmlStructuralFeature *c = new QUmlStructuralFeature;
     foreach (QUmlComment *element, ownedComments())
@@ -114,48 +112,7 @@ void QUmlStructuralFeature::setReadOnly(bool isReadOnly)
 
     if (_isReadOnly != isReadOnly) {
         _isReadOnly = isReadOnly;
-        _modifiedResettableProperties << QStringLiteral("isReadOnly");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isReadOnly");
     }
 }
 
-void QUmlStructuralFeature::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isOrdered"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isUnique"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lower"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lowerValue"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upper"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperValue"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("featuringClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isStatic"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuralFeature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isReadOnly"))));
-}
-
-void QUmlStructuralFeature::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuralFeature")][QStringLiteral("isReadOnly")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuralFeature")][QStringLiteral("isReadOnly")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStructuralFeature");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuralFeature")][QStringLiteral("isReadOnly")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuralFeature")][QStringLiteral("isReadOnly")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuralFeature")][QStringLiteral("isReadOnly")][QtModeling::DocumentationRole] = QStringLiteral("States whether the feature's value may be modified by a client.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuralFeature")][QStringLiteral("isReadOnly")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuralFeature")][QStringLiteral("isReadOnly")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuralFeature")][QStringLiteral("isReadOnly")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlstructuralfeature.h b/src/uml/qumlstructuralfeature.h
index 1eb18564..40ccb2a5 100644
--- a/src/uml/qumlstructuralfeature.h
+++ b/src/uml/qumlstructuralfeature.h
@@ -47,7 +47,6 @@
 #include <QtUml/QUmlMultiplicityElement>
 #include <QtUml/QUmlFeature>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -59,7 +58,7 @@ class Q_UML_EXPORT QUmlStructuralFeature : public virtual QUmlTypedElement, publ
 public:
     virtual ~QUmlStructuralFeature();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     bool isReadOnly() const;
@@ -69,9 +68,6 @@ protected:
     explicit QUmlStructuralFeature();
 
     bool _isReadOnly;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlstructuralfeatureaction.cpp b/src/uml/qumlstructuralfeatureaction.cpp
index 53b9713f..14dbb9b2 100644
--- a/src/uml/qumlstructuralfeatureaction.cpp
+++ b/src/uml/qumlstructuralfeatureaction.cpp
@@ -73,15 +73,13 @@ QUmlStructuralFeatureAction::QUmlStructuralFeatureAction() :
     _object(0),
     _structuralFeature(0)
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlStructuralFeatureAction::~QUmlStructuralFeatureAction()
 {
 }
 
-QModelingObject *QUmlStructuralFeatureAction::clone() const
+QModelingElement *QUmlStructuralFeatureAction::clone() const
 {
     QUmlStructuralFeatureAction *c = new QUmlStructuralFeatureAction;
     foreach (QUmlComment *element, ownedComments())
@@ -142,9 +140,9 @@ void QUmlStructuralFeatureAction::setObject(QUmlInputPin *object)
         removeInput(_object);
 
         _object = object;
-        if (object && object->asQObject() && this->asQObject())
-            QObject::connect(object->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setObject()));
-        object->asQObject()->setParent(this->asQObject());
+        if (object && object->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(object->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setObject()));
+        object->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (object) {
@@ -169,65 +167,8 @@ void QUmlStructuralFeatureAction::setStructuralFeature(QUmlStructuralFeature *st
 
     if (_structuralFeature != structuralFeature) {
         _structuralFeature = structuralFeature;
-        if (structuralFeature && structuralFeature->asQObject() && this->asQObject())
-            QObject::connect(structuralFeature->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setStructuralFeature()));
+        if (structuralFeature && structuralFeature->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(structuralFeature->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setStructuralFeature()));
     }
 }
 
-void QUmlStructuralFeatureAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuralFeatureAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("object"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuralFeatureAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("structuralFeature"))));
-}
-
-void QUmlStructuralFeatureAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuralFeatureAction")][QStringLiteral("object")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuralFeatureAction")][QStringLiteral("object")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStructuralFeatureAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuralFeatureAction")][QStringLiteral("object")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuralFeatureAction")][QStringLiteral("object")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuralFeatureAction")][QStringLiteral("object")][QtModeling::DocumentationRole] = QStringLiteral("Gives the input pin from which the object whose structural feature is to be read or written is obtained.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuralFeatureAction")][QStringLiteral("object")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuralFeatureAction")][QStringLiteral("object")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuralFeatureAction")][QStringLiteral("object")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuralFeatureAction")][QStringLiteral("structuralFeature")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuralFeatureAction")][QStringLiteral("structuralFeature")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStructuralFeatureAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuralFeatureAction")][QStringLiteral("structuralFeature")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuralFeatureAction")][QStringLiteral("structuralFeature")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuralFeatureAction")][QStringLiteral("structuralFeature")][QtModeling::DocumentationRole] = QStringLiteral("Structural feature to be read.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuralFeatureAction")][QStringLiteral("structuralFeature")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuralFeatureAction")][QStringLiteral("structuralFeature")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuralFeatureAction")][QStringLiteral("structuralFeature")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlstructuralfeatureaction.h b/src/uml/qumlstructuralfeatureaction.h
index 37c60318..d899ad3f 100644
--- a/src/uml/qumlstructuralfeatureaction.h
+++ b/src/uml/qumlstructuralfeatureaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -60,7 +59,7 @@ class Q_UML_EXPORT QUmlStructuralFeatureAction : public QUmlAction
 public:
     virtual ~QUmlStructuralFeatureAction();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlInputPin *object() const;
@@ -73,9 +72,6 @@ protected:
 
     QUmlInputPin *_object;
     QUmlStructuralFeature *_structuralFeature;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlstructuredactivitynode.cpp b/src/uml/qumlstructuredactivitynode.cpp
index fdfcdff5..61d990b7 100644
--- a/src/uml/qumlstructuredactivitynode.cpp
+++ b/src/uml/qumlstructuredactivitynode.cpp
@@ -73,26 +73,24 @@
 
     \brief A structured activity node is an executable activity node that may have an expansion into subordinate nodes as an activity group. The subordinate nodes must belong to only one structured activity node, although they may be nested.Because of the concurrent nature of the execution of actions within and across activities, it can be difficult to guarantee the consistent access and modification of object memory. In order to avoid race conditions or other concurrency-related problems, it is sometimes necessary to isolate the effects of a group of actions from the effects of actions outside the group. This may be indicated by setting the mustIsolate attribute to true on a structured activity node. If a structured activity node is "isolated," then any object used by an action within the node cannot be accessed by any action outside the node until the structured activity node as a whole completes. Any concurrent actions that would result in accessing such objects are required to have their execution deferred until the completion of the node.
  */
-QUmlStructuredActivityNode::QUmlStructuredActivityNode(bool createQObject) :
+QUmlStructuredActivityNode::QUmlStructuredActivityNode(bool createQModelingObject) :
     _activity(0),
     _mustIsolate(false)
 {
-    if (createQObject)
-        _qObject = new QUmlStructuredActivityNodeObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlStructuredActivityNodeObject(this));
 }
 
 QUmlStructuredActivityNode::~QUmlStructuredActivityNode()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlStructuredActivityNode::clone() const
+QModelingElement *QUmlStructuredActivityNode::clone() const
 {
     QUmlStructuredActivityNode *c = new QUmlStructuredActivityNode;
     foreach (QUmlComment *element, ownedComments())
@@ -163,8 +161,8 @@ void QUmlStructuredActivityNode::setActivity(QUmlActivity *activity)
 
     if (_activity != activity) {
         _activity = activity;
-        if (activity && activity->asQObject() && this->asQObject())
-            QObject::connect(activity->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setActivity()));
+        if (activity && activity->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(activity->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setActivity()));
     }
 }
 
@@ -184,9 +182,9 @@ void QUmlStructuredActivityNode::addEdge(QUmlActivityEdge *edge)
 
     if (!_edges.contains(edge)) {
         _edges.insert(edge);
-        if (edge && edge->asQObject() && this->asQObject())
-            QObject::connect(edge->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeEdge(QObject *)));
-        edge->asQObject()->setParent(this->asQObject());
+        if (edge && edge->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(edge->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeEdge(QObject *)));
+        edge->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addContainedEdge(edge);
@@ -205,8 +203,8 @@ void QUmlStructuredActivityNode::removeEdge(QUmlActivityEdge *edge)
 
     if (_edges.contains(edge)) {
         _edges.remove(edge);
-        if (edge->asQObject())
-            edge->asQObject()->setParent(0);
+        if (edge->asQModelingObject())
+            edge->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeContainedEdge(edge);
@@ -235,7 +233,7 @@ void QUmlStructuredActivityNode::setMustIsolate(bool mustIsolate)
 
     if (_mustIsolate != mustIsolate) {
         _mustIsolate = mustIsolate;
-        _modifiedResettableProperties << QStringLiteral("mustIsolate");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("mustIsolate");
     }
 }
 
@@ -255,9 +253,9 @@ void QUmlStructuredActivityNode::addNode(QUmlActivityNode *node)
 
     if (!_nodes.contains(node)) {
         _nodes.insert(node);
-        if (node && node->asQObject() && this->asQObject())
-            QObject::connect(node->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeNode(QObject *)));
-        node->asQObject()->setParent(this->asQObject());
+        if (node && node->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(node->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeNode(QObject *)));
+        node->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addContainedNode(node);
@@ -276,8 +274,8 @@ void QUmlStructuredActivityNode::removeNode(QUmlActivityNode *node)
 
     if (_nodes.contains(node)) {
         _nodes.remove(node);
-        if (node->asQObject())
-            node->asQObject()->setParent(0);
+        if (node->asQModelingObject())
+            node->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeContainedNode(node);
@@ -303,9 +301,9 @@ void QUmlStructuredActivityNode::addStructuredNodeInput(QUmlInputPin *structured
 
     if (!_structuredNodeInputs.contains(structuredNodeInput)) {
         _structuredNodeInputs.insert(structuredNodeInput);
-        if (structuredNodeInput && structuredNodeInput->asQObject() && this->asQObject())
-            QObject::connect(structuredNodeInput->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeStructuredNodeInput(QObject *)));
-        structuredNodeInput->asQObject()->setParent(this->asQObject());
+        if (structuredNodeInput && structuredNodeInput->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(structuredNodeInput->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeStructuredNodeInput(QObject *)));
+        structuredNodeInput->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addInput(structuredNodeInput);
@@ -318,8 +316,8 @@ void QUmlStructuredActivityNode::removeStructuredNodeInput(QUmlInputPin *structu
 
     if (_structuredNodeInputs.contains(structuredNodeInput)) {
         _structuredNodeInputs.remove(structuredNodeInput);
-        if (structuredNodeInput->asQObject())
-            structuredNodeInput->asQObject()->setParent(0);
+        if (structuredNodeInput->asQModelingObject())
+            structuredNodeInput->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeInput(structuredNodeInput);
@@ -339,9 +337,9 @@ void QUmlStructuredActivityNode::addStructuredNodeOutput(QUmlOutputPin *structur
 
     if (!_structuredNodeOutputs.contains(structuredNodeOutput)) {
         _structuredNodeOutputs.insert(structuredNodeOutput);
-        if (structuredNodeOutput && structuredNodeOutput->asQObject() && this->asQObject())
-            QObject::connect(structuredNodeOutput->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeStructuredNodeOutput(QObject *)));
-        structuredNodeOutput->asQObject()->setParent(this->asQObject());
+        if (structuredNodeOutput && structuredNodeOutput->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(structuredNodeOutput->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeStructuredNodeOutput(QObject *)));
+        structuredNodeOutput->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOutput(structuredNodeOutput);
@@ -354,8 +352,8 @@ void QUmlStructuredActivityNode::removeStructuredNodeOutput(QUmlOutputPin *struc
 
     if (_structuredNodeOutputs.contains(structuredNodeOutput)) {
         _structuredNodeOutputs.remove(structuredNodeOutput);
-        if (structuredNodeOutput->asQObject())
-            structuredNodeOutput->asQObject()->setParent(0);
+        if (structuredNodeOutput->asQModelingObject())
+            structuredNodeOutput->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOutput(structuredNodeOutput);
@@ -378,9 +376,9 @@ void QUmlStructuredActivityNode::addVariable(QUmlVariable *variable)
 
     if (!_variables.contains(variable)) {
         _variables.insert(variable);
-        if (variable && variable->asQObject() && this->asQObject())
-            QObject::connect(variable->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeVariable(QObject *)));
-        variable->asQObject()->setParent(this->asQObject());
+        if (variable && variable->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(variable->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeVariable(QObject *)));
+        variable->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedMember(variable);
@@ -398,8 +396,8 @@ void QUmlStructuredActivityNode::removeVariable(QUmlVariable *variable)
 
     if (_variables.contains(variable)) {
         _variables.remove(variable);
-        if (variable->asQObject())
-            variable->asQObject()->setParent(0);
+        if (variable->asQModelingObject())
+            variable->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedMember(variable);
@@ -411,119 +409,3 @@ void QUmlStructuredActivityNode::removeVariable(QUmlVariable *variable)
     }
 }
 
-void QUmlStructuredActivityNode::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("containedEdges"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("containedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("subgroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityGroup"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("superGroup"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("edges"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("mustIsolate"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("structuredNodeInputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("structuredNodeOutputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("variables"))));
-}
-
-void QUmlStructuredActivityNode::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("activity")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("activity")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStructuredActivityNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("activity")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("activity")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("activity")][QtModeling::DocumentationRole] = QStringLiteral("Activity immediately containing the node.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("activity")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("ActivityGroup-inActivity ActivityNode-activity");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("activity")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("activity")][QtModeling::OppositeEndRole] = QStringLiteral("Activity-structuredNode");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("edges")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("edges")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStructuredActivityNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("edges")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("edges")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("edges")][QtModeling::DocumentationRole] = QStringLiteral("Edges immediately contained in the structured node.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("edges")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("edges")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("ActivityGroup-containedEdge Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("edges")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityEdge-inStructuredNode");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("mustIsolate")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("mustIsolate")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStructuredActivityNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("mustIsolate")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("mustIsolate")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("mustIsolate")][QtModeling::DocumentationRole] = QStringLiteral("If true, then the actions in the node execute in isolation from actions outside the node.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("mustIsolate")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("mustIsolate")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("mustIsolate")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("nodes")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("nodes")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStructuredActivityNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("nodes")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("nodes")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("nodes")][QtModeling::DocumentationRole] = QStringLiteral("Nodes immediately contained in the group.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("nodes")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("nodes")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("ActivityGroup-containedNode Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("nodes")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityNode-inStructuredNode");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("structuredNodeInputs")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("structuredNodeInputs")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStructuredActivityNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("structuredNodeInputs")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("structuredNodeInputs")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("structuredNodeInputs")][QtModeling::DocumentationRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("structuredNodeInputs")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("structuredNodeInputs")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("structuredNodeInputs")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("structuredNodeOutputs")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("structuredNodeOutputs")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStructuredActivityNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("structuredNodeOutputs")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("structuredNodeOutputs")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("structuredNodeOutputs")][QtModeling::DocumentationRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("structuredNodeOutputs")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("structuredNodeOutputs")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("structuredNodeOutputs")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("variables")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("variables")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStructuredActivityNode");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("variables")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("variables")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("variables")][QtModeling::DocumentationRole] = QStringLiteral("A variable defined in the scope of the structured activity node. It has no value and may not be accessed");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("variables")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("variables")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("variables")][QtModeling::OppositeEndRole] = QStringLiteral("Variable-scope");
-
-}
-
diff --git a/src/uml/qumlstructuredactivitynode.h b/src/uml/qumlstructuredactivitynode.h
index 6111fd37..78a5793c 100644
--- a/src/uml/qumlstructuredactivitynode.h
+++ b/src/uml/qumlstructuredactivitynode.h
@@ -47,7 +47,6 @@
 #include <QtUml/QUmlNamespace>
 #include <QtUml/QUmlActivityGroup>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -64,10 +63,10 @@ class QUmlVariable;
 class Q_UML_EXPORT QUmlStructuredActivityNode : public QUmlAction, public QUmlNamespace, public QUmlActivityGroup
 {
 public:
-    explicit QUmlStructuredActivityNode(bool createQObject = true);
+    explicit QUmlStructuredActivityNode(bool createQModelingObject = true);
     virtual ~QUmlStructuredActivityNode();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlActivity *activity() const;
@@ -98,9 +97,6 @@ protected:
     QSet<QUmlInputPin *> _structuredNodeInputs;
     QSet<QUmlOutputPin *> _structuredNodeOutputs;
     QSet<QUmlVariable *> _variables;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlstructuredclassifier.cpp b/src/uml/qumlstructuredclassifier.cpp
index 162a3fed..b957a5a4 100644
--- a/src/uml/qumlstructuredclassifier.cpp
+++ b/src/uml/qumlstructuredclassifier.cpp
@@ -79,15 +79,13 @@
  */
 QUmlStructuredClassifier::QUmlStructuredClassifier()
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlStructuredClassifier::~QUmlStructuredClassifier()
 {
 }
 
-QModelingObject *QUmlStructuredClassifier::clone() const
+QModelingElement *QUmlStructuredClassifier::clone() const
 {
     QUmlStructuredClassifier *c = new QUmlStructuredClassifier;
     foreach (QUmlComment *element, ownedComments())
@@ -158,9 +156,9 @@ void QUmlStructuredClassifier::addOwnedAttribute(QUmlProperty *ownedAttribute)
 
     if (!_ownedAttributes.contains(ownedAttribute)) {
         _ownedAttributes.append(ownedAttribute);
-        if (ownedAttribute && ownedAttribute->asQObject() && this->asQObject())
-            QObject::connect(ownedAttribute->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeOwnedAttribute(QObject *)));
-        ownedAttribute->asQObject()->setParent(this->asQObject());
+        if (ownedAttribute && ownedAttribute->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(ownedAttribute->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeOwnedAttribute(QObject *)));
+        ownedAttribute->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addAttribute(ownedAttribute);
@@ -175,8 +173,8 @@ void QUmlStructuredClassifier::removeOwnedAttribute(QUmlProperty *ownedAttribute
 
     if (_ownedAttributes.contains(ownedAttribute)) {
         _ownedAttributes.removeAll(ownedAttribute);
-        if (ownedAttribute->asQObject())
-            ownedAttribute->asQObject()->setParent(0);
+        if (ownedAttribute->asQModelingObject())
+            ownedAttribute->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeAttribute(ownedAttribute);
@@ -201,9 +199,9 @@ void QUmlStructuredClassifier::addOwnedConnector(QUmlConnector *ownedConnector)
 
     if (!_ownedConnectors.contains(ownedConnector)) {
         _ownedConnectors.insert(ownedConnector);
-        if (ownedConnector && ownedConnector->asQObject() && this->asQObject())
-            QObject::connect(ownedConnector->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeOwnedConnector(QObject *)));
-        ownedConnector->asQObject()->setParent(this->asQObject());
+        if (ownedConnector && ownedConnector->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(ownedConnector->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeOwnedConnector(QObject *)));
+        ownedConnector->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addFeature(ownedConnector);
@@ -217,8 +215,8 @@ void QUmlStructuredClassifier::removeOwnedConnector(QUmlConnector *ownedConnecto
 
     if (_ownedConnectors.contains(ownedConnector)) {
         _ownedConnectors.remove(ownedConnector);
-        if (ownedConnector->asQObject())
-            ownedConnector->asQObject()->setParent(0);
+        if (ownedConnector->asQModelingObject())
+            ownedConnector->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeFeature(ownedConnector);
@@ -278,8 +276,8 @@ void QUmlStructuredClassifier::addRole(QUmlConnectableElement *role)
 
     if (!_roles.contains(role)) {
         _roles.insert(role);
-        if (role && role->asQObject() && this->asQObject())
-            QObject::connect(role->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeRole(QObject *)));
+        if (role && role->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(role->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeRole(QObject *)));
 
         // Adjust subsetted properties
         addMember(role);
@@ -298,90 +296,3 @@ void QUmlStructuredClassifier::removeRole(QUmlConnectableElement *role)
     }
 }
 
-void QUmlStructuredClassifier::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generals"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedAttributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedConnectors"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parts"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("roles"))));
-}
-
-void QUmlStructuredClassifier::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("ownedAttributes")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("ownedAttributes")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStructuredClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("ownedAttributes")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("ownedAttributes")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("ownedAttributes")][QtModeling::DocumentationRole] = QStringLiteral("References the properties owned by the classifier.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("ownedAttributes")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("ownedAttributes")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Classifier-attribute Namespace-ownedMember StructuredClassifier-role");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("ownedAttributes")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("ownedConnectors")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("ownedConnectors")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStructuredClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("ownedConnectors")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("ownedConnectors")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("ownedConnectors")][QtModeling::DocumentationRole] = QStringLiteral("References the connectors owned by the classifier.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("ownedConnectors")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("ownedConnectors")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Classifier-feature A_redefinitionContext_redefinableElement-redefinableElement Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("ownedConnectors")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("parts")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("parts")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStructuredClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("parts")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("parts")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("parts")][QtModeling::DocumentationRole] = QStringLiteral("References the properties specifying instances that the classifier owns by composition. This association is derived, selecting those owned properties where isComposite is true.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("parts")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("parts")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("parts")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("roles")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("roles")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStructuredClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("roles")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("roles")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("roles")][QtModeling::DocumentationRole] = QStringLiteral("References the roles that instances may play in this classifier.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("roles")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("roles")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-member");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("roles")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlstructuredclassifier.h b/src/uml/qumlstructuredclassifier.h
index 16c879d0..0e13ad13 100644
--- a/src/uml/qumlstructuredclassifier.h
+++ b/src/uml/qumlstructuredclassifier.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlClassifier>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -61,7 +60,7 @@ class Q_UML_EXPORT QUmlStructuredClassifier : public virtual QUmlClassifier
 public:
     virtual ~QUmlStructuredClassifier();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QList<QUmlProperty *> ownedAttributes() const;
@@ -83,9 +82,6 @@ protected:
     QList<QUmlProperty *> _ownedAttributes;
     QSet<QUmlConnector *> _ownedConnectors;
     QSet<QUmlConnectableElement *> _roles;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlsubstitution.cpp b/src/uml/qumlsubstitution.cpp
index 3e879841..9e75923d 100644
--- a/src/uml/qumlsubstitution.cpp
+++ b/src/uml/qumlsubstitution.cpp
@@ -61,27 +61,25 @@
 
     \brief A substitution is a relationship between two classifiers signifies that the substituting classifier complies with the contract specified by the contract classifier. This implies that instances of the substituting classifier are runtime substitutable where instances of the contract classifier are expected.
  */
-QUmlSubstitution::QUmlSubstitution(bool createQObject) :
+QUmlSubstitution::QUmlSubstitution(bool createQModelingObject) :
     QUmlRealization(false),
     _contract(0),
     _substitutingClassifier(0)
 {
-    if (createQObject)
-        _qObject = new QUmlSubstitutionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlSubstitutionObject(this));
 }
 
 QUmlSubstitution::~QUmlSubstitution()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlSubstitution::clone() const
+QModelingElement *QUmlSubstitution::clone() const
 {
     QUmlSubstitution *c = new QUmlSubstitution;
     foreach (QUmlComment *element, ownedComments())
@@ -130,8 +128,8 @@ void QUmlSubstitution::setContract(QUmlClassifier *contract)
         removeSupplier(_contract);
 
         _contract = contract;
-        if (contract && contract->asQObject() && this->asQObject())
-            QObject::connect(contract->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setContract()));
+        if (contract && contract->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(contract->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setContract()));
 
         // Adjust subsetted properties
         if (contract) {
@@ -159,8 +157,8 @@ void QUmlSubstitution::setSubstitutingClassifier(QUmlClassifier *substitutingCla
         removeClient(_substitutingClassifier);
 
         _substitutingClassifier = substitutingClassifier;
-        if (substitutingClassifier && substitutingClassifier->asQObject() && this->asQObject())
-            QObject::connect(substitutingClassifier->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setSubstitutingClassifier()));
+        if (substitutingClassifier && substitutingClassifier->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(substitutingClassifier->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setSubstitutingClassifier()));
 
         // Adjust subsetted properties
         setOwner(substitutingClassifier);
@@ -170,50 +168,3 @@ void QUmlSubstitution::setSubstitutingClassifier(QUmlClassifier *substitutingCla
     }
 }
 
-void QUmlSubstitution::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
-    _groupProperties.insert(QStringLiteral("QUmlDependency"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clients"))));
-    _groupProperties.insert(QStringLiteral("QUmlDependency"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("suppliers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAbstraction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("mapping"))));
-    _groupProperties.insert(QStringLiteral("QUmlSubstitution"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("contract"))));
-    _groupProperties.insert(QStringLiteral("QUmlSubstitution"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutingClassifier"))));
-}
-
-void QUmlSubstitution::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSubstitution")][QStringLiteral("contract")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSubstitution")][QStringLiteral("contract")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlSubstitution");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSubstitution")][QStringLiteral("contract")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSubstitution")][QStringLiteral("contract")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSubstitution")][QStringLiteral("contract")][QtModeling::DocumentationRole] = QStringLiteral("The contract with which the substituting classifier complies.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSubstitution")][QStringLiteral("contract")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSubstitution")][QStringLiteral("contract")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Dependency-supplier");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSubstitution")][QStringLiteral("contract")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSubstitution")][QStringLiteral("substitutingClassifier")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSubstitution")][QStringLiteral("substitutingClassifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlSubstitution");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSubstitution")][QStringLiteral("substitutingClassifier")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSubstitution")][QStringLiteral("substitutingClassifier")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSubstitution")][QStringLiteral("substitutingClassifier")][QtModeling::DocumentationRole] = QStringLiteral("Instances of the substituting classifier are runtime substitutable where instances of the contract classifier are expected.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSubstitution")][QStringLiteral("substitutingClassifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSubstitution")][QStringLiteral("substitutingClassifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner Dependency-client");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlSubstitution")][QStringLiteral("substitutingClassifier")][QtModeling::OppositeEndRole] = QStringLiteral("Classifier-substitution");
-
-}
-
diff --git a/src/uml/qumlsubstitution.h b/src/uml/qumlsubstitution.h
index 6f56d704..02e34582 100644
--- a/src/uml/qumlsubstitution.h
+++ b/src/uml/qumlsubstitution.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlRealization>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlClassifier;
 class Q_UML_EXPORT QUmlSubstitution : public QUmlRealization
 {
 public:
-    explicit QUmlSubstitution(bool createQObject = true);
+    explicit QUmlSubstitution(bool createQModelingObject = true);
     virtual ~QUmlSubstitution();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlClassifier *contract() const;
@@ -71,9 +70,6 @@ public:
 protected:
     QUmlClassifier *_contract;
     QUmlClassifier *_substitutingClassifier;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumltemplateableelement.cpp b/src/uml/qumltemplateableelement.cpp
index a003f70b..cbf6b12e 100644
--- a/src/uml/qumltemplateableelement.cpp
+++ b/src/uml/qumltemplateableelement.cpp
@@ -56,15 +56,13 @@
 QUmlTemplateableElement::QUmlTemplateableElement() :
     _ownedTemplateSignature(0)
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlTemplateableElement::~QUmlTemplateableElement()
 {
 }
 
-QModelingObject *QUmlTemplateableElement::clone() const
+QModelingElement *QUmlTemplateableElement::clone() const
 {
     QUmlTemplateableElement *c = new QUmlTemplateableElement;
     foreach (QUmlComment *element, ownedComments())
@@ -97,9 +95,9 @@ void QUmlTemplateableElement::setOwnedTemplateSignature(QUmlTemplateSignature *o
         removeOwnedElement(_ownedTemplateSignature);
 
         _ownedTemplateSignature = ownedTemplateSignature;
-        if (ownedTemplateSignature && ownedTemplateSignature->asQObject() && this->asQObject())
-            QObject::connect(ownedTemplateSignature->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setOwnedTemplateSignature()));
-        ownedTemplateSignature->asQObject()->setParent(this->asQObject());
+        if (ownedTemplateSignature && ownedTemplateSignature->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(ownedTemplateSignature->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setOwnedTemplateSignature()));
+        ownedTemplateSignature->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (ownedTemplateSignature) {
@@ -124,9 +122,9 @@ void QUmlTemplateableElement::addTemplateBinding(QUmlTemplateBinding *templateBi
 
     if (!_templateBindings.contains(templateBinding)) {
         _templateBindings.insert(templateBinding);
-        if (templateBinding && templateBinding->asQObject() && this->asQObject())
-            QObject::connect(templateBinding->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeTemplateBinding(QObject *)));
-        templateBinding->asQObject()->setParent(this->asQObject());
+        if (templateBinding && templateBinding->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(templateBinding->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeTemplateBinding(QObject *)));
+        templateBinding->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(templateBinding);
@@ -144,8 +142,8 @@ void QUmlTemplateableElement::removeTemplateBinding(QUmlTemplateBinding *templat
 
     if (_templateBindings.contains(templateBinding)) {
         _templateBindings.remove(templateBinding);
-        if (templateBinding->asQObject())
-            templateBinding->asQObject()->setParent(0);
+        if (templateBinding->asQModelingObject())
+            templateBinding->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(templateBinding);
@@ -179,36 +177,3 @@ QSet<QUmlParameterableElement *> QUmlTemplateableElement::parameterableElements(
     return QSet<QUmlParameterableElement *> ();
 }
 
-void QUmlTemplateableElement::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
-}
-
-void QUmlTemplateableElement::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateableElement")][QStringLiteral("ownedTemplateSignature")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateableElement")][QStringLiteral("ownedTemplateSignature")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTemplateableElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateableElement")][QStringLiteral("ownedTemplateSignature")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateableElement")][QStringLiteral("ownedTemplateSignature")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateableElement")][QStringLiteral("ownedTemplateSignature")][QtModeling::DocumentationRole] = QStringLiteral("The optional template signature specifying the formal template parameters.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateableElement")][QStringLiteral("ownedTemplateSignature")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateableElement")][QStringLiteral("ownedTemplateSignature")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateableElement")][QStringLiteral("ownedTemplateSignature")][QtModeling::OppositeEndRole] = QStringLiteral("TemplateSignature-template");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateableElement")][QStringLiteral("templateBindings")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateableElement")][QStringLiteral("templateBindings")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTemplateableElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateableElement")][QStringLiteral("templateBindings")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateableElement")][QStringLiteral("templateBindings")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateableElement")][QStringLiteral("templateBindings")][QtModeling::DocumentationRole] = QStringLiteral("The optional bindings from this element to templates.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateableElement")][QStringLiteral("templateBindings")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateableElement")][QStringLiteral("templateBindings")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_source_directedRelationship-directedRelationship Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateableElement")][QStringLiteral("templateBindings")][QtModeling::OppositeEndRole] = QStringLiteral("TemplateBinding-boundElement");
-
-}
-
diff --git a/src/uml/qumltemplateableelement.h b/src/uml/qumltemplateableelement.h
index 5044635c..9e14b461 100644
--- a/src/uml/qumltemplateableelement.h
+++ b/src/uml/qumltemplateableelement.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -61,7 +60,7 @@ class Q_UML_EXPORT QUmlTemplateableElement : public virtual QUmlElement
 public:
     virtual ~QUmlTemplateableElement();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlTemplateSignature *ownedTemplateSignature() const;
@@ -79,9 +78,6 @@ protected:
 
     QUmlTemplateSignature *_ownedTemplateSignature;
     QSet<QUmlTemplateBinding *> _templateBindings;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumltemplatebinding.cpp b/src/uml/qumltemplatebinding.cpp
index 54f39052..23eaf00b 100644
--- a/src/uml/qumltemplatebinding.cpp
+++ b/src/uml/qumltemplatebinding.cpp
@@ -55,26 +55,24 @@
 
     \brief A template binding represents a relationship between a templateable element and a template. A template binding specifies the substitutions of actual parameters for the formal parameters of the template.
  */
-QUmlTemplateBinding::QUmlTemplateBinding(bool createQObject) :
+QUmlTemplateBinding::QUmlTemplateBinding(bool createQModelingObject) :
     _boundElement(0),
     _signature(0)
 {
-    if (createQObject)
-        _qObject = new QUmlTemplateBindingObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlTemplateBindingObject(this));
 }
 
 QUmlTemplateBinding::~QUmlTemplateBinding()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlTemplateBinding::clone() const
+QModelingElement *QUmlTemplateBinding::clone() const
 {
     QUmlTemplateBinding *c = new QUmlTemplateBinding;
     foreach (QUmlComment *element, ownedComments())
@@ -109,8 +107,8 @@ void QUmlTemplateBinding::setBoundElement(QUmlTemplateableElement *boundElement)
         removeSource(_boundElement);
 
         _boundElement = boundElement;
-        if (boundElement && boundElement->asQObject() && this->asQObject())
-            QObject::connect(boundElement->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setBoundElement()));
+        if (boundElement && boundElement->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(boundElement->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setBoundElement()));
 
         // Adjust subsetted properties
         setOwner(boundElement);
@@ -136,9 +134,9 @@ void QUmlTemplateBinding::addParameterSubstitution(QUmlTemplateParameterSubstitu
 
     if (!_parameterSubstitutions.contains(parameterSubstitution)) {
         _parameterSubstitutions.insert(parameterSubstitution);
-        if (parameterSubstitution && parameterSubstitution->asQObject() && this->asQObject())
-            QObject::connect(parameterSubstitution->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeParameterSubstitution(QObject *)));
-        parameterSubstitution->asQObject()->setParent(this->asQObject());
+        if (parameterSubstitution && parameterSubstitution->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(parameterSubstitution->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeParameterSubstitution(QObject *)));
+        parameterSubstitution->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(parameterSubstitution);
@@ -156,8 +154,8 @@ void QUmlTemplateBinding::removeParameterSubstitution(QUmlTemplateParameterSubst
 
     if (_parameterSubstitutions.contains(parameterSubstitution)) {
         _parameterSubstitutions.remove(parameterSubstitution);
-        if (parameterSubstitution->asQObject())
-            parameterSubstitution->asQObject()->setParent(0);
+        if (parameterSubstitution->asQModelingObject())
+            parameterSubstitution->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(parameterSubstitution);
@@ -188,8 +186,8 @@ void QUmlTemplateBinding::setSignature(QUmlTemplateSignature *signature)
         removeTarget(_signature);
 
         _signature = signature;
-        if (signature && signature->asQObject() && this->asQObject())
-            QObject::connect(signature->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setSignature()));
+        if (signature && signature->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(signature->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setSignature()));
 
         // Adjust subsetted properties
         if (signature) {
@@ -198,49 +196,3 @@ void QUmlTemplateBinding::setSignature(QUmlTemplateSignature *signature)
     }
 }
 
-void QUmlTemplateBinding::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateBinding"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("boundElement"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateBinding"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parameterSubstitutions"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateBinding"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("signature"))));
-}
-
-void QUmlTemplateBinding::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateBinding")][QStringLiteral("boundElement")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateBinding")][QStringLiteral("boundElement")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTemplateBinding");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateBinding")][QStringLiteral("boundElement")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateBinding")][QStringLiteral("boundElement")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateBinding")][QStringLiteral("boundElement")][QtModeling::DocumentationRole] = QStringLiteral("The element that is bound by this binding.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateBinding")][QStringLiteral("boundElement")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateBinding")][QStringLiteral("boundElement")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner DirectedRelationship-source");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateBinding")][QStringLiteral("boundElement")][QtModeling::OppositeEndRole] = QStringLiteral("TemplateableElement-templateBinding");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateBinding")][QStringLiteral("parameterSubstitutions")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateBinding")][QStringLiteral("parameterSubstitutions")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTemplateBinding");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateBinding")][QStringLiteral("parameterSubstitutions")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateBinding")][QStringLiteral("parameterSubstitutions")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateBinding")][QStringLiteral("parameterSubstitutions")][QtModeling::DocumentationRole] = QStringLiteral("The parameter substitutions owned by this template binding.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateBinding")][QStringLiteral("parameterSubstitutions")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateBinding")][QStringLiteral("parameterSubstitutions")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateBinding")][QStringLiteral("parameterSubstitutions")][QtModeling::OppositeEndRole] = QStringLiteral("TemplateParameterSubstitution-templateBinding");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateBinding")][QStringLiteral("signature")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateBinding")][QStringLiteral("signature")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTemplateBinding");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateBinding")][QStringLiteral("signature")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateBinding")][QStringLiteral("signature")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateBinding")][QStringLiteral("signature")][QtModeling::DocumentationRole] = QStringLiteral("The template signature for the template that is the target of the binding.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateBinding")][QStringLiteral("signature")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateBinding")][QStringLiteral("signature")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("DirectedRelationship-target");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateBinding")][QStringLiteral("signature")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumltemplatebinding.h b/src/uml/qumltemplatebinding.h
index a47bbbc3..8b40d37d 100644
--- a/src/uml/qumltemplatebinding.h
+++ b/src/uml/qumltemplatebinding.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlDirectedRelationship>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -59,10 +58,10 @@ class QUmlTemplateSignature;
 class Q_UML_EXPORT QUmlTemplateBinding : public QUmlDirectedRelationship
 {
 public:
-    explicit QUmlTemplateBinding(bool createQObject = true);
+    explicit QUmlTemplateBinding(bool createQModelingObject = true);
     virtual ~QUmlTemplateBinding();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlTemplateableElement *boundElement() const;
@@ -77,9 +76,6 @@ protected:
     QUmlTemplateableElement *_boundElement;
     QSet<QUmlTemplateParameterSubstitution *> _parameterSubstitutions;
     QUmlTemplateSignature *_signature;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumltemplateparameter.cpp b/src/uml/qumltemplateparameter.cpp
index 8dacb7b2..b933244b 100644
--- a/src/uml/qumltemplateparameter.cpp
+++ b/src/uml/qumltemplateparameter.cpp
@@ -54,29 +54,27 @@
 
     \brief A template parameter exposes a parameterable element as a formal template parameter of a template.
  */
-QUmlTemplateParameter::QUmlTemplateParameter(bool createQObject) :
+QUmlTemplateParameter::QUmlTemplateParameter(bool createQModelingObject) :
     _default_(0),
     _ownedDefault(0),
     _ownedParameteredElement(0),
     _parameteredElement(0),
     _signature(0)
 {
-    if (createQObject)
-        _qObject = new QUmlTemplateParameterObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlTemplateParameterObject(this));
 }
 
 QUmlTemplateParameter::~QUmlTemplateParameter()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlTemplateParameter::clone() const
+QModelingElement *QUmlTemplateParameter::clone() const
 {
     QUmlTemplateParameter *c = new QUmlTemplateParameter;
     foreach (QUmlComment *element, ownedComments())
@@ -112,8 +110,8 @@ void QUmlTemplateParameter::setDefault(QUmlParameterableElement *default_)
 
     if (_default_ != default_) {
         _default_ = default_;
-        if (default_ && default_->asQObject() && this->asQObject())
-            QObject::connect(default_->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setDefault()));
+        if (default_ && default_->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(default_->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setDefault()));
     }
 }
 
@@ -136,9 +134,9 @@ void QUmlTemplateParameter::setOwnedDefault(QUmlParameterableElement *ownedDefau
         removeOwnedElement(_ownedDefault);
 
         _ownedDefault = ownedDefault;
-        if (ownedDefault && ownedDefault->asQObject() && this->asQObject())
-            QObject::connect(ownedDefault->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setOwnedDefault()));
-        ownedDefault->asQObject()->setParent(this->asQObject());
+        if (ownedDefault && ownedDefault->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(ownedDefault->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setOwnedDefault()));
+        ownedDefault->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (ownedDefault) {
@@ -167,9 +165,9 @@ void QUmlTemplateParameter::setOwnedParameteredElement(QUmlParameterableElement
         removeOwnedElement(_ownedParameteredElement);
 
         _ownedParameteredElement = ownedParameteredElement;
-        if (ownedParameteredElement && ownedParameteredElement->asQObject() && this->asQObject())
-            QObject::connect(ownedParameteredElement->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setOwnedParameteredElement()));
-        ownedParameteredElement->asQObject()->setParent(this->asQObject());
+        if (ownedParameteredElement && ownedParameteredElement->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(ownedParameteredElement->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setOwnedParameteredElement()));
+        ownedParameteredElement->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         setParameteredElement(ownedParameteredElement);
@@ -195,8 +193,8 @@ void QUmlTemplateParameter::setParameteredElement(QUmlParameterableElement *para
 
     if (_parameteredElement != parameteredElement) {
         _parameteredElement = parameteredElement;
-        if (parameteredElement && parameteredElement->asQObject() && this->asQObject())
-            QObject::connect(parameteredElement->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setParameteredElement()));
+        if (parameteredElement && parameteredElement->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(parameteredElement->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setParameteredElement()));
     }
 }
 
@@ -218,74 +216,11 @@ void QUmlTemplateParameter::setSignature(QUmlTemplateSignature *signature)
         // Adjust subsetted properties
 
         _signature = signature;
-        if (signature && signature->asQObject() && this->asQObject())
-            QObject::connect(signature->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setSignature()));
+        if (signature && signature->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(signature->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setSignature()));
 
         // Adjust subsetted properties
         setOwner(signature);
     }
 }
 
-void QUmlTemplateParameter::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("default_"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedDefault"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameteredElement"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parameteredElement"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateParameter"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("signature"))));
-}
-
-void QUmlTemplateParameter::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("default_")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("default_")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTemplateParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("default_")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("default_")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("default_")][QtModeling::DocumentationRole] = QStringLiteral("The element that is the default for this formal template parameter.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("default_")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("default_")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("default_")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("ownedDefault")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("ownedDefault")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTemplateParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("ownedDefault")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("ownedDefault")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("ownedDefault")][QtModeling::DocumentationRole] = QStringLiteral("The element that is owned by this template parameter for the purpose of providing a default.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("ownedDefault")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("ownedDefault")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement TemplateParameter-default");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("ownedDefault")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("ownedParameteredElement")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("ownedParameteredElement")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTemplateParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("ownedParameteredElement")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("ownedParameteredElement")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("ownedParameteredElement")][QtModeling::DocumentationRole] = QStringLiteral("The element that is owned by this template parameter.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("ownedParameteredElement")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("ownedParameteredElement")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("TemplateParameter-parameteredElement Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("ownedParameteredElement")][QtModeling::OppositeEndRole] = QStringLiteral("ParameterableElement-owningTemplateParameter");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("parameteredElement")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("parameteredElement")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTemplateParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("parameteredElement")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("parameteredElement")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("parameteredElement")][QtModeling::DocumentationRole] = QStringLiteral("The element exposed by this template parameter.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("parameteredElement")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("parameteredElement")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("parameteredElement")][QtModeling::OppositeEndRole] = QStringLiteral("ParameterableElement-templateParameter");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("signature")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("signature")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTemplateParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("signature")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("signature")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("signature")][QtModeling::DocumentationRole] = QStringLiteral("The template signature that owns this template parameter.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("signature")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("signature")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner A_parameter_templateSignature-templateSignature");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameter")][QStringLiteral("signature")][QtModeling::OppositeEndRole] = QStringLiteral("TemplateSignature-ownedParameter");
-
-}
-
diff --git a/src/uml/qumltemplateparameter.h b/src/uml/qumltemplateparameter.h
index 88c5e897..633174b2 100644
--- a/src/uml/qumltemplateparameter.h
+++ b/src/uml/qumltemplateparameter.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlTemplateSignature;
 class Q_UML_EXPORT QUmlTemplateParameter : public QUmlElement
 {
 public:
-    explicit QUmlTemplateParameter(bool createQObject = true);
+    explicit QUmlTemplateParameter(bool createQModelingObject = true);
     virtual ~QUmlTemplateParameter();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlParameterableElement *default_() const;
@@ -81,9 +80,6 @@ protected:
     QUmlParameterableElement *_ownedParameteredElement;
     QUmlParameterableElement *_parameteredElement;
     QUmlTemplateSignature *_signature;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumltemplateparametersubstitution.cpp b/src/uml/qumltemplateparametersubstitution.cpp
index 18bdfdba..83c1b8c7 100644
--- a/src/uml/qumltemplateparametersubstitution.cpp
+++ b/src/uml/qumltemplateparametersubstitution.cpp
@@ -55,28 +55,26 @@
 
     \brief A template parameter substitution relates the actual parameter to a formal template parameter as part of a template binding.
  */
-QUmlTemplateParameterSubstitution::QUmlTemplateParameterSubstitution(bool createQObject) :
+QUmlTemplateParameterSubstitution::QUmlTemplateParameterSubstitution(bool createQModelingObject) :
     _actual(0),
     _formal(0),
     _ownedActual(0),
     _templateBinding(0)
 {
-    if (createQObject)
-        _qObject = new QUmlTemplateParameterSubstitutionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlTemplateParameterSubstitutionObject(this));
 }
 
 QUmlTemplateParameterSubstitution::~QUmlTemplateParameterSubstitution()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlTemplateParameterSubstitution::clone() const
+QModelingElement *QUmlTemplateParameterSubstitution::clone() const
 {
     QUmlTemplateParameterSubstitution *c = new QUmlTemplateParameterSubstitution;
     foreach (QUmlComment *element, ownedComments())
@@ -110,8 +108,8 @@ void QUmlTemplateParameterSubstitution::setActual(QUmlParameterableElement *actu
 
     if (_actual != actual) {
         _actual = actual;
-        if (actual && actual->asQObject() && this->asQObject())
-            QObject::connect(actual->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setActual()));
+        if (actual && actual->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(actual->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setActual()));
     }
 }
 
@@ -131,8 +129,8 @@ void QUmlTemplateParameterSubstitution::setFormal(QUmlTemplateParameter *formal)
 
     if (_formal != formal) {
         _formal = formal;
-        if (formal && formal->asQObject() && this->asQObject())
-            QObject::connect(formal->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setFormal()));
+        if (formal && formal->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(formal->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setFormal()));
     }
 }
 
@@ -155,9 +153,9 @@ void QUmlTemplateParameterSubstitution::setOwnedActual(QUmlParameterableElement
         removeOwnedElement(_ownedActual);
 
         _ownedActual = ownedActual;
-        if (ownedActual && ownedActual->asQObject() && this->asQObject())
-            QObject::connect(ownedActual->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setOwnedActual()));
-        ownedActual->asQObject()->setParent(this->asQObject());
+        if (ownedActual && ownedActual->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(ownedActual->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setOwnedActual()));
+        ownedActual->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (ownedActual) {
@@ -185,64 +183,11 @@ void QUmlTemplateParameterSubstitution::setTemplateBinding(QUmlTemplateBinding *
         // Adjust subsetted properties
 
         _templateBinding = templateBinding;
-        if (templateBinding && templateBinding->asQObject() && this->asQObject())
-            QObject::connect(templateBinding->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setTemplateBinding()));
+        if (templateBinding && templateBinding->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(templateBinding->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setTemplateBinding()));
 
         // Adjust subsetted properties
         setOwner(templateBinding);
     }
 }
 
-void QUmlTemplateParameterSubstitution::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateParameterSubstitution"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("actual"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateParameterSubstitution"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("formal"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateParameterSubstitution"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedActual"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateParameterSubstitution"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBinding"))));
-}
-
-void QUmlTemplateParameterSubstitution::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameterSubstitution")][QStringLiteral("actual")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameterSubstitution")][QStringLiteral("actual")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTemplateParameterSubstitution");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameterSubstitution")][QStringLiteral("actual")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameterSubstitution")][QStringLiteral("actual")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameterSubstitution")][QStringLiteral("actual")][QtModeling::DocumentationRole] = QStringLiteral("The element that is the actual parameter for this substitution.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameterSubstitution")][QStringLiteral("actual")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameterSubstitution")][QStringLiteral("actual")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameterSubstitution")][QStringLiteral("actual")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameterSubstitution")][QStringLiteral("formal")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameterSubstitution")][QStringLiteral("formal")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTemplateParameterSubstitution");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameterSubstitution")][QStringLiteral("formal")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameterSubstitution")][QStringLiteral("formal")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameterSubstitution")][QStringLiteral("formal")][QtModeling::DocumentationRole] = QStringLiteral("The formal template parameter that is associated with this substitution.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameterSubstitution")][QStringLiteral("formal")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameterSubstitution")][QStringLiteral("formal")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameterSubstitution")][QStringLiteral("formal")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameterSubstitution")][QStringLiteral("ownedActual")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameterSubstitution")][QStringLiteral("ownedActual")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTemplateParameterSubstitution");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameterSubstitution")][QStringLiteral("ownedActual")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameterSubstitution")][QStringLiteral("ownedActual")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameterSubstitution")][QStringLiteral("ownedActual")][QtModeling::DocumentationRole] = QStringLiteral("The actual parameter that is owned by this substitution.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameterSubstitution")][QStringLiteral("ownedActual")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameterSubstitution")][QStringLiteral("ownedActual")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement TemplateParameterSubstitution-actual");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameterSubstitution")][QStringLiteral("ownedActual")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameterSubstitution")][QStringLiteral("templateBinding")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameterSubstitution")][QStringLiteral("templateBinding")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTemplateParameterSubstitution");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameterSubstitution")][QStringLiteral("templateBinding")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameterSubstitution")][QStringLiteral("templateBinding")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameterSubstitution")][QStringLiteral("templateBinding")][QtModeling::DocumentationRole] = QStringLiteral("The optional bindings from this element to templates.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameterSubstitution")][QStringLiteral("templateBinding")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameterSubstitution")][QStringLiteral("templateBinding")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateParameterSubstitution")][QStringLiteral("templateBinding")][QtModeling::OppositeEndRole] = QStringLiteral("TemplateBinding-parameterSubstitution");
-
-}
-
diff --git a/src/uml/qumltemplateparametersubstitution.h b/src/uml/qumltemplateparametersubstitution.h
index 400740b7..c7157344 100644
--- a/src/uml/qumltemplateparametersubstitution.h
+++ b/src/uml/qumltemplateparametersubstitution.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -59,10 +58,10 @@ class QUmlTemplateParameter;
 class Q_UML_EXPORT QUmlTemplateParameterSubstitution : public QUmlElement
 {
 public:
-    explicit QUmlTemplateParameterSubstitution(bool createQObject = true);
+    explicit QUmlTemplateParameterSubstitution(bool createQModelingObject = true);
     virtual ~QUmlTemplateParameterSubstitution();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlParameterableElement *actual() const;
@@ -79,9 +78,6 @@ protected:
     QUmlTemplateParameter *_formal;
     QUmlParameterableElement *_ownedActual;
     QUmlTemplateBinding *_templateBinding;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumltemplatesignature.cpp b/src/uml/qumltemplatesignature.cpp
index 46a4751d..af629324 100644
--- a/src/uml/qumltemplatesignature.cpp
+++ b/src/uml/qumltemplatesignature.cpp
@@ -54,25 +54,23 @@
 
     \brief A template signature bundles the set of formal template parameters for a templated element.
  */
-QUmlTemplateSignature::QUmlTemplateSignature(bool createQObject) :
+QUmlTemplateSignature::QUmlTemplateSignature(bool createQModelingObject) :
     _template_(0)
 {
-    if (createQObject)
-        _qObject = new QUmlTemplateSignatureObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlTemplateSignatureObject(this));
 }
 
 QUmlTemplateSignature::~QUmlTemplateSignature()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlTemplateSignature::clone() const
+QModelingElement *QUmlTemplateSignature::clone() const
 {
     QUmlTemplateSignature *c = new QUmlTemplateSignature;
     foreach (QUmlComment *element, ownedComments())
@@ -104,9 +102,9 @@ void QUmlTemplateSignature::addOwnedParameter(QUmlTemplateParameter *ownedParame
 
     if (!_ownedParameters.contains(ownedParameter)) {
         _ownedParameters.append(ownedParameter);
-        if (ownedParameter && ownedParameter->asQObject() && this->asQObject())
-            QObject::connect(ownedParameter->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeOwnedParameter(QObject *)));
-        ownedParameter->asQObject()->setParent(this->asQObject());
+        if (ownedParameter && ownedParameter->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(ownedParameter->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeOwnedParameter(QObject *)));
+        ownedParameter->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addParameter(ownedParameter);
@@ -125,8 +123,8 @@ void QUmlTemplateSignature::removeOwnedParameter(QUmlTemplateParameter *ownedPar
 
     if (_ownedParameters.contains(ownedParameter)) {
         _ownedParameters.removeAll(ownedParameter);
-        if (ownedParameter->asQObject())
-            ownedParameter->asQObject()->setParent(0);
+        if (ownedParameter->asQModelingObject())
+            ownedParameter->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeParameter(ownedParameter);
@@ -155,8 +153,8 @@ void QUmlTemplateSignature::addParameter(QUmlTemplateParameter *parameter)
 
     if (!_parameters.contains(parameter)) {
         _parameters.append(parameter);
-        if (parameter && parameter->asQObject() && this->asQObject())
-            QObject::connect(parameter->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeParameter(QObject *)));
+        if (parameter && parameter->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(parameter->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeParameter(QObject *)));
     }
 }
 
@@ -187,54 +185,11 @@ void QUmlTemplateSignature::setTemplate(QUmlTemplateableElement *template_)
         // Adjust subsetted properties
 
         _template_ = template_;
-        if (template_ && template_->asQObject() && this->asQObject())
-            QObject::connect(template_->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setTemplate()));
+        if (template_ && template_->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(template_->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setTemplate()));
 
         // Adjust subsetted properties
         setOwner(template_);
     }
 }
 
-void QUmlTemplateSignature::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateSignature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedParameters"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateSignature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("parameters"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateSignature"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("template_"))));
-}
-
-void QUmlTemplateSignature::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("ownedParameters")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("ownedParameters")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTemplateSignature");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("ownedParameters")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("ownedParameters")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("ownedParameters")][QtModeling::DocumentationRole] = QStringLiteral("The formal template parameters that are owned by this template signature.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("ownedParameters")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("ownedParameters")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("TemplateSignature-parameter Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("ownedParameters")][QtModeling::OppositeEndRole] = QStringLiteral("TemplateParameter-signature");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("parameters")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("parameters")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTemplateSignature");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("parameters")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("parameters")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("parameters")][QtModeling::DocumentationRole] = QStringLiteral("The ordered set of all formal template parameters for this template signature.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("parameters")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("parameters")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("parameters")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("template_")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("template_")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTemplateSignature");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("template_")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("template_")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("template_")][QtModeling::DocumentationRole] = QStringLiteral("The element that owns this template signature.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("template_")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("template_")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("template_")][QtModeling::OppositeEndRole] = QStringLiteral("TemplateableElement-ownedTemplateSignature");
-
-}
-
diff --git a/src/uml/qumltemplatesignature.h b/src/uml/qumltemplatesignature.h
index 06f8e323..92a87851 100644
--- a/src/uml/qumltemplatesignature.h
+++ b/src/uml/qumltemplatesignature.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlTemplateParameter;
 class Q_UML_EXPORT QUmlTemplateSignature : public virtual QUmlElement
 {
 public:
-    explicit QUmlTemplateSignature(bool createQObject = true);
+    explicit QUmlTemplateSignature(bool createQModelingObject = true);
     virtual ~QUmlTemplateSignature();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QList<QUmlTemplateParameter *> ownedParameters() const;
@@ -77,9 +76,6 @@ protected:
     QList<QUmlTemplateParameter *> _ownedParameters;
     QList<QUmlTemplateParameter *> _parameters;
     QUmlTemplateableElement *_template_;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumltestidentityaction.cpp b/src/uml/qumltestidentityaction.cpp
index 55a94dd9..d16055ff 100644
--- a/src/uml/qumltestidentityaction.cpp
+++ b/src/uml/qumltestidentityaction.cpp
@@ -70,27 +70,25 @@
 
     \brief A test identity action is an action that tests if two values are identical objects.
  */
-QUmlTestIdentityAction::QUmlTestIdentityAction(bool createQObject) :
+QUmlTestIdentityAction::QUmlTestIdentityAction(bool createQModelingObject) :
     _first(0),
     _result(0),
     _second(0)
 {
-    if (createQObject)
-        _qObject = new QUmlTestIdentityActionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlTestIdentityActionObject(this));
 }
 
 QUmlTestIdentityAction::~QUmlTestIdentityAction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlTestIdentityAction::clone() const
+QModelingElement *QUmlTestIdentityAction::clone() const
 {
     QUmlTestIdentityAction *c = new QUmlTestIdentityAction;
     foreach (QUmlComment *element, ownedComments())
@@ -153,9 +151,9 @@ void QUmlTestIdentityAction::setFirst(QUmlInputPin *first)
         removeInput(_first);
 
         _first = first;
-        if (first && first->asQObject() && this->asQObject())
-            QObject::connect(first->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setFirst()));
-        first->asQObject()->setParent(this->asQObject());
+        if (first && first->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(first->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setFirst()));
+        first->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (first) {
@@ -183,9 +181,9 @@ void QUmlTestIdentityAction::setResult(QUmlOutputPin *result)
         removeOutput(_result);
 
         _result = result;
-        if (result && result->asQObject() && this->asQObject())
-            QObject::connect(result->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setResult()));
-        result->asQObject()->setParent(this->asQObject());
+        if (result && result->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(result->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setResult()));
+        result->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (result) {
@@ -213,9 +211,9 @@ void QUmlTestIdentityAction::setSecond(QUmlInputPin *second)
         removeInput(_second);
 
         _second = second;
-        if (second && second->asQObject() && this->asQObject())
-            QObject::connect(second->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setSecond()));
-        second->asQObject()->setParent(this->asQObject());
+        if (second && second->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(second->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setSecond()));
+        second->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (second) {
@@ -224,70 +222,3 @@ void QUmlTestIdentityAction::setSecond(QUmlInputPin *second)
     }
 }
 
-void QUmlTestIdentityAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlTestIdentityAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("first"))));
-    _groupProperties.insert(QStringLiteral("QUmlTestIdentityAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("result"))));
-    _groupProperties.insert(QStringLiteral("QUmlTestIdentityAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("second"))));
-}
-
-void QUmlTestIdentityAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTestIdentityAction")][QStringLiteral("first")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTestIdentityAction")][QStringLiteral("first")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTestIdentityAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTestIdentityAction")][QStringLiteral("first")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTestIdentityAction")][QStringLiteral("first")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTestIdentityAction")][QStringLiteral("first")][QtModeling::DocumentationRole] = QStringLiteral("Gives the pin on which an object is placed.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTestIdentityAction")][QStringLiteral("first")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTestIdentityAction")][QStringLiteral("first")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTestIdentityAction")][QStringLiteral("first")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTestIdentityAction")][QStringLiteral("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTestIdentityAction")][QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTestIdentityAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTestIdentityAction")][QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTestIdentityAction")][QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTestIdentityAction")][QStringLiteral("result")][QtModeling::DocumentationRole] = QStringLiteral("Tells whether the two input objects are identical.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTestIdentityAction")][QStringLiteral("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTestIdentityAction")][QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTestIdentityAction")][QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTestIdentityAction")][QStringLiteral("second")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTestIdentityAction")][QStringLiteral("second")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTestIdentityAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTestIdentityAction")][QStringLiteral("second")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTestIdentityAction")][QStringLiteral("second")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTestIdentityAction")][QStringLiteral("second")][QtModeling::DocumentationRole] = QStringLiteral("Gives the pin on which an object is placed.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTestIdentityAction")][QStringLiteral("second")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTestIdentityAction")][QStringLiteral("second")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTestIdentityAction")][QStringLiteral("second")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumltestidentityaction.h b/src/uml/qumltestidentityaction.h
index ce65544c..c44979aa 100644
--- a/src/uml/qumltestidentityaction.h
+++ b/src/uml/qumltestidentityaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlOutputPin;
 class Q_UML_EXPORT QUmlTestIdentityAction : public QUmlAction
 {
 public:
-    explicit QUmlTestIdentityAction(bool createQObject = true);
+    explicit QUmlTestIdentityAction(bool createQModelingObject = true);
     virtual ~QUmlTestIdentityAction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlInputPin *first() const;
@@ -75,9 +74,6 @@ protected:
     QUmlInputPin *_first;
     QUmlOutputPin *_result;
     QUmlInputPin *_second;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumltimeconstraint.cpp b/src/uml/qumltimeconstraint.cpp
index e2c5d8f9..0af36a35 100644
--- a/src/uml/qumltimeconstraint.cpp
+++ b/src/uml/qumltimeconstraint.cpp
@@ -62,27 +62,25 @@
 
     \brief A time constraint is a constraint that refers to a time interval.
  */
-QUmlTimeConstraint::QUmlTimeConstraint(bool createQObject) :
+QUmlTimeConstraint::QUmlTimeConstraint(bool createQModelingObject) :
     QUmlIntervalConstraint(false),
     _firstEvent(true),
     _specification(0)
 {
-    if (createQObject)
-        _qObject = new QUmlTimeConstraintObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlTimeConstraintObject(this));
 }
 
 QUmlTimeConstraint::~QUmlTimeConstraint()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlTimeConstraint::clone() const
+QModelingElement *QUmlTimeConstraint::clone() const
 {
     QUmlTimeConstraint *c = new QUmlTimeConstraint;
     foreach (QUmlComment *element, ownedComments())
@@ -125,7 +123,7 @@ void QUmlTimeConstraint::setFirstEvent(bool firstEvent)
 
     if (_firstEvent != firstEvent) {
         _firstEvent = firstEvent;
-        _modifiedResettableProperties << QStringLiteral("firstEvent");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("firstEvent");
     }
 }
 
@@ -145,52 +143,9 @@ void QUmlTimeConstraint::setSpecification(QUmlTimeInterval *specification)
 
     if (_specification != specification) {
         _specification = specification;
-        if (specification && specification->asQObject() && this->asQObject())
-            QObject::connect(specification->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setSpecification()));
-        specification->asQObject()->setParent(this->asQObject());
+        if (specification && specification->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(specification->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setSpecification()));
+        specification->asQModelingObject()->setParent(this->asQModelingObject());
     }
 }
 
-void QUmlTimeConstraint::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlConstraint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("constrainedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlConstraint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlTimeConstraint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("firstEvent"))));
-    _groupProperties.insert(QStringLiteral("QUmlTimeConstraint"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("specification"))));
-}
-
-void QUmlTimeConstraint::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeConstraint")][QStringLiteral("firstEvent")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeConstraint")][QStringLiteral("firstEvent")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTimeConstraint");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeConstraint")][QStringLiteral("firstEvent")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeConstraint")][QStringLiteral("firstEvent")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeConstraint")][QStringLiteral("firstEvent")][QtModeling::DocumentationRole] = QStringLiteral("The value of firstEvent is related to constrainedElement. If firstEvent is true, then the corresponding observation event is the first time instant the execution enters constrainedElement. If firstEvent is false, then the corresponding observation event is the last time instant the execution is within constrainedElement.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeConstraint")][QStringLiteral("firstEvent")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeConstraint")][QStringLiteral("firstEvent")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeConstraint")][QStringLiteral("firstEvent")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeConstraint")][QStringLiteral("specification")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeConstraint")][QStringLiteral("specification")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTimeConstraint");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeConstraint")][QStringLiteral("specification")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeConstraint")][QStringLiteral("specification")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeConstraint")][QStringLiteral("specification")][QtModeling::DocumentationRole] = QStringLiteral("A condition that must be true when evaluated in order for the constraint to be satisfied.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeConstraint")][QStringLiteral("specification")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("IntervalConstraint-specification");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeConstraint")][QStringLiteral("specification")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeConstraint")][QStringLiteral("specification")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumltimeconstraint.h b/src/uml/qumltimeconstraint.h
index e3705118..2edb0a68 100644
--- a/src/uml/qumltimeconstraint.h
+++ b/src/uml/qumltimeconstraint.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlIntervalConstraint>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlTimeInterval;
 class Q_UML_EXPORT QUmlTimeConstraint : public QUmlIntervalConstraint
 {
 public:
-    explicit QUmlTimeConstraint(bool createQObject = true);
+    explicit QUmlTimeConstraint(bool createQModelingObject = true);
     virtual ~QUmlTimeConstraint();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     bool firstEvent() const;
@@ -71,9 +70,6 @@ public:
 protected:
     bool _firstEvent;
     QUmlTimeInterval *_specification;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumltimeevent.cpp b/src/uml/qumltimeevent.cpp
index 710c01cb..af51e296 100644
--- a/src/uml/qumltimeevent.cpp
+++ b/src/uml/qumltimeevent.cpp
@@ -60,26 +60,24 @@
 
     \brief A time event can be defined relative to entering the current state of the executing state machine.A time event specifies a point in time. At the specified time, the event occurs.
  */
-QUmlTimeEvent::QUmlTimeEvent(bool createQObject) :
+QUmlTimeEvent::QUmlTimeEvent(bool createQModelingObject) :
     _isRelative(false),
     _when(0)
 {
-    if (createQObject)
-        _qObject = new QUmlTimeEventObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlTimeEventObject(this));
 }
 
 QUmlTimeEvent::~QUmlTimeEvent()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlTimeEvent::clone() const
+QModelingElement *QUmlTimeEvent::clone() const
 {
     QUmlTimeEvent *c = new QUmlTimeEvent;
     foreach (QUmlComment *element, ownedComments())
@@ -118,7 +116,7 @@ void QUmlTimeEvent::setRelative(bool isRelative)
 
     if (_isRelative != isRelative) {
         _isRelative = isRelative;
-        _modifiedResettableProperties << QStringLiteral("isRelative");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("isRelative");
     }
 }
 
@@ -141,9 +139,9 @@ void QUmlTimeEvent::setWhen(QUmlTimeExpression *when)
         removeOwnedElement(_when);
 
         _when = when;
-        if (when && when->asQObject() && this->asQObject())
-            QObject::connect(when->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setWhen()));
-        when->asQObject()->setParent(this->asQObject());
+        if (when && when->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(when->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setWhen()));
+        when->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (when) {
@@ -152,44 +150,3 @@ void QUmlTimeEvent::setWhen(QUmlTimeExpression *when)
     }
 }
 
-void QUmlTimeEvent::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlTimeEvent"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isRelative"))));
-    _groupProperties.insert(QStringLiteral("QUmlTimeEvent"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("when"))));
-}
-
-void QUmlTimeEvent::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeEvent")][QStringLiteral("isRelative")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeEvent")][QStringLiteral("isRelative")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTimeEvent");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeEvent")][QStringLiteral("isRelative")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeEvent")][QStringLiteral("isRelative")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeEvent")][QStringLiteral("isRelative")][QtModeling::DocumentationRole] = QStringLiteral("Specifies whether it is relative or absolute time.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeEvent")][QStringLiteral("isRelative")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeEvent")][QStringLiteral("isRelative")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeEvent")][QStringLiteral("isRelative")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeEvent")][QStringLiteral("when")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeEvent")][QStringLiteral("when")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTimeEvent");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeEvent")][QStringLiteral("when")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeEvent")][QStringLiteral("when")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeEvent")][QStringLiteral("when")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the corresponding time deadline.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeEvent")][QStringLiteral("when")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeEvent")][QStringLiteral("when")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeEvent")][QStringLiteral("when")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumltimeevent.h b/src/uml/qumltimeevent.h
index aa1be992..8af43dd9 100644
--- a/src/uml/qumltimeevent.h
+++ b/src/uml/qumltimeevent.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlEvent>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlTimeExpression;
 class Q_UML_EXPORT QUmlTimeEvent : public QUmlEvent
 {
 public:
-    explicit QUmlTimeEvent(bool createQObject = true);
+    explicit QUmlTimeEvent(bool createQModelingObject = true);
     virtual ~QUmlTimeEvent();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     bool isRelative() const;
@@ -71,9 +70,6 @@ public:
 protected:
     bool _isRelative;
     QUmlTimeExpression *_when;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumltimeexpression.cpp b/src/uml/qumltimeexpression.cpp
index 210b5869..ee9aa830 100644
--- a/src/uml/qumltimeexpression.cpp
+++ b/src/uml/qumltimeexpression.cpp
@@ -62,25 +62,23 @@
 
     \brief A time expression defines a value specification that represents a time value.
  */
-QUmlTimeExpression::QUmlTimeExpression(bool createQObject) :
+QUmlTimeExpression::QUmlTimeExpression(bool createQModelingObject) :
     _expr(0)
 {
-    if (createQObject)
-        _qObject = new QUmlTimeExpressionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlTimeExpressionObject(this));
 }
 
 QUmlTimeExpression::~QUmlTimeExpression()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlTimeExpression::clone() const
+QModelingElement *QUmlTimeExpression::clone() const
 {
     QUmlTimeExpression *c = new QUmlTimeExpression;
     foreach (QUmlComment *element, ownedComments())
@@ -125,9 +123,9 @@ void QUmlTimeExpression::setExpr(QUmlValueSpecification *expr)
         removeOwnedElement(_expr);
 
         _expr = expr;
-        if (expr && expr->asQObject() && this->asQObject())
-            QObject::connect(expr->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setExpr()));
-        expr->asQObject()->setParent(this->asQObject());
+        if (expr && expr->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(expr->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setExpr()));
+        expr->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (expr) {
@@ -152,8 +150,8 @@ void QUmlTimeExpression::addObservation(QUmlObservation *observation)
 
     if (!_observations.contains(observation)) {
         _observations.insert(observation);
-        if (observation && observation->asQObject() && this->asQObject())
-            QObject::connect(observation->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeObservation(QObject *)));
+        if (observation && observation->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(observation->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeObservation(QObject *)));
     }
 }
 
@@ -166,45 +164,3 @@ void QUmlTimeExpression::removeObservation(QUmlObservation *observation)
     }
 }
 
-void QUmlTimeExpression::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlTimeExpression"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("expr"))));
-    _groupProperties.insert(QStringLiteral("QUmlTimeExpression"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("observations"))));
-}
-
-void QUmlTimeExpression::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeExpression")][QStringLiteral("expr")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeExpression")][QStringLiteral("expr")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTimeExpression");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeExpression")][QStringLiteral("expr")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeExpression")][QStringLiteral("expr")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeExpression")][QStringLiteral("expr")][QtModeling::DocumentationRole] = QStringLiteral("The value of the time expression.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeExpression")][QStringLiteral("expr")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeExpression")][QStringLiteral("expr")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeExpression")][QStringLiteral("expr")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeExpression")][QStringLiteral("observations")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeExpression")][QStringLiteral("observations")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTimeExpression");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeExpression")][QStringLiteral("observations")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeExpression")][QStringLiteral("observations")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeExpression")][QStringLiteral("observations")][QtModeling::DocumentationRole] = QStringLiteral("Refers to the time and duration observations that are involved in expr.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeExpression")][QStringLiteral("observations")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeExpression")][QStringLiteral("observations")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeExpression")][QStringLiteral("observations")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumltimeexpression.h b/src/uml/qumltimeexpression.h
index dcd47a9a..22eadb90 100644
--- a/src/uml/qumltimeexpression.h
+++ b/src/uml/qumltimeexpression.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlValueSpecification>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlObservation;
 class Q_UML_EXPORT QUmlTimeExpression : public QUmlValueSpecification
 {
 public:
-    explicit QUmlTimeExpression(bool createQObject = true);
+    explicit QUmlTimeExpression(bool createQModelingObject = true);
     virtual ~QUmlTimeExpression();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlValueSpecification *expr() const;
@@ -72,9 +71,6 @@ public:
 protected:
     QUmlValueSpecification *_expr;
     QSet<QUmlObservation *> _observations;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumltimeinterval.cpp b/src/uml/qumltimeinterval.cpp
index 53fb04fc..6fb3e710 100644
--- a/src/uml/qumltimeinterval.cpp
+++ b/src/uml/qumltimeinterval.cpp
@@ -62,27 +62,25 @@
 
     \brief A time interval defines the range between two time expressions.
  */
-QUmlTimeInterval::QUmlTimeInterval(bool createQObject) :
+QUmlTimeInterval::QUmlTimeInterval(bool createQModelingObject) :
     QUmlInterval(false),
     _max(0),
     _min(0)
 {
-    if (createQObject)
-        _qObject = new QUmlTimeIntervalObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlTimeIntervalObject(this));
 }
 
 QUmlTimeInterval::~QUmlTimeInterval()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlTimeInterval::clone() const
+QModelingElement *QUmlTimeInterval::clone() const
 {
     QUmlTimeInterval *c = new QUmlTimeInterval;
     foreach (QUmlComment *element, ownedComments())
@@ -124,8 +122,8 @@ void QUmlTimeInterval::setMax(QUmlTimeExpression *max)
 
     if (_max != max) {
         _max = max;
-        if (max && max->asQObject() && this->asQObject())
-            QObject::connect(max->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setMax()));
+        if (max && max->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(max->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setMax()));
     }
 }
 
@@ -145,50 +143,8 @@ void QUmlTimeInterval::setMin(QUmlTimeExpression *min)
 
     if (_min != min) {
         _min = min;
-        if (min && min->asQObject() && this->asQObject())
-            QObject::connect(min->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setMin()));
+        if (min && min->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(min->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setMin()));
     }
 }
 
-void QUmlTimeInterval::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlTimeInterval"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("max"))));
-    _groupProperties.insert(QStringLiteral("QUmlTimeInterval"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("min"))));
-}
-
-void QUmlTimeInterval::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeInterval")][QStringLiteral("max")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeInterval")][QStringLiteral("max")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTimeInterval");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeInterval")][QStringLiteral("max")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeInterval")][QStringLiteral("max")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeInterval")][QStringLiteral("max")][QtModeling::DocumentationRole] = QStringLiteral("Refers to the TimeExpression denoting the maximum value of the range.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeInterval")][QStringLiteral("max")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("Interval-max");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeInterval")][QStringLiteral("max")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeInterval")][QStringLiteral("max")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeInterval")][QStringLiteral("min")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeInterval")][QStringLiteral("min")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTimeInterval");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeInterval")][QStringLiteral("min")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeInterval")][QStringLiteral("min")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeInterval")][QStringLiteral("min")][QtModeling::DocumentationRole] = QStringLiteral("Refers to the TimeExpression denoting the minimum value of the range.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeInterval")][QStringLiteral("min")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("Interval-min");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeInterval")][QStringLiteral("min")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeInterval")][QStringLiteral("min")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumltimeinterval.h b/src/uml/qumltimeinterval.h
index fd0e0f40..41c7492c 100644
--- a/src/uml/qumltimeinterval.h
+++ b/src/uml/qumltimeinterval.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlInterval>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlTimeExpression;
 class Q_UML_EXPORT QUmlTimeInterval : public QUmlInterval
 {
 public:
-    explicit QUmlTimeInterval(bool createQObject = true);
+    explicit QUmlTimeInterval(bool createQModelingObject = true);
     virtual ~QUmlTimeInterval();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlTimeExpression *max() const;
@@ -71,9 +70,6 @@ public:
 protected:
     QUmlTimeExpression *_max;
     QUmlTimeExpression *_min;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumltimeobservation.cpp b/src/uml/qumltimeobservation.cpp
index c46328d9..7610da86 100644
--- a/src/uml/qumltimeobservation.cpp
+++ b/src/uml/qumltimeobservation.cpp
@@ -59,26 +59,24 @@
 
     \brief A time observation is a reference to a time instant during an execution. It points out the element in the model to observe and whether the observation is when this model element is entered or when it is exited.
  */
-QUmlTimeObservation::QUmlTimeObservation(bool createQObject) :
+QUmlTimeObservation::QUmlTimeObservation(bool createQModelingObject) :
     _event(0),
     _firstEvent(true)
 {
-    if (createQObject)
-        _qObject = new QUmlTimeObservationObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlTimeObservationObject(this));
 }
 
 QUmlTimeObservation::~QUmlTimeObservation()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlTimeObservation::clone() const
+QModelingElement *QUmlTimeObservation::clone() const
 {
     QUmlTimeObservation *c = new QUmlTimeObservation;
     foreach (QUmlComment *element, ownedComments())
@@ -117,8 +115,8 @@ void QUmlTimeObservation::setEvent(QUmlNamedElement *event)
 
     if (_event != event) {
         _event = event;
-        if (event && event->asQObject() && this->asQObject())
-            QObject::connect(event->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setEvent()));
+        if (event && event->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(event->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setEvent()));
     }
 }
 
@@ -138,48 +136,7 @@ void QUmlTimeObservation::setFirstEvent(bool firstEvent)
 
     if (_firstEvent != firstEvent) {
         _firstEvent = firstEvent;
-        _modifiedResettableProperties << QStringLiteral("firstEvent");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("firstEvent");
     }
 }
 
-void QUmlTimeObservation::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlTimeObservation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("event"))));
-    _groupProperties.insert(QStringLiteral("QUmlTimeObservation"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("firstEvent"))));
-}
-
-void QUmlTimeObservation::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeObservation")][QStringLiteral("event")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeObservation")][QStringLiteral("event")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTimeObservation");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeObservation")][QStringLiteral("event")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeObservation")][QStringLiteral("event")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeObservation")][QStringLiteral("event")][QtModeling::DocumentationRole] = QStringLiteral("The observation is determined by the entering or exiting of the event element during execution.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeObservation")][QStringLiteral("event")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeObservation")][QStringLiteral("event")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeObservation")][QStringLiteral("event")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeObservation")][QStringLiteral("firstEvent")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeObservation")][QStringLiteral("firstEvent")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTimeObservation");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeObservation")][QStringLiteral("firstEvent")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeObservation")][QStringLiteral("firstEvent")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeObservation")][QStringLiteral("firstEvent")][QtModeling::DocumentationRole] = QStringLiteral("The value of firstEvent is related to event. If firstEvent is true, then the corresponding observation event is the first time instant the execution enters event. If firstEvent is false, then the corresponding observation event is the time instant the execution exits event.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeObservation")][QStringLiteral("firstEvent")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeObservation")][QStringLiteral("firstEvent")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeObservation")][QStringLiteral("firstEvent")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumltimeobservation.h b/src/uml/qumltimeobservation.h
index 45cd2993..0708621b 100644
--- a/src/uml/qumltimeobservation.h
+++ b/src/uml/qumltimeobservation.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlObservation>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlNamedElement;
 class Q_UML_EXPORT QUmlTimeObservation : public QUmlObservation
 {
 public:
-    explicit QUmlTimeObservation(bool createQObject = true);
+    explicit QUmlTimeObservation(bool createQModelingObject = true);
     virtual ~QUmlTimeObservation();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlNamedElement *event() const;
@@ -71,9 +70,6 @@ public:
 protected:
     QUmlNamedElement *_event;
     bool _firstEvent;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumltransition.cpp b/src/uml/qumltransition.cpp
index 191bd45f..c7fe83cf 100644
--- a/src/uml/qumltransition.cpp
+++ b/src/uml/qumltransition.cpp
@@ -68,7 +68,7 @@
 
     \brief A transition is a directed relationship between a source vertex and a target vertex. It may be part of a compound transition, which takes the state machine from one state configuration to another, representing the complete response of the state machine to an occurrence of an event of a particular type.
  */
-QUmlTransition::QUmlTransition(bool createQObject) :
+QUmlTransition::QUmlTransition(bool createQModelingObject) :
     _container(0),
     _effect(0),
     _guard(0),
@@ -77,22 +77,20 @@ QUmlTransition::QUmlTransition(bool createQObject) :
     _source(0),
     _target(0)
 {
-    if (createQObject)
-        _qObject = new QUmlTransitionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlTransitionObject(this));
 }
 
 QUmlTransition::~QUmlTransition()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlTransition::clone() const
+QModelingElement *QUmlTransition::clone() const
 {
     QUmlTransition *c = new QUmlTransition;
     foreach (QUmlComment *element, ownedComments())
@@ -148,8 +146,8 @@ void QUmlTransition::setContainer(QUmlRegion *container)
         // Adjust subsetted properties
 
         _container = container;
-        if (container && container->asQObject() && this->asQObject())
-            QObject::connect(container->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setContainer()));
+        if (container && container->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(container->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setContainer()));
 
         // Adjust subsetted properties
         setNamespace(container);
@@ -175,9 +173,9 @@ void QUmlTransition::setEffect(QUmlBehavior *effect)
         removeOwnedElement(_effect);
 
         _effect = effect;
-        if (effect && effect->asQObject() && this->asQObject())
-            QObject::connect(effect->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setEffect()));
-        effect->asQObject()->setParent(this->asQObject());
+        if (effect && effect->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(effect->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setEffect()));
+        effect->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (effect) {
@@ -205,9 +203,9 @@ void QUmlTransition::setGuard(QUmlConstraint *guard)
         removeOwnedRule(_guard);
 
         _guard = guard;
-        if (guard && guard->asQObject() && this->asQObject())
-            QObject::connect(guard->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setGuard()));
-        guard->asQObject()->setParent(this->asQObject());
+        if (guard && guard->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(guard->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setGuard()));
+        guard->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (guard) {
@@ -232,7 +230,7 @@ void QUmlTransition::setKind(QtUml::TransitionKind kind)
 
     if (_kind != kind) {
         _kind = kind;
-        _modifiedResettableProperties << QStringLiteral("kind");
+        _qModelingObject->modifiedResettableProperties() << QStringLiteral("kind");
     }
 }
 
@@ -255,8 +253,8 @@ void QUmlTransition::setRedefinedTransition(QUmlTransition *redefinedTransition)
         removeRedefinedElement(_redefinedTransition);
 
         _redefinedTransition = redefinedTransition;
-        if (redefinedTransition && redefinedTransition->asQObject() && this->asQObject())
-            QObject::connect(redefinedTransition->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setRedefinedTransition()));
+        if (redefinedTransition && redefinedTransition->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(redefinedTransition->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setRedefinedTransition()));
 
         // Adjust subsetted properties
         if (redefinedTransition) {
@@ -305,8 +303,8 @@ void QUmlTransition::setSource(QUmlVertex *source)
 
     if (_source != source) {
         _source = source;
-        if (source && source->asQObject() && this->asQObject())
-            QObject::connect(source->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setSource()));
+        if (source && source->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(source->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setSource()));
     }
 }
 
@@ -326,8 +324,8 @@ void QUmlTransition::setTarget(QUmlVertex *target)
 
     if (_target != target) {
         _target = target;
-        if (target && target->asQObject() && this->asQObject())
-            QObject::connect(target->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setTarget()));
+        if (target && target->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(target->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setTarget()));
     }
 }
 
@@ -347,9 +345,9 @@ void QUmlTransition::addTrigger(QUmlTrigger *trigger)
 
     if (!_triggers.contains(trigger)) {
         _triggers.insert(trigger);
-        if (trigger && trigger->asQObject() && this->asQObject())
-            QObject::connect(trigger->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeTrigger(QObject *)));
-        trigger->asQObject()->setParent(this->asQObject());
+        if (trigger && trigger->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(trigger->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeTrigger(QObject *)));
+        trigger->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedElement(trigger);
@@ -362,8 +360,8 @@ void QUmlTransition::removeTrigger(QUmlTrigger *trigger)
 
     if (_triggers.contains(trigger)) {
         _triggers.remove(trigger);
-        if (trigger->asQObject())
-            trigger->asQObject()->setParent(0);
+        if (trigger->asQModelingObject())
+            trigger->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedElement(trigger);
@@ -393,120 +391,3 @@ bool QUmlTransition::isConsistentWith(QUmlRedefinableElement *redefinee) const
     return bool ();
 }
 
-void QUmlTransition::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("container"))));
-    _groupProperties.insert(QStringLiteral("QUmlTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("effect"))));
-    _groupProperties.insert(QStringLiteral("QUmlTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("guard"))));
-    _groupProperties.insert(QStringLiteral("QUmlTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("kind"))));
-    _groupProperties.insert(QStringLiteral("QUmlTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedTransition"))));
-    _groupProperties.insert(QStringLiteral("QUmlTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContext"))));
-    _groupProperties.insert(QStringLiteral("QUmlTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("source"))));
-    _groupProperties.insert(QStringLiteral("QUmlTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("target"))));
-    _groupProperties.insert(QStringLiteral("QUmlTransition"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("triggers"))));
-}
-
-void QUmlTransition::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("container")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("container")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTransition");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("container")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("container")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("container")][QtModeling::DocumentationRole] = QStringLiteral("Designates the region that owns this transition.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("container")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("container")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("container")][QtModeling::OppositeEndRole] = QStringLiteral("Region-transition");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("effect")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("effect")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTransition");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("effect")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("effect")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("effect")][QtModeling::DocumentationRole] = QStringLiteral("Specifies an optional behavior to be performed when the transition fires.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("effect")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("effect")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("effect")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("guard")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("guard")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTransition");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("guard")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("guard")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("guard")][QtModeling::DocumentationRole] = QStringLiteral("A guard is a constraint that provides a fine-grained control over the firing of the transition. The guard is evaluated when an event occurrence is dispatched by the state machine. If the guard is true at that time, the transition may be enabled, otherwise, it is disabled. Guards should be pure expressions without side effects. Guard expressions with side effects are ill formed.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("guard")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("guard")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedRule");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("guard")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("kind")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("kind")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTransition");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("kind")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("kind")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("kind")][QtModeling::DocumentationRole] = QStringLiteral("Indicates the precise type of the transition.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("kind")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("kind")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("kind")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("redefinedTransition")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("redefinedTransition")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTransition");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("redefinedTransition")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("redefinedTransition")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("redefinedTransition")][QtModeling::DocumentationRole] = QStringLiteral("The transition that is redefined by this transition.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("redefinedTransition")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("redefinedTransition")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("RedefinableElement-redefinedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("redefinedTransition")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("redefinitionContext")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("redefinitionContext")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTransition");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("redefinitionContext")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("redefinitionContext")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("redefinitionContext")][QtModeling::DocumentationRole] = QStringLiteral("References the classifier in which context this element may be redefined.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("redefinitionContext")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("RedefinableElement-redefinitionContext");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("redefinitionContext")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("redefinitionContext")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("source")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("source")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTransition");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("source")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("source")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("source")][QtModeling::DocumentationRole] = QStringLiteral("Designates the originating vertex (state or pseudostate) of the transition.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("source")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("source")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("source")][QtModeling::OppositeEndRole] = QStringLiteral("Vertex-outgoing");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("target")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("target")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTransition");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("target")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("target")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("target")][QtModeling::DocumentationRole] = QStringLiteral("Designates the target vertex that is reached when the transition is taken.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("target")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("target")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("target")][QtModeling::OppositeEndRole] = QStringLiteral("Vertex-incoming");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("triggers")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("triggers")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTransition");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("triggers")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("triggers")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("triggers")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the triggers that may fire the transition.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("triggers")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("triggers")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("triggers")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumltransition.h b/src/uml/qumltransition.h
index 2c1ce1a9..ff5519fd 100644
--- a/src/uml/qumltransition.h
+++ b/src/uml/qumltransition.h
@@ -48,7 +48,6 @@
 
 
 #include <QtUml/QtUmlNamespace>
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -66,10 +65,10 @@ class QUmlVertex;
 class Q_UML_EXPORT QUmlTransition : public QUmlRedefinableElement, public QUmlNamespace
 {
 public:
-    explicit QUmlTransition(bool createQObject = true);
+    explicit QUmlTransition(bool createQModelingObject = true);
     virtual ~QUmlTransition();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlRegion *container() const;
@@ -105,9 +104,6 @@ protected:
     QUmlVertex *_source;
     QUmlVertex *_target;
     QSet<QUmlTrigger *> _triggers;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumltrigger.cpp b/src/uml/qumltrigger.cpp
index 98d5110b..ec841075 100644
--- a/src/uml/qumltrigger.cpp
+++ b/src/uml/qumltrigger.cpp
@@ -59,25 +59,23 @@
 
     \brief A trigger specification may be qualified by the port on which the event occurred.A trigger relates an event to a behavior that may affect an instance of the classifier.
  */
-QUmlTrigger::QUmlTrigger(bool createQObject) :
+QUmlTrigger::QUmlTrigger(bool createQModelingObject) :
     _event(0)
 {
-    if (createQObject)
-        _qObject = new QUmlTriggerObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlTriggerObject(this));
 }
 
 QUmlTrigger::~QUmlTrigger()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlTrigger::clone() const
+QModelingElement *QUmlTrigger::clone() const
 {
     QUmlTrigger *c = new QUmlTrigger;
     foreach (QUmlComment *element, ownedComments())
@@ -113,8 +111,8 @@ void QUmlTrigger::setEvent(QUmlEvent *event)
 
     if (_event != event) {
         _event = event;
-        if (event && event->asQObject() && this->asQObject())
-            QObject::connect(event->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setEvent()));
+        if (event && event->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(event->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setEvent()));
     }
 }
 
@@ -134,8 +132,8 @@ void QUmlTrigger::addPort(QUmlPort *port)
 
     if (!_ports.contains(port)) {
         _ports.insert(port);
-        if (port && port->asQObject() && this->asQObject())
-            QObject::connect(port->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removePort(QObject *)));
+        if (port && port->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(port->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removePort(QObject *)));
     }
 }
 
@@ -148,42 +146,3 @@ void QUmlTrigger::removePort(QUmlPort *port)
     }
 }
 
-void QUmlTrigger::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlTrigger"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("event"))));
-    _groupProperties.insert(QStringLiteral("QUmlTrigger"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ports"))));
-}
-
-void QUmlTrigger::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTrigger")][QStringLiteral("event")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTrigger")][QStringLiteral("event")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTrigger");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTrigger")][QStringLiteral("event")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTrigger")][QStringLiteral("event")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTrigger")][QStringLiteral("event")][QtModeling::DocumentationRole] = QStringLiteral("The event that causes the trigger.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTrigger")][QStringLiteral("event")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTrigger")][QStringLiteral("event")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTrigger")][QStringLiteral("event")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTrigger")][QStringLiteral("ports")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTrigger")][QStringLiteral("ports")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTrigger");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTrigger")][QStringLiteral("ports")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTrigger")][QStringLiteral("ports")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTrigger")][QStringLiteral("ports")][QtModeling::DocumentationRole] = QStringLiteral("A optional port of the receiver object on which the behavioral feature is invoked.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTrigger")][QStringLiteral("ports")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTrigger")][QStringLiteral("ports")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTrigger")][QStringLiteral("ports")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumltrigger.h b/src/uml/qumltrigger.h
index 1a4fc3d0..89c511a7 100644
--- a/src/uml/qumltrigger.h
+++ b/src/uml/qumltrigger.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlNamedElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlPort;
 class Q_UML_EXPORT QUmlTrigger : public QUmlNamedElement
 {
 public:
-    explicit QUmlTrigger(bool createQObject = true);
+    explicit QUmlTrigger(bool createQModelingObject = true);
     virtual ~QUmlTrigger();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlEvent *event() const;
@@ -73,9 +72,6 @@ public:
 protected:
     QUmlEvent *_event;
     QSet<QUmlPort *> _ports;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumltype.cpp b/src/uml/qumltype.cpp
index 6779b186..886b4fe3 100644
--- a/src/uml/qumltype.cpp
+++ b/src/uml/qumltype.cpp
@@ -60,15 +60,13 @@
 QUmlType::QUmlType() :
     _package(0)
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlType::~QUmlType()
 {
 }
 
-QModelingObject *QUmlType::clone() const
+QModelingElement *QUmlType::clone() const
 {
     QUmlType *c = new QUmlType;
     foreach (QUmlComment *element, ownedComments())
@@ -106,8 +104,8 @@ void QUmlType::setPackage(QUmlPackage *package)
 
     if (_package != package) {
         _package = package;
-        if (package && package->asQObject() && this->asQObject())
-            QObject::connect(package->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setPackage()));
+        if (package && package->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(package->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setPackage()));
     }
 }
 
@@ -124,34 +122,3 @@ bool QUmlType::conformsTo(QUmlType *other) const
     return bool ();
 }
 
-void QUmlType::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
-}
-
-void QUmlType::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlType")][QStringLiteral("package")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlType")][QStringLiteral("package")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlType");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlType")][QStringLiteral("package")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlType")][QStringLiteral("package")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlType")][QStringLiteral("package")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the owning package of this classifier, if any.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlType")][QStringLiteral("package")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlType")][QStringLiteral("package")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_packagedElement_owningPackage-owningPackage");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlType")][QStringLiteral("package")][QtModeling::OppositeEndRole] = QStringLiteral("Package-ownedType");
-
-}
-
diff --git a/src/uml/qumltype.h b/src/uml/qumltype.h
index 5f9eb4e3..e8a12c24 100644
--- a/src/uml/qumltype.h
+++ b/src/uml/qumltype.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlPackageableElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -59,7 +58,7 @@ class Q_UML_EXPORT QUmlType : public QUmlPackageableElement
 public:
     virtual ~QUmlType();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlPackage *package() const;
@@ -72,9 +71,6 @@ protected:
     explicit QUmlType();
 
     QUmlPackage *_package;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumltypedelement.cpp b/src/uml/qumltypedelement.cpp
index ed946e9f..35da6173 100644
--- a/src/uml/qumltypedelement.cpp
+++ b/src/uml/qumltypedelement.cpp
@@ -59,15 +59,13 @@
 QUmlTypedElement::QUmlTypedElement() :
     _type(0)
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlTypedElement::~QUmlTypedElement()
 {
 }
 
-QModelingObject *QUmlTypedElement::clone() const
+QModelingElement *QUmlTypedElement::clone() const
 {
     QUmlTypedElement *c = new QUmlTypedElement;
     foreach (QUmlComment *element, ownedComments())
@@ -101,37 +99,8 @@ void QUmlTypedElement::setType(QUmlType *type)
 
     if (_type != type) {
         _type = type;
-        if (type && type->asQObject() && this->asQObject())
-            QObject::connect(type->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setType()));
+        if (type && type->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(type->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setType()));
     }
 }
 
-void QUmlTypedElement::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
-}
-
-void QUmlTypedElement::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTypedElement")][QStringLiteral("type")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTypedElement")][QStringLiteral("type")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTypedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTypedElement")][QStringLiteral("type")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTypedElement")][QStringLiteral("type")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTypedElement")][QStringLiteral("type")][QtModeling::DocumentationRole] = QStringLiteral("This information is derived from the return result for this Operation.The type of the TypedElement.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTypedElement")][QStringLiteral("type")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTypedElement")][QStringLiteral("type")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlTypedElement")][QStringLiteral("type")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumltypedelement.h b/src/uml/qumltypedelement.h
index d6bb5482..86c3bf1b 100644
--- a/src/uml/qumltypedelement.h
+++ b/src/uml/qumltypedelement.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlNamedElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -59,7 +58,7 @@ class Q_UML_EXPORT QUmlTypedElement : public virtual QUmlNamedElement
 public:
     virtual ~QUmlTypedElement();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlType *type() const;
@@ -69,9 +68,6 @@ protected:
     explicit QUmlTypedElement();
 
     QUmlType *_type;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlunmarshallaction.cpp b/src/uml/qumlunmarshallaction.cpp
index ebf47c3c..fbb069c5 100644
--- a/src/uml/qumlunmarshallaction.cpp
+++ b/src/uml/qumlunmarshallaction.cpp
@@ -70,26 +70,24 @@
 
     \brief An unmarshall action is an action that breaks an object of a known type into outputs each of which is equal to a value from a structural feature of the object.
  */
-QUmlUnmarshallAction::QUmlUnmarshallAction(bool createQObject) :
+QUmlUnmarshallAction::QUmlUnmarshallAction(bool createQModelingObject) :
     _object(0),
     _unmarshallType(0)
 {
-    if (createQObject)
-        _qObject = new QUmlUnmarshallActionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlUnmarshallActionObject(this));
 }
 
 QUmlUnmarshallAction::~QUmlUnmarshallAction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlUnmarshallAction::clone() const
+QModelingElement *QUmlUnmarshallAction::clone() const
 {
     QUmlUnmarshallAction *c = new QUmlUnmarshallAction;
     foreach (QUmlComment *element, ownedComments())
@@ -152,9 +150,9 @@ void QUmlUnmarshallAction::setObject(QUmlInputPin *object)
         removeInput(_object);
 
         _object = object;
-        if (object && object->asQObject() && this->asQObject())
-            QObject::connect(object->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setObject()));
-        object->asQObject()->setParent(this->asQObject());
+        if (object && object->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(object->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setObject()));
+        object->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (object) {
@@ -179,9 +177,9 @@ void QUmlUnmarshallAction::addResult(QUmlOutputPin *result)
 
     if (!_results.contains(result)) {
         _results.insert(result);
-        if (result && result->asQObject() && this->asQObject())
-            QObject::connect(result->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeResult(QObject *)));
-        result->asQObject()->setParent(this->asQObject());
+        if (result && result->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(result->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeResult(QObject *)));
+        result->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOutput(result);
@@ -194,8 +192,8 @@ void QUmlUnmarshallAction::removeResult(QUmlOutputPin *result)
 
     if (_results.contains(result)) {
         _results.remove(result);
-        if (result->asQObject())
-            result->asQObject()->setParent(0);
+        if (result->asQModelingObject())
+            result->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOutput(result);
@@ -218,75 +216,8 @@ void QUmlUnmarshallAction::setUnmarshallType(QUmlClassifier *unmarshallType)
 
     if (_unmarshallType != unmarshallType) {
         _unmarshallType = unmarshallType;
-        if (unmarshallType && unmarshallType->asQObject() && this->asQObject())
-            QObject::connect(unmarshallType->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setUnmarshallType()));
+        if (unmarshallType && unmarshallType->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(unmarshallType->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setUnmarshallType()));
     }
 }
 
-void QUmlUnmarshallAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlUnmarshallAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("object"))));
-    _groupProperties.insert(QStringLiteral("QUmlUnmarshallAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("results"))));
-    _groupProperties.insert(QStringLiteral("QUmlUnmarshallAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("unmarshallType"))));
-}
-
-void QUmlUnmarshallAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUnmarshallAction")][QStringLiteral("object")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUnmarshallAction")][QStringLiteral("object")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlUnmarshallAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUnmarshallAction")][QStringLiteral("object")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUnmarshallAction")][QStringLiteral("object")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUnmarshallAction")][QStringLiteral("object")][QtModeling::DocumentationRole] = QStringLiteral("The object to be unmarshalled.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUnmarshallAction")][QStringLiteral("object")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUnmarshallAction")][QStringLiteral("object")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUnmarshallAction")][QStringLiteral("object")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUnmarshallAction")][QStringLiteral("results")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUnmarshallAction")][QStringLiteral("results")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlUnmarshallAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUnmarshallAction")][QStringLiteral("results")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUnmarshallAction")][QStringLiteral("results")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUnmarshallAction")][QStringLiteral("results")][QtModeling::DocumentationRole] = QStringLiteral("The values of the structural features of the input object.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUnmarshallAction")][QStringLiteral("results")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUnmarshallAction")][QStringLiteral("results")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUnmarshallAction")][QStringLiteral("results")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUnmarshallAction")][QStringLiteral("unmarshallType")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUnmarshallAction")][QStringLiteral("unmarshallType")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlUnmarshallAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUnmarshallAction")][QStringLiteral("unmarshallType")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUnmarshallAction")][QStringLiteral("unmarshallType")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUnmarshallAction")][QStringLiteral("unmarshallType")][QtModeling::DocumentationRole] = QStringLiteral("The type of the object to be unmarshalled.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUnmarshallAction")][QStringLiteral("unmarshallType")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUnmarshallAction")][QStringLiteral("unmarshallType")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUnmarshallAction")][QStringLiteral("unmarshallType")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlunmarshallaction.h b/src/uml/qumlunmarshallaction.h
index ebffc3bf..40137176 100644
--- a/src/uml/qumlunmarshallaction.h
+++ b/src/uml/qumlunmarshallaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -59,10 +58,10 @@ class QUmlOutputPin;
 class Q_UML_EXPORT QUmlUnmarshallAction : public QUmlAction
 {
 public:
-    explicit QUmlUnmarshallAction(bool createQObject = true);
+    explicit QUmlUnmarshallAction(bool createQModelingObject = true);
     virtual ~QUmlUnmarshallAction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlInputPin *object() const;
@@ -77,9 +76,6 @@ protected:
     QUmlInputPin *_object;
     QSet<QUmlOutputPin *> _results;
     QUmlClassifier *_unmarshallType;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlusage.cpp b/src/uml/qumlusage.cpp
index d93891a0..d656699f 100644
--- a/src/uml/qumlusage.cpp
+++ b/src/uml/qumlusage.cpp
@@ -59,25 +59,23 @@
 
     \brief A usage is a relationship in which one element requires another element (or set of elements) for its full implementation or operation. A usage is a dependency in which the client requires the presence of the supplier.
  */
-QUmlUsage::QUmlUsage(bool createQObject) :
+QUmlUsage::QUmlUsage(bool createQModelingObject) :
     QUmlDependency(false)
 {
-    if (createQObject)
-        _qObject = new QUmlUsageObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlUsageObject(this));
 }
 
 QUmlUsage::~QUmlUsage()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlUsage::clone() const
+QModelingElement *QUmlUsage::clone() const
 {
     QUmlUsage *c = new QUmlUsage;
     foreach (QUmlComment *element, ownedComments())
@@ -99,29 +97,3 @@ QModelingObject *QUmlUsage::clone() const
     return c;
 }
 
-void QUmlUsage::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("relatedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("sources"))));
-    _groupProperties.insert(QStringLiteral("QUmlDirectedRelationship"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("targets"))));
-    _groupProperties.insert(QStringLiteral("QUmlDependency"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clients"))));
-    _groupProperties.insert(QStringLiteral("QUmlDependency"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("suppliers"))));
-}
-
-void QUmlUsage::setPropertyData()
-{
-}
-
diff --git a/src/uml/qumlusage.h b/src/uml/qumlusage.h
index d9a8a893..223978db 100644
--- a/src/uml/qumlusage.h
+++ b/src/uml/qumlusage.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlDependency>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,16 +54,13 @@ QT_MODULE(QtUml)
 class Q_UML_EXPORT QUmlUsage : public QUmlDependency
 {
 public:
-    explicit QUmlUsage(bool createQObject = true);
+    explicit QUmlUsage(bool createQModelingObject = true);
     virtual ~QUmlUsage();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
 
 protected:
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlusecase.cpp b/src/uml/qumlusecase.cpp
index 8325155d..a8b5020f 100644
--- a/src/uml/qumlusecase.cpp
+++ b/src/uml/qumlusecase.cpp
@@ -81,24 +81,22 @@
 
     \brief A use case is the specification of a set of actions performed by a system, which yields an observable result that is, typically, of value for one or more actors or other stakeholders of the system.
  */
-QUmlUseCase::QUmlUseCase(bool createQObject)
+QUmlUseCase::QUmlUseCase(bool createQModelingObject)
 {
-    if (createQObject)
-        _qObject = new QUmlUseCaseObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlUseCaseObject(this));
 }
 
 QUmlUseCase::~QUmlUseCase()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlUseCase::clone() const
+QModelingElement *QUmlUseCase::clone() const
 {
     QUmlUseCase *c = new QUmlUseCase;
     foreach (QUmlComment *element, ownedComments())
@@ -179,9 +177,9 @@ void QUmlUseCase::addExtend(QUmlExtend *extend)
 
     if (!_extends.contains(extend)) {
         _extends.insert(extend);
-        if (extend && extend->asQObject() && this->asQObject())
-            QObject::connect(extend->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeExtend(QObject *)));
-        extend->asQObject()->setParent(this->asQObject());
+        if (extend && extend->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(extend->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeExtend(QObject *)));
+        extend->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedMember(extend);
@@ -199,8 +197,8 @@ void QUmlUseCase::removeExtend(QUmlExtend *extend)
 
     if (_extends.contains(extend)) {
         _extends.remove(extend);
-        if (extend->asQObject())
-            extend->asQObject()->setParent(0);
+        if (extend->asQModelingObject())
+            extend->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedMember(extend);
@@ -228,9 +226,9 @@ void QUmlUseCase::addExtensionPoint(QUmlExtensionPoint *extensionPoint)
 
     if (!_extensionPoints.contains(extensionPoint)) {
         _extensionPoints.insert(extensionPoint);
-        if (extensionPoint && extensionPoint->asQObject() && this->asQObject())
-            QObject::connect(extensionPoint->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeExtensionPoint(QObject *)));
-        extensionPoint->asQObject()->setParent(this->asQObject());
+        if (extensionPoint && extensionPoint->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(extensionPoint->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeExtensionPoint(QObject *)));
+        extensionPoint->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedMember(extensionPoint);
@@ -248,8 +246,8 @@ void QUmlUseCase::removeExtensionPoint(QUmlExtensionPoint *extensionPoint)
 
     if (_extensionPoints.contains(extensionPoint)) {
         _extensionPoints.remove(extensionPoint);
-        if (extensionPoint->asQObject())
-            extensionPoint->asQObject()->setParent(0);
+        if (extensionPoint->asQModelingObject())
+            extensionPoint->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedMember(extensionPoint);
@@ -277,9 +275,9 @@ void QUmlUseCase::addInclude(QUmlInclude *include)
 
     if (!_includes.contains(include)) {
         _includes.insert(include);
-        if (include && include->asQObject() && this->asQObject())
-            QObject::connect(include->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeInclude(QObject *)));
-        include->asQObject()->setParent(this->asQObject());
+        if (include && include->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(include->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeInclude(QObject *)));
+        include->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         addOwnedMember(include);
@@ -297,8 +295,8 @@ void QUmlUseCase::removeInclude(QUmlInclude *include)
 
     if (_includes.contains(include)) {
         _includes.remove(include);
-        if (include->asQObject())
-            include->asQObject()->setParent(0);
+        if (include->asQModelingObject())
+            include->asQModelingObject()->setParent(0);
 
         // Adjust subsetted properties
         removeOwnedMember(include);
@@ -326,8 +324,8 @@ void QUmlUseCase::addSubject(QUmlClassifier *subject)
 
     if (!_subjects.contains(subject)) {
         _subjects.insert(subject);
-        if (subject && subject->asQObject() && this->asQObject())
-            QObject::connect(subject->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeSubject(QObject *)));
+        if (subject && subject->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(subject->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeSubject(QObject *)));
 
         // Adjust opposite properties
         if (subject) {
@@ -362,93 +360,3 @@ QSet<QUmlUseCase *> QUmlUseCase::allIncludedUseCases() const
     return QSet<QUmlUseCase *> ();
 }
 
-void QUmlUseCase::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("elementImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("importedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("members"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedRules"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamespace"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("packageImports"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlType"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("package"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlTemplateableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateBindings"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("attributes"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("collaborationUses"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("features"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generals"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("generalizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inheritedMembers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isAbstract"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isFinalSpecialization"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedTemplateSignature"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedUseCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("powertypeExtents"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedClassifiers"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("representation"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("substitutions"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("useCases"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("classifierBehavior"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("interfaceRealizations"))));
-    _groupProperties.insert(QStringLiteral("QUmlBehavioredClassifier"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedBehaviors"))));
-    _groupProperties.insert(QStringLiteral("QUmlUseCase"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extends"))));
-    _groupProperties.insert(QStringLiteral("QUmlUseCase"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("extensionPoints"))));
-    _groupProperties.insert(QStringLiteral("QUmlUseCase"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("includes"))));
-    _groupProperties.insert(QStringLiteral("QUmlUseCase"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("subjects"))));
-}
-
-void QUmlUseCase::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("extends")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("extends")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlUseCase");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("extends")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("extends")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("extends")][QtModeling::DocumentationRole] = QStringLiteral("References the Extend relationships owned by this use case.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("extends")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("extends")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_source_directedRelationship-directedRelationship Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("extends")][QtModeling::OppositeEndRole] = QStringLiteral("Extend-extension");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("extensionPoints")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("extensionPoints")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlUseCase");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("extensionPoints")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("extensionPoints")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("extensionPoints")][QtModeling::DocumentationRole] = QStringLiteral("References the ExtensionPoints owned by the use case.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("extensionPoints")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("extensionPoints")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("extensionPoints")][QtModeling::OppositeEndRole] = QStringLiteral("ExtensionPoint-useCase");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("includes")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("includes")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlUseCase");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("includes")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("includes")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("includes")][QtModeling::DocumentationRole] = QStringLiteral("References the Include relationships owned by this use case.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("includes")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("includes")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_source_directedRelationship-directedRelationship Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("includes")][QtModeling::OppositeEndRole] = QStringLiteral("Include-includingCase");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("subjects")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("subjects")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlUseCase");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("subjects")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("subjects")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("subjects")][QtModeling::DocumentationRole] = QStringLiteral("References the subjects to which this use case applies. The subject or its parts realize all the use cases that apply to this subject. Use cases need not be attached to any specific subject, however. The subject may, but need not, own the use cases that apply to it.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("subjects")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("subjects")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("subjects")][QtModeling::OppositeEndRole] = QStringLiteral("Classifier-useCase");
-
-}
-
diff --git a/src/uml/qumlusecase.h b/src/uml/qumlusecase.h
index 932f7d72..57ab6fe4 100644
--- a/src/uml/qumlusecase.h
+++ b/src/uml/qumlusecase.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlBehavioredClassifier>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -60,10 +59,10 @@ class QUmlInclude;
 class Q_UML_EXPORT QUmlUseCase : public QUmlBehavioredClassifier
 {
 public:
-    explicit QUmlUseCase(bool createQObject = true);
+    explicit QUmlUseCase(bool createQModelingObject = true);
     virtual ~QUmlUseCase();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     const QSet<QUmlExtend *> extends() const;
@@ -87,9 +86,6 @@ protected:
     QSet<QUmlExtensionPoint *> _extensionPoints;
     QSet<QUmlInclude *> _includes;
     QSet<QUmlClassifier *> _subjects;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlvaluepin.cpp b/src/uml/qumlvaluepin.cpp
index ee221023..31f481a7 100644
--- a/src/uml/qumlvaluepin.cpp
+++ b/src/uml/qumlvaluepin.cpp
@@ -71,26 +71,24 @@
 
     \brief A value pin is an input pin that provides a value by evaluating a value specification.
  */
-QUmlValuePin::QUmlValuePin(bool createQObject) :
+QUmlValuePin::QUmlValuePin(bool createQModelingObject) :
     QUmlInputPin(false),
     _value(0)
 {
-    if (createQObject)
-        _qObject = new QUmlValuePinObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlValuePinObject(this));
 }
 
 QUmlValuePin::~QUmlValuePin()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlValuePin::clone() const
+QModelingElement *QUmlValuePin::clone() const
 {
     QUmlValuePin *c = new QUmlValuePin;
     foreach (QUmlComment *element, ownedComments())
@@ -159,9 +157,9 @@ void QUmlValuePin::setValue(QUmlValueSpecification *value)
         removeOwnedElement(_value);
 
         _value = value;
-        if (value && value->asQObject() && this->asQObject())
-            QObject::connect(value->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setValue()));
-        value->asQObject()->setParent(this->asQObject());
+        if (value && value->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(value->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setValue()));
+        value->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (value) {
@@ -170,56 +168,3 @@ void QUmlValuePin::setValue(QUmlValueSpecification *value)
     }
 }
 
-void QUmlValuePin::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isOrdered"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isUnique"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lower"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lowerValue"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upper"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperValue"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStates"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isControlType"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ordering"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("selection"))));
-    _groupProperties.insert(QStringLiteral("QUmlObjectNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperBound"))));
-    _groupProperties.insert(QStringLiteral("QUmlPin"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isControl"))));
-    _groupProperties.insert(QStringLiteral("QUmlValuePin"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("value"))));
-}
-
-void QUmlValuePin::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlValuePin")][QStringLiteral("value")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlValuePin")][QStringLiteral("value")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlValuePin");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlValuePin")][QStringLiteral("value")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlValuePin")][QStringLiteral("value")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlValuePin")][QStringLiteral("value")][QtModeling::DocumentationRole] = QStringLiteral("Value that the pin will provide.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlValuePin")][QStringLiteral("value")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlValuePin")][QStringLiteral("value")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlValuePin")][QStringLiteral("value")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlvaluepin.h b/src/uml/qumlvaluepin.h
index 8313534d..a30ab33f 100644
--- a/src/uml/qumlvaluepin.h
+++ b/src/uml/qumlvaluepin.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlInputPin>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,10 +56,10 @@ class QUmlValueSpecification;
 class Q_UML_EXPORT QUmlValuePin : public QUmlInputPin
 {
 public:
-    explicit QUmlValuePin(bool createQObject = true);
+    explicit QUmlValuePin(bool createQModelingObject = true);
     virtual ~QUmlValuePin();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlValueSpecification *value() const;
@@ -68,9 +67,6 @@ public:
 
 protected:
     QUmlValueSpecification *_value;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlvaluespecification.cpp b/src/uml/qumlvaluespecification.cpp
index d94dd471..a81e859f 100644
--- a/src/uml/qumlvaluespecification.cpp
+++ b/src/uml/qumlvaluespecification.cpp
@@ -60,15 +60,13 @@
  */
 QUmlValueSpecification::QUmlValueSpecification()
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlValueSpecification::~QUmlValueSpecification()
 {
 }
 
-QModelingObject *QUmlValueSpecification::clone() const
+QModelingElement *QUmlValueSpecification::clone() const
 {
     QUmlValueSpecification *c = new QUmlValueSpecification;
     foreach (QUmlComment *element, ownedComments())
@@ -171,25 +169,3 @@ int QUmlValueSpecification::unlimitedValue() const
     return int ();
 }
 
-void QUmlValueSpecification::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlPackageableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-}
-
-void QUmlValueSpecification::setPropertyData()
-{
-}
-
diff --git a/src/uml/qumlvaluespecification.h b/src/uml/qumlvaluespecification.h
index 703433d6..1a634ea6 100644
--- a/src/uml/qumlvaluespecification.h
+++ b/src/uml/qumlvaluespecification.h
@@ -46,7 +46,6 @@
 #include <QtUml/QUmlTypedElement>
 #include <QtUml/QUmlPackageableElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -60,7 +59,7 @@ class Q_UML_EXPORT QUmlValueSpecification : public QUmlTypedElement, public QUml
 public:
     virtual ~QUmlValueSpecification();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
 
     // Operations
@@ -76,9 +75,6 @@ public:
 protected:
     explicit QUmlValueSpecification();
 
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlvaluespecificationaction.cpp b/src/uml/qumlvaluespecificationaction.cpp
index a33c6fe1..91fc3d6c 100644
--- a/src/uml/qumlvaluespecificationaction.cpp
+++ b/src/uml/qumlvaluespecificationaction.cpp
@@ -71,26 +71,24 @@
 
     \brief A value specification action is an action that evaluates a value specification.
  */
-QUmlValueSpecificationAction::QUmlValueSpecificationAction(bool createQObject) :
+QUmlValueSpecificationAction::QUmlValueSpecificationAction(bool createQModelingObject) :
     _result(0),
     _value(0)
 {
-    if (createQObject)
-        _qObject = new QUmlValueSpecificationActionObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlValueSpecificationActionObject(this));
 }
 
 QUmlValueSpecificationAction::~QUmlValueSpecificationAction()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlValueSpecificationAction::clone() const
+QModelingElement *QUmlValueSpecificationAction::clone() const
 {
     QUmlValueSpecificationAction *c = new QUmlValueSpecificationAction;
     foreach (QUmlComment *element, ownedComments())
@@ -151,9 +149,9 @@ void QUmlValueSpecificationAction::setResult(QUmlOutputPin *result)
         removeOutput(_result);
 
         _result = result;
-        if (result && result->asQObject() && this->asQObject())
-            QObject::connect(result->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setResult()));
-        result->asQObject()->setParent(this->asQObject());
+        if (result && result->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(result->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setResult()));
+        result->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (result) {
@@ -181,9 +179,9 @@ void QUmlValueSpecificationAction::setValue(QUmlValueSpecification *value)
         removeOwnedElement(_value);
 
         _value = value;
-        if (value && value->asQObject() && this->asQObject())
-            QObject::connect(value->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setValue()));
-        value->asQObject()->setParent(this->asQObject());
+        if (value && value->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(value->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setValue()));
+        value->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (value) {
@@ -192,60 +190,3 @@ void QUmlValueSpecificationAction::setValue(QUmlValueSpecification *value)
     }
 }
 
-void QUmlValueSpecificationAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlValueSpecificationAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("result"))));
-    _groupProperties.insert(QStringLiteral("QUmlValueSpecificationAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("value"))));
-}
-
-void QUmlValueSpecificationAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlValueSpecificationAction")][QStringLiteral("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlValueSpecificationAction")][QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlValueSpecificationAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlValueSpecificationAction")][QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlValueSpecificationAction")][QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlValueSpecificationAction")][QStringLiteral("result")][QtModeling::DocumentationRole] = QStringLiteral("Gives the output pin on which the result is put.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlValueSpecificationAction")][QStringLiteral("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlValueSpecificationAction")][QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlValueSpecificationAction")][QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlValueSpecificationAction")][QStringLiteral("value")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlValueSpecificationAction")][QStringLiteral("value")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlValueSpecificationAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlValueSpecificationAction")][QStringLiteral("value")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlValueSpecificationAction")][QStringLiteral("value")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlValueSpecificationAction")][QStringLiteral("value")][QtModeling::DocumentationRole] = QStringLiteral("Value specification to be evaluated.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlValueSpecificationAction")][QStringLiteral("value")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlValueSpecificationAction")][QStringLiteral("value")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlValueSpecificationAction")][QStringLiteral("value")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlvaluespecificationaction.h b/src/uml/qumlvaluespecificationaction.h
index 16b72eb1..8dc3cd22 100644
--- a/src/uml/qumlvaluespecificationaction.h
+++ b/src/uml/qumlvaluespecificationaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -58,10 +57,10 @@ class QUmlValueSpecification;
 class Q_UML_EXPORT QUmlValueSpecificationAction : public QUmlAction
 {
 public:
-    explicit QUmlValueSpecificationAction(bool createQObject = true);
+    explicit QUmlValueSpecificationAction(bool createQModelingObject = true);
     virtual ~QUmlValueSpecificationAction();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlOutputPin *result() const;
@@ -72,9 +71,6 @@ public:
 protected:
     QUmlOutputPin *_result;
     QUmlValueSpecification *_value;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlvariable.cpp b/src/uml/qumlvariable.cpp
index f7cc4f4d..29913129 100644
--- a/src/uml/qumlvariable.cpp
+++ b/src/uml/qumlvariable.cpp
@@ -67,26 +67,24 @@
 
     \brief A variable is considered a connectable element.Variables are elements for passing data between actions indirectly. A local variable stores values shared by the actions within a structured activity group but not accessible outside it. The output of an action may be written to a variable and read for the input to a subsequent action, which is effectively an indirect data flow path. Because there is no predefined relationship between actions that read and write variables, these actions must be sequenced by control flows to prevent race conditions that may occur between actions that read or write the same variable.
  */
-QUmlVariable::QUmlVariable(bool createQObject) :
+QUmlVariable::QUmlVariable(bool createQModelingObject) :
     _activityScope(0),
     _scope(0)
 {
-    if (createQObject)
-        _qObject = new QUmlVariableObject(this);
-    setGroupProperties();
-    setPropertyData();
+    if (createQModelingObject)
+        _qModelingObject = qobject_cast<QModelingObject *>(new QUmlVariableObject(this));
 }
 
 QUmlVariable::~QUmlVariable()
 {
-    if (!deletingFromQObject) {
-        if (_qObject)
-            _qObject->setProperty("deletingFromModelingObject", true);
-        delete _qObject;
+    if (!deletingFromQModelingObject) {
+        if (_qModelingObject)
+            _qModelingObject->setProperty("deletingFromModelingObject", true);
+        delete _qModelingObject;
     }
 }
 
-QModelingObject *QUmlVariable::clone() const
+QModelingElement *QUmlVariable::clone() const
 {
     QUmlVariable *c = new QUmlVariable;
     foreach (QUmlComment *element, ownedComments())
@@ -136,8 +134,8 @@ void QUmlVariable::setActivityScope(QUmlActivity *activityScope)
         // Adjust subsetted properties
 
         _activityScope = activityScope;
-        if (activityScope && activityScope->asQObject() && this->asQObject())
-            QObject::connect(activityScope->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setActivityScope()));
+        if (activityScope && activityScope->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(activityScope->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setActivityScope()));
 
         // Adjust subsetted properties
         setNamespace(activityScope);
@@ -162,8 +160,8 @@ void QUmlVariable::setScope(QUmlStructuredActivityNode *scope)
         // Adjust subsetted properties
 
         _scope = scope;
-        if (scope && scope->asQObject() && this->asQObject())
-            QObject::connect(scope->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setScope()));
+        if (scope && scope->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(scope->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setScope()));
 
         // Adjust subsetted properties
         setNamespace(scope);
@@ -183,52 +181,3 @@ bool QUmlVariable::isAccessibleBy(QUmlAction *a) const
     return bool ();
 }
 
-void QUmlVariable::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isOrdered"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isUnique"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lower"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("lowerValue"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upper"))));
-    _groupProperties.insert(QStringLiteral("QUmlMultiplicityElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("upperValue"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlTypedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("type"))));
-    _groupProperties.insert(QStringLiteral("QUmlParameterableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owningTemplateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlConnectableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ends"))));
-    _groupProperties.insert(QStringLiteral("QUmlConnectableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("templateParameter"))));
-    _groupProperties.insert(QStringLiteral("QUmlVariable"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activityScope"))));
-    _groupProperties.insert(QStringLiteral("QUmlVariable"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("scope"))));
-}
-
-void QUmlVariable::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVariable")][QStringLiteral("activityScope")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVariable")][QStringLiteral("activityScope")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlVariable");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVariable")][QStringLiteral("activityScope")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVariable")][QStringLiteral("activityScope")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVariable")][QStringLiteral("activityScope")][QtModeling::DocumentationRole] = QStringLiteral("An activity that owns the variable.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVariable")][QStringLiteral("activityScope")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVariable")][QStringLiteral("activityScope")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVariable")][QStringLiteral("activityScope")][QtModeling::OppositeEndRole] = QStringLiteral("Activity-variable");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVariable")][QStringLiteral("scope")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVariable")][QStringLiteral("scope")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlVariable");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVariable")][QStringLiteral("scope")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVariable")][QStringLiteral("scope")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVariable")][QStringLiteral("scope")][QtModeling::DocumentationRole] = QStringLiteral("A structured activity node that owns the variable.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVariable")][QStringLiteral("scope")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVariable")][QStringLiteral("scope")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVariable")][QStringLiteral("scope")][QtModeling::OppositeEndRole] = QStringLiteral("StructuredActivityNode-variable");
-
-}
-
diff --git a/src/uml/qumlvariable.h b/src/uml/qumlvariable.h
index 4e094410..0c9caf78 100644
--- a/src/uml/qumlvariable.h
+++ b/src/uml/qumlvariable.h
@@ -46,7 +46,6 @@
 #include <QtUml/QUmlMultiplicityElement>
 #include <QtUml/QUmlConnectableElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -60,10 +59,10 @@ class QUmlStructuredActivityNode;
 class Q_UML_EXPORT QUmlVariable : public QUmlMultiplicityElement, public QUmlConnectableElement
 {
 public:
-    explicit QUmlVariable(bool createQObject = true);
+    explicit QUmlVariable(bool createQModelingObject = true);
     virtual ~QUmlVariable();
 
-    QModelingObject *clone() const;
+    virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlActivity *activityScope() const;
@@ -77,9 +76,6 @@ public:
 protected:
     QUmlActivity *_activityScope;
     QUmlStructuredActivityNode *_scope;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlvariableaction.cpp b/src/uml/qumlvariableaction.cpp
index 5c6dc14a..6b60157a 100644
--- a/src/uml/qumlvariableaction.cpp
+++ b/src/uml/qumlvariableaction.cpp
@@ -72,15 +72,13 @@
 QUmlVariableAction::QUmlVariableAction() :
     _variable(0)
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlVariableAction::~QUmlVariableAction()
 {
 }
 
-QModelingObject *QUmlVariableAction::clone() const
+QModelingElement *QUmlVariableAction::clone() const
 {
     QUmlVariableAction *c = new QUmlVariableAction;
     foreach (QUmlComment *element, ownedComments())
@@ -136,55 +134,8 @@ void QUmlVariableAction::setVariable(QUmlVariable *variable)
 
     if (_variable != variable) {
         _variable = variable;
-        if (variable && variable->asQObject() && this->asQObject())
-            QObject::connect(variable->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setVariable()));
+        if (variable && variable->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(variable->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setVariable()));
     }
 }
 
-void QUmlVariableAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlVariableAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("variable"))));
-}
-
-void QUmlVariableAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVariableAction")][QStringLiteral("variable")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVariableAction")][QStringLiteral("variable")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlVariableAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVariableAction")][QStringLiteral("variable")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVariableAction")][QStringLiteral("variable")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVariableAction")][QStringLiteral("variable")][QtModeling::DocumentationRole] = QStringLiteral("Variable to be read.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVariableAction")][QStringLiteral("variable")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVariableAction")][QStringLiteral("variable")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVariableAction")][QStringLiteral("variable")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlvariableaction.h b/src/uml/qumlvariableaction.h
index 01989d32..bde6b2dc 100644
--- a/src/uml/qumlvariableaction.h
+++ b/src/uml/qumlvariableaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -59,7 +58,7 @@ class Q_UML_EXPORT QUmlVariableAction : public QUmlAction
 public:
     virtual ~QUmlVariableAction();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlVariable *variable() const;
@@ -69,9 +68,6 @@ protected:
     explicit QUmlVariableAction();
 
     QUmlVariable *_variable;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlvertex.cpp b/src/uml/qumlvertex.cpp
index 57ef7d8b..929e2fca 100644
--- a/src/uml/qumlvertex.cpp
+++ b/src/uml/qumlvertex.cpp
@@ -61,15 +61,13 @@
 QUmlVertex::QUmlVertex() :
     _container(0)
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlVertex::~QUmlVertex()
 {
 }
 
-QModelingObject *QUmlVertex::clone() const
+QModelingElement *QUmlVertex::clone() const
 {
     QUmlVertex *c = new QUmlVertex;
     foreach (QUmlComment *element, ownedComments())
@@ -105,8 +103,8 @@ void QUmlVertex::setContainer(QUmlRegion *container)
         // Adjust subsetted properties
 
         _container = container;
-        if (container && container->asQObject() && this->asQObject())
-            QObject::connect(container->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setContainer()));
+        if (container && container->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(container->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setContainer()));
 
         // Adjust subsetted properties
         setNamespace(container);
@@ -217,52 +215,3 @@ QUmlStateMachine *QUmlVertex::containingStateMachine() const
     return 0;
 }
 
-void QUmlVertex::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlVertex"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("container"))));
-    _groupProperties.insert(QStringLiteral("QUmlVertex"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlVertex"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-}
-
-void QUmlVertex::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("container")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("container")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlVertex");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("container")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("container")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("container")][QtModeling::DocumentationRole] = QStringLiteral("The region that contains this vertex.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("container")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("container")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("container")][QtModeling::OppositeEndRole] = QStringLiteral("Region-subvertex");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("incomings")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("incomings")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlVertex");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("incomings")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("incomings")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("incomings")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the transitions entering this vertex.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("incomings")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("incomings")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("incomings")][QtModeling::OppositeEndRole] = QStringLiteral("Transition-target");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("outgoings")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("outgoings")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlVertex");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("outgoings")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("outgoings")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("outgoings")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the transitions departing from this vertex.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("outgoings")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("outgoings")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("outgoings")][QtModeling::OppositeEndRole] = QStringLiteral("Transition-source");
-
-}
-
diff --git a/src/uml/qumlvertex.h b/src/uml/qumlvertex.h
index 22c1513d..3b44c7c0 100644
--- a/src/uml/qumlvertex.h
+++ b/src/uml/qumlvertex.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlNamedElement>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -61,7 +60,7 @@ class Q_UML_EXPORT QUmlVertex : public virtual QUmlNamedElement
 public:
     virtual ~QUmlVertex();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlRegion *container() const;
@@ -80,9 +79,6 @@ protected:
     explicit QUmlVertex();
 
     QUmlRegion *_container;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlwritelinkaction.cpp b/src/uml/qumlwritelinkaction.cpp
index 503c7688..06551598 100644
--- a/src/uml/qumlwritelinkaction.cpp
+++ b/src/uml/qumlwritelinkaction.cpp
@@ -72,15 +72,13 @@
  */
 QUmlWriteLinkAction::QUmlWriteLinkAction()
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlWriteLinkAction::~QUmlWriteLinkAction()
 {
 }
 
-QModelingObject *QUmlWriteLinkAction::clone() const
+QModelingElement *QUmlWriteLinkAction::clone() const
 {
     QUmlWriteLinkAction *c = new QUmlWriteLinkAction;
     foreach (QUmlComment *element, ownedComments())
@@ -120,42 +118,3 @@ QModelingObject *QUmlWriteLinkAction::clone() const
     return c;
 }
 
-void QUmlWriteLinkAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlLinkAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("endData"))));
-    _groupProperties.insert(QStringLiteral("QUmlLinkAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputValues"))));
-}
-
-void QUmlWriteLinkAction::setPropertyData()
-{
-}
-
diff --git a/src/uml/qumlwritelinkaction.h b/src/uml/qumlwritelinkaction.h
index 8c067072..f178fed4 100644
--- a/src/uml/qumlwritelinkaction.h
+++ b/src/uml/qumlwritelinkaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlLinkAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -57,15 +56,12 @@ class Q_UML_EXPORT QUmlWriteLinkAction : public QUmlLinkAction
 public:
     virtual ~QUmlWriteLinkAction();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
 
 protected:
     explicit QUmlWriteLinkAction();
 
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlwritestructuralfeatureaction.cpp b/src/uml/qumlwritestructuralfeatureaction.cpp
index b453effa..801f20d3 100644
--- a/src/uml/qumlwritestructuralfeatureaction.cpp
+++ b/src/uml/qumlwritestructuralfeatureaction.cpp
@@ -73,15 +73,13 @@ QUmlWriteStructuralFeatureAction::QUmlWriteStructuralFeatureAction() :
     _result(0),
     _value(0)
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlWriteStructuralFeatureAction::~QUmlWriteStructuralFeatureAction()
 {
 }
 
-QModelingObject *QUmlWriteStructuralFeatureAction::clone() const
+QModelingElement *QUmlWriteStructuralFeatureAction::clone() const
 {
     QUmlWriteStructuralFeatureAction *c = new QUmlWriteStructuralFeatureAction;
     foreach (QUmlComment *element, ownedComments())
@@ -146,9 +144,9 @@ void QUmlWriteStructuralFeatureAction::setResult(QUmlOutputPin *result)
         removeOutput(_result);
 
         _result = result;
-        if (result && result->asQObject() && this->asQObject())
-            QObject::connect(result->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setResult()));
-        result->asQObject()->setParent(this->asQObject());
+        if (result && result->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(result->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setResult()));
+        result->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (result) {
@@ -176,9 +174,9 @@ void QUmlWriteStructuralFeatureAction::setValue(QUmlInputPin *value)
         removeInput(_value);
 
         _value = value;
-        if (value && value->asQObject() && this->asQObject())
-            QObject::connect(value->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setValue()));
-        value->asQObject()->setParent(this->asQObject());
+        if (value && value->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(value->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setValue()));
+        value->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (value) {
@@ -187,62 +185,3 @@ void QUmlWriteStructuralFeatureAction::setValue(QUmlInputPin *value)
     }
 }
 
-void QUmlWriteStructuralFeatureAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuralFeatureAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("object"))));
-    _groupProperties.insert(QStringLiteral("QUmlStructuralFeatureAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("structuralFeature"))));
-    _groupProperties.insert(QStringLiteral("QUmlWriteStructuralFeatureAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("result"))));
-    _groupProperties.insert(QStringLiteral("QUmlWriteStructuralFeatureAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("value"))));
-}
-
-void QUmlWriteStructuralFeatureAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlWriteStructuralFeatureAction")][QStringLiteral("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlWriteStructuralFeatureAction")][QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlWriteStructuralFeatureAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlWriteStructuralFeatureAction")][QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlWriteStructuralFeatureAction")][QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlWriteStructuralFeatureAction")][QStringLiteral("result")][QtModeling::DocumentationRole] = QStringLiteral("Gives the output pin on which the result is put.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlWriteStructuralFeatureAction")][QStringLiteral("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlWriteStructuralFeatureAction")][QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlWriteStructuralFeatureAction")][QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlWriteStructuralFeatureAction")][QStringLiteral("value")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlWriteStructuralFeatureAction")][QStringLiteral("value")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlWriteStructuralFeatureAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlWriteStructuralFeatureAction")][QStringLiteral("value")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlWriteStructuralFeatureAction")][QStringLiteral("value")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlWriteStructuralFeatureAction")][QStringLiteral("value")][QtModeling::DocumentationRole] = QStringLiteral("Value to be added or removed from the structural feature.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlWriteStructuralFeatureAction")][QStringLiteral("value")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlWriteStructuralFeatureAction")][QStringLiteral("value")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlWriteStructuralFeatureAction")][QStringLiteral("value")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlwritestructuralfeatureaction.h b/src/uml/qumlwritestructuralfeatureaction.h
index 4c79b584..6694e8bb 100644
--- a/src/uml/qumlwritestructuralfeatureaction.h
+++ b/src/uml/qumlwritestructuralfeatureaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlStructuralFeatureAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -60,7 +59,7 @@ class Q_UML_EXPORT QUmlWriteStructuralFeatureAction : public QUmlStructuralFeatu
 public:
     virtual ~QUmlWriteStructuralFeatureAction();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlOutputPin *result() const;
@@ -73,9 +72,6 @@ protected:
 
     QUmlOutputPin *_result;
     QUmlInputPin *_value;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/qumlwritevariableaction.cpp b/src/uml/qumlwritevariableaction.cpp
index 9d1a5324..05adb1b6 100644
--- a/src/uml/qumlwritevariableaction.cpp
+++ b/src/uml/qumlwritevariableaction.cpp
@@ -72,15 +72,13 @@
 QUmlWriteVariableAction::QUmlWriteVariableAction() :
     _value(0)
 {
-    setGroupProperties();
-    setPropertyData();
 }
 
 QUmlWriteVariableAction::~QUmlWriteVariableAction()
 {
 }
 
-QModelingObject *QUmlWriteVariableAction::clone() const
+QModelingElement *QUmlWriteVariableAction::clone() const
 {
     QUmlWriteVariableAction *c = new QUmlWriteVariableAction;
     foreach (QUmlComment *element, ownedComments())
@@ -141,9 +139,9 @@ void QUmlWriteVariableAction::setValue(QUmlInputPin *value)
         removeInput(_value);
 
         _value = value;
-        if (value && value->asQObject() && this->asQObject())
-            QObject::connect(value->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setValue()));
-        value->asQObject()->setParent(this->asQObject());
+        if (value && value->asQModelingObject() && this->asQModelingObject())
+            QObject::connect(value->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setValue()));
+        value->asQModelingObject()->setParent(this->asQModelingObject());
 
         // Adjust subsetted properties
         if (value) {
@@ -152,51 +150,3 @@ void QUmlWriteVariableAction::setValue(QUmlInputPin *value)
     }
 }
 
-void QUmlWriteVariableAction::setGroupProperties()
-{
-    const QMetaObject *metaObject = _qObject->metaObject();
-
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedComments"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("ownedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("owner"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("clientDependencies"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("name"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("nameExpression"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("namespace_"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("qualifiedName"))));
-    _groupProperties.insert(QStringLiteral("QUmlNamedElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("visibility"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLeaf"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedElements"))));
-    _groupProperties.insert(QStringLiteral("QUmlRedefinableElement"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinitionContexts"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("activity"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inGroups"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inInterruptibleRegions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inPartitions"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inStructuredNode"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("incomings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outgoings"))));
-    _groupProperties.insert(QStringLiteral("QUmlActivityNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("redefinedNodes"))));
-    _groupProperties.insert(QStringLiteral("QUmlExecutableNode"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("handlers"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("context"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("inputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("isLocallyReentrant"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPostconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("localPreconditions"))));
-    _groupProperties.insert(QStringLiteral("QUmlAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("outputs"))));
-    _groupProperties.insert(QStringLiteral("QUmlVariableAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("variable"))));
-    _groupProperties.insert(QStringLiteral("QUmlWriteVariableAction"), new QMetaProperty(metaObject->property(metaObject->indexOfProperty("value"))));
-}
-
-void QUmlWriteVariableAction::setPropertyData()
-{
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlWriteVariableAction")][QStringLiteral("value")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlWriteVariableAction")][QStringLiteral("value")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlWriteVariableAction");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlWriteVariableAction")][QStringLiteral("value")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlWriteVariableAction")][QStringLiteral("value")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlWriteVariableAction")][QStringLiteral("value")][QtModeling::DocumentationRole] = QStringLiteral("Value to be added or removed from the variable.");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlWriteVariableAction")][QStringLiteral("value")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlWriteVariableAction")][QStringLiteral("value")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("QUmlWriteVariableAction")][QStringLiteral("value")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-}
-
diff --git a/src/uml/qumlwritevariableaction.h b/src/uml/qumlwritevariableaction.h
index 183ca214..c41ca48c 100644
--- a/src/uml/qumlwritevariableaction.h
+++ b/src/uml/qumlwritevariableaction.h
@@ -45,7 +45,6 @@
 
 #include <QtUml/QUmlVariableAction>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -59,7 +58,7 @@ class Q_UML_EXPORT QUmlWriteVariableAction : public QUmlVariableAction
 public:
     virtual ~QUmlWriteVariableAction();
 
-    Q_DECL_HIDDEN QModelingObject *clone() const;
+    Q_DECL_HIDDEN virtual QModelingElement *clone() const;
 
     // Owned attributes
     QUmlInputPin *value() const;
@@ -69,9 +68,6 @@ protected:
     explicit QUmlWriteVariableAction();
 
     QUmlInputPin *_value;
-
-    virtual void setGroupProperties();
-    virtual void setPropertyData();
 };
 
 QT_END_NAMESPACE
diff --git a/src/uml/uml.pro b/src/uml/uml.pro
index 383570d1..d81ae298 100644
--- a/src/uml/uml.pro
+++ b/src/uml/uml.pro
@@ -1,7 +1,7 @@
 load(qt_build_config)
 
 TARGET = QtUml
-QT = core modeling
+QT = core-private modeling-private
 
 QMAKE_DOCS = $$PWD/doc/qtuml.qdocconf
 
@@ -9,4 +9,4 @@ load(qt_module)
 
 include(uml.pri)
 
-HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
\ No newline at end of file
+HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS